From ced3af58134ab246f6b806a587c722ab6cfe4ad2 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 28 Apr 2022 20:24:13 -0400 Subject: [PATCH 001/340] First attempt at LogScore --- .../DistributionOperation.res | 5 ++ .../DistributionOperation.resi | 2 + .../Distributions/DistributionTypes.res | 5 ++ .../Distributions/GenericDist/GenericDist.res | 7 ++ .../GenericDist/GenericDist.resi | 2 + .../Distributions/PointSetDist/Continuous.res | 6 ++ .../Distributions/PointSetDist/Discrete.res | 10 ++- .../PointSetDist/Distributions.res | 2 + .../Distributions/PointSetDist/Mixed.res | 80 ++++++++++--------- .../PointSetDist/PointSetDist.res | 14 +++- .../PointSetDist/PointSetDist_Scoring.res | 7 ++ .../ReducerInterface_GenericDistribution.res | 4 + .../src/rescript/Utility/XYShape.res | 1 + 13 files changed, 105 insertions(+), 40 deletions(-) create mode 100644 packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res index 18ee2d6a..23389ddc 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res @@ -139,6 +139,10 @@ let rec run = (~env, functionCallInfo: functionCallInfo): outputType => { Dist(dist) } | ToDist(Normalize) => dist->GenericDist.normalize->Dist + | ToScore(LogScore(t2)) => + GenericDist.logScore(dist, t2, ~toPointSetFn) + ->E.R2.fmap(r => Float(r)) + ->OutputLocal.fromResult | ToBool(IsNormalized) => dist->GenericDist.isNormalized->Bool | ToDist(Truncate(leftCutoff, rightCutoff)) => GenericDist.truncate(~toPointSetFn, ~leftCutoff, ~rightCutoff, dist, ()) @@ -227,6 +231,7 @@ module Constructors = { let pdf = (~env, dist, f) => C.pdf(dist, f)->run(~env)->toFloatR let normalize = (~env, dist) => C.normalize(dist)->run(~env)->toDistR let isNormalized = (~env, dist) => C.isNormalized(dist)->run(~env)->toBoolR + let logScore = (~env, dist1, dist2) => C.logScore(dist1, dist2)->run(~env)->toFloatR let toPointSet = (~env, dist) => C.toPointSet(dist)->run(~env)->toDistR let toSampleSet = (~env, dist, n) => C.toSampleSet(dist, n)->run(~env)->toDistR let truncate = (~env, dist, leftCutoff, rightCutoff) => diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi index 5ad34354..6ba16557 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi @@ -57,6 +57,8 @@ module Constructors: { @genType let isNormalized: (~env: env, genericDist) => result @genType + let logScore: (~env: env, genericDist, genericDist) => result + @genType let toPointSet: (~env: env, genericDist) => result @genType let toSampleSet: (~env: env, genericDist, int) => result diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res index 93f86798..41f19e3a 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res @@ -85,9 +85,12 @@ module DistributionOperation = { | ToString | ToSparkline(int) + type toScore = LogScore(genericDist) + type fromDist = | ToFloat(toFloat) | ToDist(toDist) + | ToScore(toScore) | ToDistCombination(direction, Operation.Algebraic.t, [#Dist(genericDist) | #Float(float)]) | ToString(toString) | ToBool(toBool) @@ -108,6 +111,7 @@ module DistributionOperation = { | ToFloat(#Mean) => `mean` | ToFloat(#Pdf(r)) => `pdf(${E.Float.toFixed(r)})` | ToFloat(#Sample) => `sample` + | ToScore(LogScore(_)) => `logScore` | ToDist(Normalize) => `normalize` | ToDist(ToPointSet) => `toPointSet` | ToDist(ToSampleSet(r)) => `toSampleSet(${E.I.toString(r)})` @@ -142,6 +146,7 @@ module Constructors = { let toSampleSet = (dist, r): t => FromDist(ToDist(ToSampleSet(r)), dist) let truncate = (dist, left, right): t => FromDist(ToDist(Truncate(left, right)), dist) let inspect = (dist): t => FromDist(ToDist(Inspect), dist) + let logScore = (dist1, dist2): t => FromDist(ToScore(LogScore(dist2)), dist1) let toString = (dist): t => FromDist(ToString(ToString), dist) let toSparkline = (dist, n): t => FromDist(ToString(ToSparkline(n)), dist) let algebraicAdd = (dist1, dist2: genericDist): t => FromDist( diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.res index c19bdf7f..0b851ec7 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.res @@ -59,6 +59,13 @@ let integralEndY = (t: t): float => let isNormalized = (t: t): bool => Js.Math.abs_float(integralEndY(t) -. 1.0) < 1e-7 +let logScore = (t1, t2, ~toPointSetFn: toPointSetFn): result => { + let pointSets = E.R.merge(toPointSetFn(t1), toPointSetFn(t2)) + pointSets |> E.R2.bind(((a, b)) => + PointSetDist.T.logScore(a, b)->E.R2.errMap(x => DistributionTypes.OperationError(x)) + ) +} + let toFloatOperation = ( t, ~toPointSetFn: toPointSetFn, diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi index e91803e2..34f8ef7d 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi @@ -23,6 +23,8 @@ let toFloatOperation: ( ~distToFloatOperation: Operation.distToFloatOperation, ) => result +let logScore: (t, t, ~toPointSetFn: toPointSetFn) => result + @genType let toPointSet: ( t, diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index d4286387..4397093d 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -267,6 +267,12 @@ module T = Dist({ } let variance = (t: t): float => XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) + + let logScore = (base: t, reference: t) => { + combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference) + |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) + |> E.R.fmap(integralEndY) + } }) let isNormalized = (t: t): bool => { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index fdc921c6..8cdac723 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -34,6 +34,7 @@ let lastY = (t: t) => t |> getShape |> XYShape.T.lastY let combinePointwise = ( ~integralSumCachesFn=(_, _) => None, + ~fn=(a, b) => Ok(a +. b), t1: PointSetTypes.discreteShape, t2: PointSetTypes.discreteShape, ): PointSetTypes.discreteShape => { @@ -47,9 +48,8 @@ let combinePointwise = ( // It could be done for pointwise additions, but is that ever needed? make( - ~integralSumCache=combinedIntegralSum, XYShape.PointwiseCombination.combine( - (a, b) => Ok(a +. b), + fn, XYShape.XtoY.discreteInterpolator, t1.xyShape, t2.xyShape, @@ -221,4 +221,10 @@ module T = Dist({ let getMeanOfSquares = t => t |> shapeMap(XYShape.T.square) |> mean XYShape.Analysis.getVarianceDangerously(t, mean, getMeanOfSquares) } + + let logScore = (base: t, reference: t) => { + combinePointwise(~fn=PointSetDist_Scoring.LogScoring.logScore, base, reference) + |> integralEndY + |> (r => Ok(r)) + } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res index 407eae85..e1b3173c 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res @@ -33,6 +33,7 @@ module type dist = { let mean: t => float let variance: t => float + let logScore: (t,t) => result } module Dist = (T: dist) => { @@ -55,6 +56,7 @@ module Dist = (T: dist) => { let mean = T.mean let variance = T.variance let integralEndY = T.integralEndY + let logScore = T.logScore let updateIntegralCache = T.updateIntegralCache diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 4ce2bdd6..3bbd2ea5 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -36,6 +36,43 @@ let updateIntegralCache = (integralCache, t: t): t => { integralCache: integralCache, } +let combinePointwise = ( + ~integralSumCachesFn=(_, _) => None, + ~integralCachesFn=(_, _) => None, + fn: (float, float) => result, + t1: t, + t2: t, +): result => { + let reducedDiscrete = + [t1, t2] |> E.A.fmap(toDiscrete) |> E.A.O.concatSomes |> Discrete.reduce(~integralSumCachesFn) + + let reducedContinuous = + [t1, t2] + |> E.A.fmap(toContinuous) + |> E.A.O.concatSomes + |> Continuous.reduce(~integralSumCachesFn, fn) + + let combinedIntegralSum = Common.combineIntegralSums( + integralSumCachesFn, + t1.integralSumCache, + t2.integralSumCache, + ) + + let combinedIntegral = Common.combineIntegrals( + integralCachesFn, + t1.integralCache, + t2.integralCache, + ) + reducedContinuous->E.R2.fmap(continuous => + make( + ~integralSumCache=combinedIntegralSum, + ~integralCache=combinedIntegral, + ~discrete=reducedDiscrete, + ~continuous, + ) + ) +} + module T = Dist({ type t = PointSetTypes.mixedShape type integral = PointSetTypes.continuousShape @@ -259,6 +296,12 @@ module T = Dist({ | _ => XYShape.Analysis.getVarianceDangerously(t, mean, getMeanOfSquares) } } + + let logScore = (base: t, reference: t) => { + combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference) |> E.R.fmap( + integralEndY, + ) + } }) let combineAlgebraically = (op: Operation.convolutionOperation, t1: t, t2: t): t => { @@ -307,40 +350,3 @@ let combineAlgebraically = (op: Operation.convolutionOperation, t1: t, t2: t): t integralCache: None, } } - -let combinePointwise = ( - ~integralSumCachesFn=(_, _) => None, - ~integralCachesFn=(_, _) => None, - fn: (float, float) => result, - t1: t, - t2: t, -): result => { - let reducedDiscrete = - [t1, t2] |> E.A.fmap(toDiscrete) |> E.A.O.concatSomes |> Discrete.reduce(~integralSumCachesFn) - - let reducedContinuous = - [t1, t2] - |> E.A.fmap(toContinuous) - |> E.A.O.concatSomes - |> Continuous.reduce(~integralSumCachesFn, fn) - - let combinedIntegralSum = Common.combineIntegralSums( - integralSumCachesFn, - t1.integralSumCache, - t2.integralSumCache, - ) - - let combinedIntegral = Common.combineIntegrals( - integralCachesFn, - t1.integralCache, - t2.integralCache, - ) - reducedContinuous->E.R2.fmap(continuous => - make( - ~integralSumCache=combinedIntegralSum, - ~integralCache=combinedIntegral, - ~discrete=reducedDiscrete, - ~continuous, - ) - ) -} diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index 12aa5477..6073d64e 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -190,6 +190,18 @@ module T = Dist({ | Discrete(m) => Discrete.T.variance(m) | Continuous(m) => Continuous.T.variance(m) } + + let logScore = (t1: t, t2: t) => + switch (t1, t2) { + | (Continuous(t1), Continuous(t2)) => Continuous.T.logScore(t1, t2) + | (Discrete(t1), Discrete(t2)) => Discrete.T.logScore(t1, t2) + | (Mixed(t1), Mixed(t2)) => Mixed.T.logScore(t1, t2) + | _ => { + let t1 = toMixed(t1) + let t2 = toMixed(t2) + Mixed.T.logScore(t1, t2) + } + } }) let pdf = (f: float, t: t) => { @@ -239,4 +251,4 @@ let toSparkline = (t: t, bucketCount): resultE.O2.fmap(Continuous.downsampleEquallyOverX(bucketCount)) ->E.O2.toResult(PointSetTypes.CannotSparklineDiscrete) - ->E.R2.fmap(r => Continuous.getShape(r).ys->Sparklines.create()) + ->E.R2.fmap(r => Continuous.getShape(r).ys->Sparklines.create()) \ No newline at end of file diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res new file mode 100644 index 00000000..b55d2677 --- /dev/null +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -0,0 +1,7 @@ +module LogScoring = { + let logFn = Js.Math.log2 + let subtraction = (a, b) => Ok(a -. b) + let logScore = (a: float, b: float): result => Ok( + Js.Math.log2(Js.Math.abs_float(a /. b)), + ) +} \ No newline at end of file diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index ab76f469..45b1f15f 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -80,6 +80,7 @@ module Helpers = { dist1, )->runGenericOperation } + let parseNumber = (args: expressionValue): Belt.Result.t => switch args { | EvNumber(x) => Ok(x) @@ -209,6 +210,9 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall): option< a, )->Some | ("normalize", [EvDistribution(dist)]) => Helpers.toDistFn(Normalize, dist) + | ("logScore", [EvDistribution(a), EvDistribution(b)]) => Some( + runGenericOperation(FromDist(ToScore(LogScore(b)), a)), + ) | ("isNormalized", [EvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist) | ("toPointSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToPointSet, dist) | ("cdf", [EvDistribution(dist), EvNumber(float)]) => Helpers.toFloatFn(#Cdf(float), dist) diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 1f1e87ca..55b7717c 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -96,6 +96,7 @@ module T = { let fromZippedArray = (pairs: array<(float, float)>): t => pairs |> Belt.Array.unzip |> fromArray let equallyDividedXs = (t: t, newLength) => E.A.Floats.range(minX(t), maxX(t), newLength) let toJs = (t: t) => {"xs": t.xs, "ys": t.ys} + let filterYValues = (fn, t: t): t => t |> zip |> E.A.filter(((_,y)) => fn(y)) |> fromZippedArray module Validator = { let fnName = "XYShape validate" From 64fbe05f3af31b6079f6d2858d8afdc1899dcb0f Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Sat, 30 Apr 2022 15:16:13 +0000 Subject: [PATCH 002/340] Basic stats table. Unformatted --- .../src/components/DistributionChart.tsx | 97 ++++++++++++++++--- .../src/components/FunctionChart.tsx | 1 + .../src/components/SquiggleChart.tsx | 34 +++++-- packages/squiggle-lang/src/js/index.ts | 1 + 4 files changed, 113 insertions(+), 20 deletions(-) diff --git a/packages/components/src/components/DistributionChart.tsx b/packages/components/src/components/DistributionChart.tsx index 6bef36c7..0350bcf8 100644 --- a/packages/components/src/components/DistributionChart.tsx +++ b/packages/components/src/components/DistributionChart.tsx @@ -1,8 +1,12 @@ 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 { + Distribution, + result, + distributionError, + distributionErrorToString, +} from "@quri/squiggle-lang"; import { createClassFromSpec } from "react-vega"; import * as chartSpecification from "../vega-specs/spec-distributions.json"; import { ErrorBox } from "./ErrorBox"; @@ -16,30 +20,101 @@ type DistributionChartProps = { distribution: Distribution; width: number; height: number; + /** Whether to show a summary of means, stdev, percentiles etc */ + showSummary: boolean; }; export const DistributionChart: React.FC = ({ distribution, width, height, + showSummary, }: DistributionChartProps) => { let shape = distribution.pointSet(); if (shape.tag === "Ok") { let widthProp = width ? width - 20 : undefined; - var result = ( - + return ( + <> + + {showSummary ? : <>} + ); } else { - var result = ( + return ( {distributionErrorToString(shape.value)} ); } - return result; +}; + +type SummaryTableProps = { + distribution: Distribution; +}; + +const Table = styled.table``; +const Row = styled.tr``; +const Cell = styled.td``; +const TableHeader = styled.th``; + +const SummaryTable: React.FC = ({ + distribution, +}: SummaryTableProps) => { + let mean = distribution.mean(); + let median = distribution.inv(0.5); + let p5 = distribution.inv(0.05); + let p10 = distribution.inv(0.1); + let Q1 = distribution.inv(0.25); + let Q3 = distribution.inv(0.75); + let p90 = distribution.inv(0.9); + let p95 = distribution.inv(0.95); + let unwrapResult = ( + x: result + ): React.ReactNode => { + if (x.tag === "Ok") { + return ( + + {Intl.NumberFormat("en-US", { maximumSignificantDigits: 3 }).format( + x.value + )} + + ); + } else { + return ( + + {distributionErrorToString(x.value)} + + ); + } + }; + + return ( + + + {"Mean"} + {"5%"} + {"10%"} + {"Q1 (25%)"} + {"Median (50%)"} + {"Q3 (75%)"} + {"90%"} + {"95%"} + + + {unwrapResult(mean)} + {unwrapResult(p5)} + {unwrapResult(p10)} + {unwrapResult(Q1)} + {unwrapResult(median)} + {unwrapResult(Q3)} + {unwrapResult(p90)} + {unwrapResult(p95)} + +
+ ); }; diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index ea00aa9c..86678b27 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -61,6 +61,7 @@ export const FunctionChart: React.FC<{ distribution={mouseItem.value} width={400} height={140} + showSummary={false} /> ) : ( <> diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 31cd9787..6fdc6486 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -54,12 +54,15 @@ export interface SquiggleItemProps { expression: squiggleExpression; width: number; height: number; + /** Whether to show a summary of statistics for distributions */ + showSummary: boolean; } const SquiggleItem: React.FC = ({ expression, width, height, + showSummary, }: SquiggleItemProps) => { switch (expression.tag) { case "number": @@ -83,6 +86,7 @@ const SquiggleItem: React.FC = ({ distribution={expression.value} height={height} width={width} + showSummary={showSummary} /> ); @@ -105,7 +109,12 @@ const SquiggleItem: React.FC = ({ return ( {expression.value.map((r) => ( - + ))} ); @@ -115,17 +124,16 @@ const SquiggleItem: React.FC = ({ {Object.entries(expression.value).map(([key, r]) => ( <> {key} - + ))} ); - default: - return ( - - {"We don't currently have a working viewer for record types."} - - ); } }; @@ -155,6 +163,8 @@ export interface SquiggleChartProps { bindings?: bindings; /** JS imported parameters */ jsImports?: jsImports; + /** Whether to show a summary of the distirbution */ + showSummary?: boolean; } const ChartWrapper = styled.div` @@ -172,6 +182,7 @@ export const SquiggleChart: React.FC = ({ bindings = defaultBindings, jsImports = defaultImports, width = NaN, + showSummary = false, }: SquiggleChartProps) => { let samplingInputs: samplingParams = { sampleCount: sampleCount, @@ -188,7 +199,12 @@ export const SquiggleChart: React.FC = ({ let expression = expressionResult.value; onChange(expression); internal = ( - + ); } else { internal = ( diff --git a/packages/squiggle-lang/src/js/index.ts b/packages/squiggle-lang/src/js/index.ts index ce4d9428..0b521079 100644 --- a/packages/squiggle-lang/src/js/index.ts +++ b/packages/squiggle-lang/src/js/index.ts @@ -11,6 +11,7 @@ export { makeSampleSetDist, errorValueToString, distributionErrorToString, + distributionError, } from "../rescript/TypescriptInterface.gen"; export type { samplingParams, From e2762a0f62243f7c1b142942f602a84c76e14413 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 2 May 2022 11:55:13 -0400 Subject: [PATCH 003/340] Make typechecker happy Value: [1e-7 to 1e-3] --- .../src/rescript/Distributions/PointSetDist/Discrete.res | 7 ++++--- .../src/rescript/Distributions/PointSetDist/Mixed.res | 2 +- .../rescript/Distributions/PointSetDist/PointSetDist.res | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 750c6a1c..410f49bf 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -62,7 +62,7 @@ let reduce = ( fn: (float, float) => result, discreteShapes: array, ): result => { - let merge = combinePointwise(~integralSumCachesFn, fn) + let merge = combinePointwise(~integralSumCachesFn, ~fn) discreteShapes |> E.A.R.foldM(merge, empty) } @@ -164,6 +164,7 @@ module T = Dist({ } let integralEndY = (t: t) => t.integralSumCache |> E.O.default(t |> integral |> Continuous.lastY) + let integralEndYResult = (t: t) => t -> integralEndY -> Ok let minX = shapeFn(XYShape.T.minX) let maxX = shapeFn(XYShape.T.maxX) let toDiscreteProbabilityMassFraction = _ => 1.0 @@ -230,7 +231,7 @@ module T = Dist({ let logScore = (base: t, reference: t) => { combinePointwise(~fn=PointSetDist_Scoring.LogScoring.logScore, base, reference) - |> integralEndY - |> (r => Ok(r)) + |> E.R2.bind(integralEndYResult) + // |> (r => Ok(r)) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index e57b9ed6..3eb7b3f2 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -44,7 +44,7 @@ let combinePointwise = ( t2: t, ): result => { let reducedDiscrete = - [t1, t2] |> E.A.fmap(toDiscrete) |> E.A.O.concatSomes |> Discrete.reduce(~integralSumCachesFn) + [t1, t2] |> E.A.fmap(toDiscrete) |> E.A.O.concatSomes |> Discrete.reduce(~integralSumCachesFn, fn) |> E.R.toExn("foo") let reducedContinuous = [t1, t2] diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index ad314766..d7baad9f 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -86,7 +86,7 @@ let combinePointwise = ( | (Discrete(m1), Discrete(m2)) => Discrete.combinePointwise( ~integralSumCachesFn, - fn, + ~fn, m1, m2, )->E.R2.fmap(x => PointSetTypes.Discrete(x)) @@ -256,4 +256,4 @@ let toSparkline = (t: t, bucketCount): resultE.O2.fmap(Continuous.downsampleEquallyOverX(bucketCount)) ->E.O2.toResult(PointSetTypes.CannotSparklineDiscrete) - ->E.R2.fmap(r => Continuous.getShape(r).ys->Sparklines.create()) \ No newline at end of file + ->E.R2.fmap(r => Continuous.getShape(r).ys->Sparklines.create()) From d595285078176a22087f24684f6b9ddd25201b60 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 2 May 2022 11:55:42 -0400 Subject: [PATCH 004/340] make lint happy Value: [1e-9 to 1e-5] --- .../src/rescript/Distributions/PointSetDist/Discrete.res | 7 ++++--- .../rescript/Distributions/PointSetDist/Distributions.res | 2 +- .../src/rescript/Distributions/PointSetDist/Mixed.res | 6 +++++- .../Distributions/PointSetDist/PointSetDist_Scoring.res | 2 +- .../ReducerInterface_GenericDistribution.res | 5 ++--- packages/squiggle-lang/src/rescript/Utility/XYShape.res | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 410f49bf..59858420 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -164,7 +164,7 @@ module T = Dist({ } let integralEndY = (t: t) => t.integralSumCache |> E.O.default(t |> integral |> Continuous.lastY) - let integralEndYResult = (t: t) => t -> integralEndY -> Ok + let integralEndYResult = (t: t) => t->integralEndY->Ok let minX = shapeFn(XYShape.T.minX) let maxX = shapeFn(XYShape.T.maxX) let toDiscreteProbabilityMassFraction = _ => 1.0 @@ -230,8 +230,9 @@ module T = Dist({ } let logScore = (base: t, reference: t) => { - combinePointwise(~fn=PointSetDist_Scoring.LogScoring.logScore, base, reference) - |> E.R2.bind(integralEndYResult) + combinePointwise(~fn=PointSetDist_Scoring.LogScoring.logScore, base, reference) |> E.R2.bind( + integralEndYResult, + ) // |> (r => Ok(r)) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res index e1b3173c..15da318d 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res @@ -33,7 +33,7 @@ module type dist = { let mean: t => float let variance: t => float - let logScore: (t,t) => result + let logScore: (t, t) => result } module Dist = (T: dist) => { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 3eb7b3f2..3d36d421 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -44,7 +44,11 @@ let combinePointwise = ( t2: t, ): result => { let reducedDiscrete = - [t1, t2] |> E.A.fmap(toDiscrete) |> E.A.O.concatSomes |> Discrete.reduce(~integralSumCachesFn, fn) |> E.R.toExn("foo") + [t1, t2] + |> E.A.fmap(toDiscrete) + |> E.A.O.concatSomes + |> Discrete.reduce(~integralSumCachesFn, fn) + |> E.R.toExn("foo") let reducedContinuous = [t1, t2] diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index b55d2677..40ead2ce 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -4,4 +4,4 @@ module LogScoring = { let logScore = (a: float, b: float): result => Ok( Js.Math.log2(Js.Math.abs_float(a /. b)), ) -} \ No newline at end of file +} diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index cd757bd5..4dd78848 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -212,9 +212,8 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall): option< a, )->Some | ("normalize", [EvDistribution(dist)]) => Helpers.toDistFn(Normalize, dist) - | ("logScore", [EvDistribution(a), EvDistribution(b)]) => Some( - runGenericOperation(FromDist(ToScore(LogScore(b)), a)), - ) + | ("logScore", [EvDistribution(a), EvDistribution(b)]) => + Some(runGenericOperation(FromDist(ToScore(LogScore(b)), a))) | ("isNormalized", [EvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist) | ("toPointSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToPointSet, dist) | ("scaleLog", [EvDistribution(dist)]) => diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 55b7717c..a90c68e5 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -96,7 +96,7 @@ module T = { let fromZippedArray = (pairs: array<(float, float)>): t => pairs |> Belt.Array.unzip |> fromArray let equallyDividedXs = (t: t, newLength) => E.A.Floats.range(minX(t), maxX(t), newLength) let toJs = (t: t) => {"xs": t.xs, "ys": t.ys} - let filterYValues = (fn, t: t): t => t |> zip |> E.A.filter(((_,y)) => fn(y)) |> fromZippedArray + let filterYValues = (fn, t: t): t => t |> zip |> E.A.filter(((_, y)) => fn(y)) |> fromZippedArray module Validator = { let fnName = "XYShape validate" From db3acbf96c7100daf2b3573f63e6d6584ea28fdc Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 2 May 2022 13:40:34 -0400 Subject: [PATCH 005/340] Added extra multiplicative factor in logScore integrand Value: [8e-2 to 7e-1] migrated intregrand from `log(predicted / answer)` to `answer * log(predicted / answer)` --- .../__tests__/Distributions/Score_test.res | 3 +++ .../squiggle-lang/__tests__/TS/Score_test.ts | 19 +++++++++++++++++++ .../Distributions/PointSetDist/Continuous.res | 5 ++++- .../PointSetDist/PointSetDist_Scoring.res | 1 + 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 packages/squiggle-lang/__tests__/Distributions/Score_test.res create mode 100644 packages/squiggle-lang/__tests__/TS/Score_test.ts diff --git a/packages/squiggle-lang/__tests__/Distributions/Score_test.res b/packages/squiggle-lang/__tests__/Distributions/Score_test.res new file mode 100644 index 00000000..eb096950 --- /dev/null +++ b/packages/squiggle-lang/__tests__/Distributions/Score_test.res @@ -0,0 +1,3 @@ +open Jest +open Expect +open TestHelpers diff --git a/packages/squiggle-lang/__tests__/TS/Score_test.ts b/packages/squiggle-lang/__tests__/TS/Score_test.ts new file mode 100644 index 00000000..c83133a7 --- /dev/null +++ b/packages/squiggle-lang/__tests__/TS/Score_test.ts @@ -0,0 +1,19 @@ +import { testRun } from "./TestHelpers"; + +describe("KL divergence", () => { + test("by integral solver agrees with analytical", () => { + let squiggleStringKL = `prediction=normal(4, 1) + answer=normal(1,1) + logSubtraction=dotSubtract(scaleLog(answer),scaleLog(prediction)) + klintegrand=dotMultiply(logSubtraction, answer) + klintegral = integralSum(klintegrand) + analyticalKl = log(1 / 1) + 1 ^ 2 / (2 * 1 ^ 2) + ((4 - 1) * (1 - 4) / (2 * 1 * 1)) - 1 / 2 + klintegral - analyticalKl`; + let squiggleResultKL = testRun(squiggleStringKL); + expect(squiggleResultKL.value).toBeCloseTo(0); + }); +}); + +let squiggleStringLS = `prediction=normal(4,1) + answer=normal(1,1) + logScore(prediction, answer)`; diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 6bbc95ae..1467239e 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -271,7 +271,10 @@ module T = Dist({ XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) let logScore = (base: t, reference: t) => { - combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference) + E.R2.bind( + combinePointwise(PointSetDist_Scoring.LogScoring.multiply, reference), + combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference), + ) |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) |> E.R.fmap(integralEndY) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 40ead2ce..157c3e23 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -4,4 +4,5 @@ module LogScoring = { let logScore = (a: float, b: float): result => Ok( Js.Math.log2(Js.Math.abs_float(a /. b)), ) + let multiply = (a: float, b: float): result => Ok(a *. b) } From 2d84805f8814510c5d06d620dd9319b9250d2200 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 2 May 2022 17:15:23 -0400 Subject: [PATCH 006/340] Added infinity error; fixed infinities in logs Value: [1e-3 to 3e-2] --- .../__tests__/Distributions/Scale_test.res | 19 +++++++++++++++++++ .../__tests__/Distributions/Score_test.res | 3 --- .../squiggle-lang/__tests__/TestHelpers.res | 16 ++++++++++++++++ .../DistributionOperation.res | 2 ++ .../DistributionOperation.resi | 4 ++++ .../Distributions/DistributionTypes.res | 1 + .../Distributions/PointSetDist/Discrete.res | 10 +++++----- .../src/rescript/Utility/Operation.res | 11 ++++++++++- 8 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 packages/squiggle-lang/__tests__/Distributions/Scale_test.res delete mode 100644 packages/squiggle-lang/__tests__/Distributions/Score_test.res diff --git a/packages/squiggle-lang/__tests__/Distributions/Scale_test.res b/packages/squiggle-lang/__tests__/Distributions/Scale_test.res new file mode 100644 index 00000000..c9d52d0c --- /dev/null +++ b/packages/squiggle-lang/__tests__/Distributions/Scale_test.res @@ -0,0 +1,19 @@ +/* +This test case comes via Nuño https://github.com/quantified-uncertainty/squiggle/issues/433 + + +*/ + +open Jest +open Expect +open TestHelpers + +describe("", () => { + test("", () => { + let scalelog = DistributionOperation.Constructors.scaleLogarithm(~env, mkExponential(10.0), 2.0) + + E.R2.bind(DistributionOperation.Constructors.mean(~env), scalelog) + ->expect + ->toEqual(Ok(-2.348336572091017)) + }) +}) diff --git a/packages/squiggle-lang/__tests__/Distributions/Score_test.res b/packages/squiggle-lang/__tests__/Distributions/Score_test.res deleted file mode 100644 index eb096950..00000000 --- a/packages/squiggle-lang/__tests__/Distributions/Score_test.res +++ /dev/null @@ -1,3 +0,0 @@ -open Jest -open Expect -open TestHelpers diff --git a/packages/squiggle-lang/__tests__/TestHelpers.res b/packages/squiggle-lang/__tests__/TestHelpers.res index cbb3258d..4502c68a 100644 --- a/packages/squiggle-lang/__tests__/TestHelpers.res +++ b/packages/squiggle-lang/__tests__/TestHelpers.res @@ -60,3 +60,19 @@ let cauchyMake = SymbolicDist.Cauchy.make let lognormalMake = SymbolicDist.Lognormal.make let triangularMake = SymbolicDist.Triangular.make let floatMake = SymbolicDist.Float.make + +let normalMakeR = (mean, stdev) => + E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Normal.make(mean, stdev)) +let betaMakeR = (alpha, beta) => + E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Beta.make(alpha, beta)) +let exponentialMakeR = rate => + E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Exponential.make(rate)) +let uniformMakeR = (low, high) => + E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Uniform.make(low, high)) +let cauchyMakeR = (local, rate) => + E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Cauchy.make(local, rate)) +let lognormalMakeR = (mu, sigma) => + E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Lognormal.make(mu, sigma)) +let triangularMakeR = (low, mode, high) => + E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Triangular.make(low, mode, high)) +// let floatMakeR = x =>E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Float.make(x)) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res index 8d65ca66..4d2f190e 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res @@ -266,6 +266,8 @@ module Constructors = { let algebraicLogarithm = (~env, dist1, dist2) => C.algebraicLogarithm(dist1, dist2)->run(~env)->toDistR let algebraicPower = (~env, dist1, dist2) => C.algebraicPower(dist1, dist2)->run(~env)->toDistR + let scalePower = (~env, dist, n) => C.scalePower(dist, n)->run(~env)->toDistR + let scaleLogarithm = (~env, dist, n) => C.scaleLogarithm(dist, n)->run(~env)->toDistR let pointwiseAdd = (~env, dist1, dist2) => C.pointwiseAdd(dist1, dist2)->run(~env)->toDistR let pointwiseMultiply = (~env, dist1, dist2) => C.pointwiseMultiply(dist1, dist2)->run(~env)->toDistR diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi index 738f0e89..4a54099c 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi @@ -85,6 +85,10 @@ module Constructors: { @genType let algebraicPower: (~env: env, genericDist, genericDist) => result @genType + let scaleLogarithm: (~env: env, genericDist, float) => result + @genType + let scalePower: (~env: env, genericDist, float) => result + @genType let pointwiseAdd: (~env: env, genericDist, genericDist) => result @genType let pointwiseMultiply: (~env: env, genericDist, genericDist) => result diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res index 2cc7df49..d5b38855 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res @@ -117,6 +117,7 @@ module DistributionOperation = { | ToFloat(#Mean) => `mean` | ToFloat(#Pdf(r)) => `pdf(${E.Float.toFixed(r)})` | ToFloat(#Sample) => `sample` + | ToFloat(#IntegralSum) => `integralSum` | ToScore(LogScore(_)) => `logScore` | ToDist(Normalize) => `normalize` | ToDist(ToPointSet) => `toPointSet` diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 59858420..4eef1f91 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -38,11 +38,11 @@ let combinePointwise = ( t1: PointSetTypes.discreteShape, t2: PointSetTypes.discreteShape, ): result => { - let combinedIntegralSum = Common.combineIntegralSums( - integralSumCachesFn, - t1.integralSumCache, - t2.integralSumCache, - ) + // let combinedIntegralSum = Common.combineIntegralSums( + // integralSumCachesFn, + // t1.integralSumCache, + // t2.integralSumCache, + // ) // TODO: does it ever make sense to pointwise combine the integrals here? // It could be done for pointwise additions, but is that ever needed? diff --git a/packages/squiggle-lang/src/rescript/Utility/Operation.res b/packages/squiggle-lang/src/rescript/Utility/Operation.res index 4a1ef91a..8f67c340 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Operation.res +++ b/packages/squiggle-lang/src/rescript/Utility/Operation.res @@ -52,6 +52,7 @@ module Convolution = { type operationError = | DivisionByZeroError | ComplexNumberError + | InfinityError @genType module Error = { @@ -62,6 +63,7 @@ module Error = { switch err { | DivisionByZeroError => "Cannot divide by zero" | ComplexNumberError => "Operation returned complex result" + | InfinityError => "Operation returned + or - infinity" } } @@ -86,6 +88,8 @@ let logarithm = (a: float, b: float): result => Ok(0.) } else if a > 0.0 && b > 0.0 { Ok(log(a) /. log(b)) + } else if a == 0.0 { + Error(InfinityError) } else { Error(ComplexNumberError) } @@ -150,7 +154,12 @@ module Scale = { | #Multiply => Ok(a *. b) | #Divide => divide(a, b) | #Power => power(a, b) - | #Logarithm => logarithm(a, b) + | #Logarithm => + if a < MagicNumbers.Epsilon.seven { + Ok(0.0) + } else { + logarithm(a, b) + } } let format = (operation: t, value, scaleBy) => From a4c3405e5d9ff8505e027b103855c69d6f511bd8 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 2 May 2022 17:37:50 -0400 Subject: [PATCH 007/340] Added showTypes tag to playground Value: [1e-8 to 1e-4] --- packages/website/src/pages/playground.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/website/src/pages/playground.js b/packages/website/src/pages/playground.js index 52bac323..c3760c10 100644 --- a/packages/website/src/pages/playground.js +++ b/packages/website/src/pages/playground.js @@ -10,7 +10,11 @@ export default function PlaygroundPage() { maxWidth: 2000, }} > - + ); From ca95c7cef881cfe4713ad71eaeec699e9055c2a9 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 2 May 2022 17:46:43 -0400 Subject: [PATCH 008/340] base 2 log => natural log (on the advice of Nuno) Value: [1e-4 to 2e-1] --- .../Distributions/PointSetDist/PointSetDist_Scoring.res | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 157c3e23..d025d835 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -1,8 +1,8 @@ module LogScoring = { - let logFn = Js.Math.log2 + let logFn = Js.Math.log let subtraction = (a, b) => Ok(a -. b) let logScore = (a: float, b: float): result => Ok( - Js.Math.log2(Js.Math.abs_float(a /. b)), + logFn(Js.Math.abs_float(a /. b)), ) let multiply = (a: float, b: float): result => Ok(a *. b) } From 96ed0b44bbb9c30506b754dd9416659a053c37f9 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 2 May 2022 18:29:47 -0400 Subject: [PATCH 009/340] skip the bad test Value: [1e-6 to 5e-4] --- packages/squiggle-lang/__tests__/TS/Score_test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/squiggle-lang/__tests__/TS/Score_test.ts b/packages/squiggle-lang/__tests__/TS/Score_test.ts index c83133a7..a7d24023 100644 --- a/packages/squiggle-lang/__tests__/TS/Score_test.ts +++ b/packages/squiggle-lang/__tests__/TS/Score_test.ts @@ -1,7 +1,7 @@ import { testRun } from "./TestHelpers"; describe("KL divergence", () => { - test("by integral solver agrees with analytical", () => { + test.skip("by integral solver agrees with analytical", () => { let squiggleStringKL = `prediction=normal(4, 1) answer=normal(1,1) logSubtraction=dotSubtract(scaleLog(answer),scaleLog(prediction)) From 20adc4e25a6dc8d11fe5cd90a067b8b871d7495f Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 2 May 2022 18:40:34 -0400 Subject: [PATCH 010/340] describe and test strings. --- packages/squiggle-lang/__tests__/Distributions/Scale_test.res | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/Scale_test.res b/packages/squiggle-lang/__tests__/Distributions/Scale_test.res index c9d52d0c..648013f6 100644 --- a/packages/squiggle-lang/__tests__/Distributions/Scale_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/Scale_test.res @@ -8,8 +8,8 @@ open Jest open Expect open TestHelpers -describe("", () => { - test("", () => { +describe("Scale logarithm", () => { + test("mean of the base two scalar logarithm of an exponential(10)", () => { let scalelog = DistributionOperation.Constructors.scaleLogarithm(~env, mkExponential(10.0), 2.0) E.R2.bind(DistributionOperation.Constructors.mean(~env), scalelog) From 5d6de7b4878371d0d07d8a0395d2885499844e49 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 3 May 2022 10:15:48 -0400 Subject: [PATCH 011/340] Response to CR Value: [1e-4 to 4e-3] --- .../squiggle-lang/__tests__/TestHelpers.res | 21 +++++++------------ .../Distributions/PointSetDist/Discrete.res | 1 - .../PointSetDist/PointSetDist_Scoring.res | 12 ++++++++--- .../src/rescript/Utility/Operation.res | 6 ++++-- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/packages/squiggle-lang/__tests__/TestHelpers.res b/packages/squiggle-lang/__tests__/TestHelpers.res index 4502c68a..c9ed718e 100644 --- a/packages/squiggle-lang/__tests__/TestHelpers.res +++ b/packages/squiggle-lang/__tests__/TestHelpers.res @@ -61,18 +61,13 @@ let lognormalMake = SymbolicDist.Lognormal.make let triangularMake = SymbolicDist.Triangular.make let floatMake = SymbolicDist.Float.make -let normalMakeR = (mean, stdev) => - E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Normal.make(mean, stdev)) -let betaMakeR = (alpha, beta) => - E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Beta.make(alpha, beta)) -let exponentialMakeR = rate => - E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Exponential.make(rate)) -let uniformMakeR = (low, high) => - E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Uniform.make(low, high)) -let cauchyMakeR = (local, rate) => - E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Cauchy.make(local, rate)) -let lognormalMakeR = (mu, sigma) => - E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Lognormal.make(mu, sigma)) +let fmapGenDist = symbdistres => E.R.fmap(s => DistributionTypes.Symbolic(s), symbdistres) +let normalMakeR = (mean, stdev) => fmapGenDist(SymbolicDist.Normal.make(mean, stdev)) +let betaMakeR = (alpha, beta) => fmapGenDist(SymbolicDist.Beta.make(alpha, beta)) +let exponentialMakeR = rate => fmapGenDist(SymbolicDist.Exponential.make(rate)) +let uniformMakeR = (low, high) => fmapGenDist(SymbolicDist.Uniform.make(low, high)) +let cauchyMakeR = (local, rate) => fmapGenDist(SymbolicDist.Cauchy.make(local, rate)) +let lognormalMakeR = (mu, sigma) => fmapGenDist(SymbolicDist.Lognormal.make(mu, sigma)) let triangularMakeR = (low, mode, high) => - E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Triangular.make(low, mode, high)) + fmapGenDist(SymbolicDist.Triangular.make(low, mode, high)) // let floatMakeR = x =>E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Float.make(x)) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 4eef1f91..a6c04e6b 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -233,6 +233,5 @@ module T = Dist({ combinePointwise(~fn=PointSetDist_Scoring.LogScoring.logScore, base, reference) |> E.R2.bind( integralEndYResult, ) - // |> (r => Ok(r)) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index d025d835..1524243d 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -1,8 +1,14 @@ module LogScoring = { let logFn = Js.Math.log let subtraction = (a, b) => Ok(a -. b) - let logScore = (a: float, b: float): result => Ok( - logFn(Js.Math.abs_float(a /. b)), - ) + let logScore = (a: float, b: float): result => + if a == 0.0 { + Error(Operation.Error.NegativeInfinityError) + } else if b == 0.0 { + Error(Operation.Error.DivideByZeroError) + } else { + let quot = a /. b + quot < 0.0 ? Error(OperationError.ComplexNumberError) : Ok(logFn(quot)) + } let multiply = (a: float, b: float): result => Ok(a *. b) } diff --git a/packages/squiggle-lang/src/rescript/Utility/Operation.res b/packages/squiggle-lang/src/rescript/Utility/Operation.res index 8f67c340..a14fdcdc 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Operation.res +++ b/packages/squiggle-lang/src/rescript/Utility/Operation.res @@ -53,6 +53,7 @@ type operationError = | DivisionByZeroError | ComplexNumberError | InfinityError + | NegativeInfinityError @genType module Error = { @@ -63,7 +64,8 @@ module Error = { switch err { | DivisionByZeroError => "Cannot divide by zero" | ComplexNumberError => "Operation returned complex result" - | InfinityError => "Operation returned + or - infinity" + | InfinityError => "Operation returned positive infinity" + | NegativeInfinityError => "Operation returned negative infinity" } } @@ -89,7 +91,7 @@ let logarithm = (a: float, b: float): result => } else if a > 0.0 && b > 0.0 { Ok(log(a) /. log(b)) } else if a == 0.0 { - Error(InfinityError) + Error(NegativeInfinityError) } else { Error(ComplexNumberError) } From cec4bbd334c3043c05f5efdc98e9712d819c8fda Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 3 May 2022 10:20:01 -0400 Subject: [PATCH 012/340] fixed build Value: [1e-6 to 1e-4] --- .../Distributions/PointSetDist/PointSetDist_Scoring.res | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 1524243d..2e5bb4ed 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -3,12 +3,12 @@ module LogScoring = { let subtraction = (a, b) => Ok(a -. b) let logScore = (a: float, b: float): result => if a == 0.0 { - Error(Operation.Error.NegativeInfinityError) + Error(Operation.NegativeInfinityError) } else if b == 0.0 { - Error(Operation.Error.DivideByZeroError) + Error(Operation.DivisionByZeroError) } else { let quot = a /. b - quot < 0.0 ? Error(OperationError.ComplexNumberError) : Ok(logFn(quot)) + quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(logFn(quot)) } let multiply = (a: float, b: float): result => Ok(a *. b) } From d5c9705811592c8958333430cc04650a61b26f6a Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 3 May 2022 14:00:34 -0400 Subject: [PATCH 013/340] Corrected log score Value: [5e-5 to 2e-2] --- .../Distributions/PointSetDist/Continuous.res | 22 ++++++++++++++----- .../Distributions/PointSetDist/Discrete.res | 17 +++++++++++--- .../PointSetDist/Distributions.res | 14 ++++++++++++ .../Distributions/PointSetDist/Mixed.res | 17 +++++++++++--- .../squiggle-lang/src/rescript/Utility/E.res | 3 +++ 5 files changed, 61 insertions(+), 12 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 1467239e..06c54040 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -271,12 +271,22 @@ module T = Dist({ XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) let logScore = (base: t, reference: t) => { - E.R2.bind( - combinePointwise(PointSetDist_Scoring.LogScoring.multiply, reference), - combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference), - ) - |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) - |> E.R.fmap(integralEndY) + let referenceIsZero = switch Distributions.Common.isZeroEverywhere( + PointSetTypes.Continuous(reference), + ) { + | Continuous(b) => b + | _ => false + } + if referenceIsZero { + Ok(0.0) + } else { + E.R2.bind( + combinePointwise(PointSetDist_Scoring.LogScoring.multiply, reference), + combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference), + ) + |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) + |> E.R.fmap(integralEndY) + } } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index a6c04e6b..a74283dd 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -230,8 +230,19 @@ module T = Dist({ } let logScore = (base: t, reference: t) => { - combinePointwise(~fn=PointSetDist_Scoring.LogScoring.logScore, base, reference) |> E.R2.bind( - integralEndYResult, - ) + let referenceIsZero = switch Distributions.Common.isZeroEverywhere( + PointSetTypes.Discrete(reference), + ) { + | Discrete(b) => b + | _ => false + } + if referenceIsZero { + Ok(0.0) + } else { + E.R2.bind( + combinePointwise(~fn=PointSetDist_Scoring.LogScoring.multiply, reference), + combinePointwise(~fn=PointSetDist_Scoring.LogScoring.logScore, base, reference), + ) |> E.R2.bind(integralEndYResult) + } } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res index 15da318d..0ad3b24a 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res @@ -96,4 +96,18 @@ module Common = { None | (Some(s1), Some(s2)) => combineFn(s1, s2) } + + let isZeroEverywhere = (d: PointSetTypes.pointSetDist) => { + let isZero = (x: float): bool => x == 0.0 + PointSetTypes.ShapeMonad.fmap( + d, + ( + mixed => + E.A.all(isZero, mixed.continuous.xyShape.ys) && + E.A.all(isZero, mixed.discrete.xyShape.ys), + disc => E.A.all(isZero, disc.xyShape.ys), + cont => E.A.all(isZero, cont.xyShape.ys), + ), + ) + } } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 3d36d421..0e528496 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -302,9 +302,20 @@ module T = Dist({ } let logScore = (base: t, reference: t) => { - combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference) |> E.R.fmap( - integralEndY, - ) + let referenceIsZero = switch Distributions.Common.isZeroEverywhere( + PointSetTypes.Mixed(reference), + ) { + | Mixed(b) => b + | _ => false + } + if referenceIsZero { + Ok(0.0) + } else { + E.R2.bind( + combinePointwise(PointSetDist_Scoring.LogScoring.multiply, reference), + combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference), + ) |> E.R.fmap(integralEndY) + } } }) diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 472c32f7..076fc89f 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -606,6 +606,9 @@ module A = { let filter = Js.Array.filter let joinWith = Js.Array.joinWith + let all = (p: 'a => bool, xs: array<'a>): bool => length(filter(p, xs)) == length(xs) + let any = (p: 'a => bool, xs: array<'a>): bool => length(filter(p, xs)) > 0 + module O = { let concatSomes = (optionals: array>): array<'a> => optionals From 0baeedfb46e84489a69fd142091c235898490358 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 4 May 2022 11:42:51 -0400 Subject: [PATCH 014/340] pointwiseSubtract test; logscale test Value: [1e-5 to 5e-4] --- .../__tests__/Distributions/Dotwise_test.res | 50 +++++++++++++++++++ .../__tests__/Distributions/Scale_test.res | 33 ++++++++---- .../__tests__/Distributions/Score_test.res | 11 ++++ packages/squiggle-lang/bsconfig.json | 3 +- 4 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res create mode 100644 packages/squiggle-lang/__tests__/Distributions/Score_test.res diff --git a/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res b/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res new file mode 100644 index 00000000..6a61e3e1 --- /dev/null +++ b/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res @@ -0,0 +1,50 @@ +open Jest +open Expect +open TestHelpers +open FastCheck +open Arbitrary +open Property.Sync + +describe("dotSubtract", () => { + test("mean of normal minus exponential (unit)", () => { + let mean = 0.0 + let rate = 10.0 + + let dotDifference = DistributionOperation.Constructors.pointwiseSubtract( + ~env, + mkNormal(mean, 1.0), + mkExponential(rate), + ) + let meanResult = E.R2.bind(DistributionOperation.Constructors.mean(~env), dotDifference) + let meanAnalytical = mean -. 1.0 /. rate + switch meanResult { + | Ok(meanValue) => meanValue->expect->toBeCloseTo(meanAnalytical) + | Error(err) => err->expect->toBe(DistributionTypes.OperationError(DivisionByZeroError)) + } + }) + Skip.test("mean of normal minus exponential (property)", () => { + assert_( + property2(float_(), floatRange(1e-5, 1e5), (mean, rate) => { + // We limit ourselves to stdev=1 so that the integral is trivial + let dotDifference = DistributionOperation.Constructors.pointwiseSubtract( + ~env, + mkNormal(mean, 1.0), + mkExponential(rate), + ) + let meanResult = E.R2.bind(DistributionOperation.Constructors.mean(~env), dotDifference) + // according to algebra or random variables, + let meanAnalytical = mean -. 1.0 /. rate + Js.Console.log3( + mean, + rate, + E.R.fmap(x => abs_float(x -. meanAnalytical) /. abs_float(meanAnalytical), meanResult), + ) + switch meanResult { + | Ok(meanValue) => abs_float(meanValue -. meanAnalytical) /. abs_float(meanValue) < 1e-2 // 1% relative error + | Error(err) => err === DistributionTypes.OperationError(DivisionByZeroError) + } + }), + ) + pass + }) +}) diff --git a/packages/squiggle-lang/__tests__/Distributions/Scale_test.res b/packages/squiggle-lang/__tests__/Distributions/Scale_test.res index 648013f6..45151e99 100644 --- a/packages/squiggle-lang/__tests__/Distributions/Scale_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/Scale_test.res @@ -1,19 +1,30 @@ -/* -This test case comes via Nuño https://github.com/quantified-uncertainty/squiggle/issues/433 - - -*/ - open Jest open Expect open TestHelpers describe("Scale logarithm", () => { - test("mean of the base two scalar logarithm of an exponential(10)", () => { - let scalelog = DistributionOperation.Constructors.scaleLogarithm(~env, mkExponential(10.0), 2.0) + // test("mean of the base e scalar logarithm of an exponential(10)", () => { + // let rate = 10.0 + // let scalelog = DistributionOperation.Constructors.scaleLogarithm(~env, mkExponential(rate), MagicNumbers.Math.e) + // + // let meanResult = E.R2.bind(DistributionOperation.Constructors.mean(~env), scalelog) + // let meanAnalytical = Js.Math.log(rate /. MagicNumbers.Math.e) + // switch meanResult { + // | Ok(meanValue) => meanValue -> expect -> toBeCloseTo(meanAnalytical) + // | Error(err) => err -> expect -> toBe(DistributionTypes.OperationError(DivisionByZeroError)) + // } + // }) + let low = 10.0 + let high = 100.0 + let scalelog = DistributionOperation.Constructors.scaleLogarithm(~env, mkUniform(low, high), 2.0) - E.R2.bind(DistributionOperation.Constructors.mean(~env), scalelog) - ->expect - ->toEqual(Ok(-2.348336572091017)) + test("mean of the base 2 scalar logarithm of a uniform(10, 100)", () => { + //For uniform pdf `_ => 1 / (b - a)`, the expected value of log of uniform is `integral from a to b of x * log(1 / (b -a)) dx` + let meanResult = E.R2.bind(DistributionOperation.Constructors.mean(~env), scalelog) + let meanAnalytical = -.Js.Math.log2(high -. low) /. 2.0 *. (high ** 2.0 -. low ** 2.0) // -. Js.Math.log2(high -. low) + switch meanResult { + | Ok(meanValue) => meanValue->expect->toBeCloseTo(meanAnalytical) + | Error(err) => err->expect->toBe(DistributionTypes.OperationError(NegativeInfinityError)) + } }) }) diff --git a/packages/squiggle-lang/__tests__/Distributions/Score_test.res b/packages/squiggle-lang/__tests__/Distributions/Score_test.res new file mode 100644 index 00000000..33cb0c82 --- /dev/null +++ b/packages/squiggle-lang/__tests__/Distributions/Score_test.res @@ -0,0 +1,11 @@ +/* +This test case comes via Nuño https://github.com/quantified-uncertainty/squiggle/issues/433 +*/ +open Jest +open Expect + +describe("KL divergence", () => { + test("our's agrees with analytical", () => { + true->expect->toBe(true) + }) +}) diff --git a/packages/squiggle-lang/bsconfig.json b/packages/squiggle-lang/bsconfig.json index e98b3822..81e4e133 100644 --- a/packages/squiggle-lang/bsconfig.json +++ b/packages/squiggle-lang/bsconfig.json @@ -20,7 +20,8 @@ ], "suffix": ".bs.js", "namespace": true, - "bs-dependencies": ["@glennsl/rescript-jest", "bisect_ppx"], + "bs-dependencies": ["bisect_ppx"], + "bs-dev-dependencies": ["@glennsl/rescript-jest", "rescript-fast-check"], "gentypeconfig": { "language": "typescript", "module": "commonjs", From f5f5be2cfbec844cf845a673931b6d3849cffda1 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 4 May 2022 11:43:44 -0400 Subject: [PATCH 015/340] ?? build broke, had to add a `ModuleName.` prefix to a constructor Value: [1e-7 to 1e-5] --- .../Reducer_Expression/Reducer_Expression_ExpressionBuilder.res | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res index 9c9f922e..7ccea9fc 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res @@ -14,7 +14,7 @@ let eArray = anArray => anArray->BExpressionValue.EvArray->BExpressionT.EValue let eArrayString = anArray => anArray->BExpressionValue.EvArrayString->BExpressionT.EValue let eBindings = (anArray: array<(string, BExpressionValue.expressionValue)>) => - anArray->Js.Dict.fromArray->EvRecord->BExpressionT.EValue + anArray->Js.Dict.fromArray->BExpressionValue.EvRecord->BExpressionT.EValue let eBool = aBool => aBool->BExpressionValue.EvBool->BExpressionT.EValue From 627616558a446b1172163140a3f7174b6f9a2d84 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 4 May 2022 11:48:20 -0400 Subject: [PATCH 016/340] Made multiplicative factor in `Scoring` file rather than with `bind` calls Value: [1e-5 to 7.5e-4] --- .../src/rescript/Distributions/PointSetDist/Continuous.res | 5 +---- .../src/rescript/Distributions/PointSetDist/Discrete.res | 7 +++---- .../src/rescript/Distributions/PointSetDist/Mixed.res | 7 +++---- .../Distributions/PointSetDist/PointSetDist_Scoring.res | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 06c54040..6bcdd8ee 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -280,10 +280,7 @@ module T = Dist({ if referenceIsZero { Ok(0.0) } else { - E.R2.bind( - combinePointwise(PointSetDist_Scoring.LogScoring.multiply, reference), - combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference), - ) + combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference) |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) |> E.R.fmap(integralEndY) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index a74283dd..73d967f3 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -239,10 +239,9 @@ module T = Dist({ if referenceIsZero { Ok(0.0) } else { - E.R2.bind( - combinePointwise(~fn=PointSetDist_Scoring.LogScoring.multiply, reference), - combinePointwise(~fn=PointSetDist_Scoring.LogScoring.logScore, base, reference), - ) |> E.R2.bind(integralEndYResult) + combinePointwise(~fn=PointSetDist_Scoring.LogScoring.logScore, base, reference) |> E.R2.bind( + integralEndYResult, + ) } } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 0e528496..d79465e7 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -311,10 +311,9 @@ module T = Dist({ if referenceIsZero { Ok(0.0) } else { - E.R2.bind( - combinePointwise(PointSetDist_Scoring.LogScoring.multiply, reference), - combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference), - ) |> E.R.fmap(integralEndY) + combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference) |> E.R.fmap( + integralEndY, + ) } } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 2e5bb4ed..32a1a7b1 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -8,7 +8,7 @@ module LogScoring = { Error(Operation.DivisionByZeroError) } else { let quot = a /. b - quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(logFn(quot)) + quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(b *. logFn(quot)) } let multiply = (a: float, b: float): result => Ok(a *. b) } From 32f141abdc8711020e27e66147907e12cef6e4cc Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 4 May 2022 11:54:23 -0400 Subject: [PATCH 017/340] Renamed `LogScoring` to `KLDivergence` Value: [1e-7 to 1e-4] --- .../src/rescript/Distributions/PointSetDist/Continuous.res | 2 +- .../src/rescript/Distributions/PointSetDist/Discrete.res | 2 +- .../src/rescript/Distributions/PointSetDist/Mixed.res | 2 +- .../Distributions/PointSetDist/PointSetDist_Scoring.res | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 6bcdd8ee..2afd1008 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -280,7 +280,7 @@ module T = Dist({ if referenceIsZero { Ok(0.0) } else { - combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference) + combinePointwise(PointSetDist_Scoring.KLDivergence.logScore, base, reference) |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) |> E.R.fmap(integralEndY) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 73d967f3..45a92447 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -239,7 +239,7 @@ module T = Dist({ if referenceIsZero { Ok(0.0) } else { - combinePointwise(~fn=PointSetDist_Scoring.LogScoring.logScore, base, reference) |> E.R2.bind( + combinePointwise(~fn=PointSetDist_Scoring.KLDivergence.logScore, base, reference) |> E.R2.bind( integralEndYResult, ) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index d79465e7..a3b41401 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -311,7 +311,7 @@ module T = Dist({ if referenceIsZero { Ok(0.0) } else { - combinePointwise(PointSetDist_Scoring.LogScoring.logScore, base, reference) |> E.R.fmap( + combinePointwise(PointSetDist_Scoring.KLDivergence.logScore, base, reference) |> E.R.fmap( integralEndY, ) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 32a1a7b1..4a607281 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -1,4 +1,4 @@ -module LogScoring = { +module KLDivergence = { let logFn = Js.Math.log let subtraction = (a, b) => Ok(a -. b) let logScore = (a: float, b: float): result => From 683439c7e53ab7443c60989fa71c3c208f90e4ae Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 4 May 2022 11:59:46 -0400 Subject: [PATCH 018/340] Changed `Ok(0)` to `Error(NegativeInfinityError)`. Value: [1e-7 to 1e-5] --- .../src/rescript/Distributions/PointSetDist/Discrete.res | 8 +++++--- packages/squiggle-lang/src/rescript/Utility/Operation.res | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 45a92447..0f2e2eb3 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -239,9 +239,11 @@ module T = Dist({ if referenceIsZero { Ok(0.0) } else { - combinePointwise(~fn=PointSetDist_Scoring.KLDivergence.logScore, base, reference) |> E.R2.bind( - integralEndYResult, - ) + combinePointwise( + ~fn=PointSetDist_Scoring.KLDivergence.logScore, + base, + reference, + ) |> E.R2.bind(integralEndYResult) } } }) diff --git a/packages/squiggle-lang/src/rescript/Utility/Operation.res b/packages/squiggle-lang/src/rescript/Utility/Operation.res index a14fdcdc..bd4e799f 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Operation.res +++ b/packages/squiggle-lang/src/rescript/Utility/Operation.res @@ -157,8 +157,8 @@ module Scale = { | #Divide => divide(a, b) | #Power => power(a, b) | #Logarithm => - if a < MagicNumbers.Epsilon.seven { - Ok(0.0) + if a < MagicNumbers.Epsilon.ten { + Error(NegativeInfinityError) } else { logarithm(a, b) } From 3fcc82442d26cdde55ab523a94e4d7d2a60c7f24 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 4 May 2022 12:21:30 -0400 Subject: [PATCH 019/340] Completed renaming to `KLDivergence` Value: [1e-8 to 1e-4] --- .../squiggle-lang/__tests__/Distributions/Scale_test.res | 2 +- .../DistributionOperation/DistributionOperation.res | 2 +- .../src/rescript/Distributions/DistributionTypes.res | 6 +++--- .../ReducerInterface_GenericDistribution.res | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/Scale_test.res b/packages/squiggle-lang/__tests__/Distributions/Scale_test.res index 45151e99..85622308 100644 --- a/packages/squiggle-lang/__tests__/Distributions/Scale_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/Scale_test.res @@ -24,7 +24,7 @@ describe("Scale logarithm", () => { let meanAnalytical = -.Js.Math.log2(high -. low) /. 2.0 *. (high ** 2.0 -. low ** 2.0) // -. Js.Math.log2(high -. low) switch meanResult { | Ok(meanValue) => meanValue->expect->toBeCloseTo(meanAnalytical) - | Error(err) => err->expect->toBe(DistributionTypes.OperationError(NegativeInfinityError)) + | Error(err) => err->expect->toEqual(DistributionTypes.OperationError(NegativeInfinityError)) } }) }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res index fe142188..fa6f0f39 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res @@ -144,7 +144,7 @@ let rec run = (~env, functionCallInfo: functionCallInfo): outputType => { Dist(dist) } | ToDist(Normalize) => dist->GenericDist.normalize->Dist - | ToScore(LogScore(t2)) => + | ToScore(KLDivergence(t2)) => GenericDist.logScore(dist, t2, ~toPointSetFn) ->E.R2.fmap(r => Float(r)) ->OutputLocal.fromResult diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res index d5b38855..9e004288 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res @@ -90,7 +90,7 @@ module DistributionOperation = { | ToString | ToSparkline(int) - type toScore = LogScore(genericDist) + type toScore = KLDivergence(genericDist) type fromDist = | ToFloat(toFloat) @@ -118,7 +118,7 @@ module DistributionOperation = { | ToFloat(#Pdf(r)) => `pdf(${E.Float.toFixed(r)})` | ToFloat(#Sample) => `sample` | ToFloat(#IntegralSum) => `integralSum` - | ToScore(LogScore(_)) => `logScore` + | ToScore(KLDivergence(_)) => `klDivergence` | ToDist(Normalize) => `normalize` | ToDist(ToPointSet) => `toPointSet` | ToDist(ToSampleSet(r)) => `toSampleSet(${E.I.toString(r)})` @@ -157,7 +157,7 @@ module Constructors = { let fromSamples = (xs): t => FromSamples(xs) let truncate = (dist, left, right): t => FromDist(ToDist(Truncate(left, right)), dist) let inspect = (dist): t => FromDist(ToDist(Inspect), dist) - let logScore = (dist1, dist2): t => FromDist(ToScore(LogScore(dist2)), dist1) + let logScore = (dist1, dist2): t => FromDist(ToScore(KLDivergence(dist2)), dist1) let scalePower = (dist, n): t => FromDist(ToDist(Scale(#Power, n)), dist) let scaleLogarithm = (dist, n): t => FromDist(ToDist(Scale(#Logarithm, n)), dist) let toString = (dist): t => FromDist(ToString(ToString), dist) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index c9051869..6272a7c4 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -210,8 +210,8 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) a, )->Some | ("normalize", [EvDistribution(dist)]) => Helpers.toDistFn(Normalize, dist) - | ("logScore", [EvDistribution(a), EvDistribution(b)]) => - Some(runGenericOperation(FromDist(ToScore(LogScore(b)), a))) + | ("klDivergence", [EvDistribution(a), EvDistribution(b)]) => + Some(runGenericOperation(FromDist(ToScore(KLDivergence(b)), a))) | ("isNormalized", [EvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist) | ("toPointSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToPointSet, dist) | ("scaleLog", [EvDistribution(dist)]) => From c95c56cfb8ad214741fa4b458981511b0f40ca89 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 4 May 2022 13:02:58 -0400 Subject: [PATCH 020/340] Added `logScaleWithThreshold(eps)` and completed renaming to `klDivergence` Value: [1e-5 to 1e-3] --- .../DistributionOperation.res | 11 ++++++++- .../Distributions/DistributionTypes.res | 7 ++++++ .../Distributions/GenericDist/GenericDist.res | 19 ++++++++------- .../GenericDist/GenericDist.resi | 2 +- .../Distributions/PointSetDist/Continuous.res | 2 +- .../Distributions/PointSetDist/Discrete.res | 2 +- .../PointSetDist/Distributions.res | 4 ++-- .../Distributions/PointSetDist/Mixed.res | 2 +- .../PointSetDist/PointSetDist.res | 10 ++++---- .../ReducerInterface_GenericDistribution.res | 2 ++ .../src/rescript/Utility/Operation.res | 23 +++++++++++++++---- 11 files changed, 60 insertions(+), 24 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res index fa6f0f39..6872136e 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res @@ -145,7 +145,7 @@ let rec run = (~env, functionCallInfo: functionCallInfo): outputType => { } | ToDist(Normalize) => dist->GenericDist.normalize->Dist | ToScore(KLDivergence(t2)) => - GenericDist.logScore(dist, t2, ~toPointSetFn) + GenericDist.klDivergence(dist, t2, ~toPointSetFn) ->E.R2.fmap(r => Float(r)) ->OutputLocal.fromResult | ToBool(IsNormalized) => dist->GenericDist.isNormalized->Bool @@ -163,6 +163,15 @@ let rec run = (~env, functionCallInfo: functionCallInfo): outputType => { ->GenericDist.toPointSet(~xyPointLength, ~sampleCount, ()) ->E.R2.fmap(r => Dist(PointSet(r))) ->OutputLocal.fromResult + | ToDist(Scale(#LogarithmWithThreshold(eps), f)) => + dist + ->GenericDist.pointwiseCombinationFloat( + ~toPointSetFn, + ~algebraicCombination=#LogarithmWithThreshold(eps), + ~f, + ) + ->E.R2.fmap(r => Dist(r)) + ->OutputLocal.fromResult | ToDist(Scale(#Logarithm, f)) => dist ->GenericDist.pointwiseCombinationFloat(~toPointSetFn, ~algebraicCombination=#Logarithm, ~f) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res index 9e004288..03210270 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res @@ -72,6 +72,7 @@ module DistributionOperation = { type toScaleFn = [ | #Power | #Logarithm + | #LogarithmWithThreshold(float) ] type toDist = @@ -126,6 +127,8 @@ module DistributionOperation = { | ToDist(Inspect) => `inspect` | ToDist(Scale(#Power, r)) => `scalePower(${E.Float.toFixed(r)})` | ToDist(Scale(#Logarithm, r)) => `scaleLog(${E.Float.toFixed(r)})` + | ToDist(Scale(#LogarithmWithThreshold(eps), r)) => + `scaleLogWithThreshold(${E.Float.toFixed(r)}, epsilon=${E.Float.toFixed(eps)})` | ToString(ToString) => `toString` | ToString(ToSparkline(n)) => `toSparkline(${E.I.toString(n)})` | ToBool(IsNormalized) => `isNormalized` @@ -160,6 +163,10 @@ module Constructors = { let logScore = (dist1, dist2): t => FromDist(ToScore(KLDivergence(dist2)), dist1) let scalePower = (dist, n): t => FromDist(ToDist(Scale(#Power, n)), dist) let scaleLogarithm = (dist, n): t => FromDist(ToDist(Scale(#Logarithm, n)), dist) + let scaleLogarithmWithThreshold = (dist, n, eps): t => FromDist( + ToDist(Scale(#LogarithmWithThreshold(eps), n)), + dist, + ) let toString = (dist): t => FromDist(ToString(ToString), dist) let toSparkline = (dist, n): t => FromDist(ToString(ToSparkline(n)), dist) let algebraicAdd = (dist1, dist2: genericDist): t => FromDist( diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.res index b30a46b4..2085d72c 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.res @@ -59,10 +59,10 @@ let integralEndY = (t: t): float => let isNormalized = (t: t): bool => Js.Math.abs_float(integralEndY(t) -. 1.0) < 1e-7 -let logScore = (t1, t2, ~toPointSetFn: toPointSetFn): result => { +let klDivergence = (t1, t2, ~toPointSetFn: toPointSetFn): result => { let pointSets = E.R.merge(toPointSetFn(t1), toPointSetFn(t2)) pointSets |> E.R2.bind(((a, b)) => - PointSetDist.T.logScore(a, b)->E.R2.errMap(x => DistributionTypes.OperationError(x)) + PointSetDist.T.klDivergence(a, b)->E.R2.errMap(x => DistributionTypes.OperationError(x)) ) } @@ -391,14 +391,12 @@ let pointwiseCombinationFloat = ( ~algebraicCombination: Operation.algebraicOperation, ~f: float, ): result => { - let m = switch algebraicCombination { - | #Add | #Subtract => Error(DistributionTypes.DistributionVerticalShiftIsInvalid) - | (#Multiply | #Divide | #Power | #Logarithm) as arithmeticOperation => + let executeCombination = arithOp => toPointSetFn(t)->E.R.bind(t => { //TODO: Move to PointSet codebase - let fn = (secondary, main) => Operation.Scale.toFn(arithmeticOperation, main, secondary) - let integralSumCacheFn = Operation.Scale.toIntegralSumCacheFn(arithmeticOperation) - let integralCacheFn = Operation.Scale.toIntegralCacheFn(arithmeticOperation) + let fn = (secondary, main) => Operation.Scale.toFn(arithOp, main, secondary) + let integralSumCacheFn = Operation.Scale.toIntegralSumCacheFn(arithOp) + let integralCacheFn = Operation.Scale.toIntegralCacheFn(arithOp) PointSetDist.T.mapYResult( ~integralSumCacheFn=integralSumCacheFn(f), ~integralCacheFn=integralCacheFn(f), @@ -406,6 +404,11 @@ let pointwiseCombinationFloat = ( t, )->E.R2.errMap(x => DistributionTypes.OperationError(x)) }) + let m = switch algebraicCombination { + | #Add | #Subtract => Error(DistributionTypes.DistributionVerticalShiftIsInvalid) + | (#Multiply | #Divide | #Power | #Logarithm) as arithmeticOperation => + executeCombination(arithmeticOperation) + | #LogarithmWithThreshold(eps) => executeCombination(#LogarithmWithThreshold(eps)) } m->E.R2.fmap(r => DistributionTypes.PointSet(r)) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi index cd1b72a9..03bc5fe8 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi @@ -23,7 +23,7 @@ let toFloatOperation: ( ~distToFloatOperation: DistributionTypes.DistributionOperation.toFloat, ) => result -let logScore: (t, t, ~toPointSetFn: toPointSetFn) => result +let klDivergence: (t, t, ~toPointSetFn: toPointSetFn) => result @genType let toPointSet: ( diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 2afd1008..93f6c1c9 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -270,7 +270,7 @@ module T = Dist({ let variance = (t: t): float => XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) - let logScore = (base: t, reference: t) => { + let klDivergence = (base: t, reference: t) => { let referenceIsZero = switch Distributions.Common.isZeroEverywhere( PointSetTypes.Continuous(reference), ) { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 0f2e2eb3..8ec9410f 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -229,7 +229,7 @@ module T = Dist({ XYShape.Analysis.getVarianceDangerously(t, mean, getMeanOfSquares) } - let logScore = (base: t, reference: t) => { + let klDivergence = (base: t, reference: t) => { let referenceIsZero = switch Distributions.Common.isZeroEverywhere( PointSetTypes.Discrete(reference), ) { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res index 0ad3b24a..5c9ee1aa 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res @@ -33,7 +33,7 @@ module type dist = { let mean: t => float let variance: t => float - let logScore: (t, t) => result + let klDivergence: (t, t) => result } module Dist = (T: dist) => { @@ -56,7 +56,7 @@ module Dist = (T: dist) => { let mean = T.mean let variance = T.variance let integralEndY = T.integralEndY - let logScore = T.logScore + let klDivergence = T.klDivergence let updateIntegralCache = T.updateIntegralCache diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index a3b41401..66f353f6 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -301,7 +301,7 @@ module T = Dist({ } } - let logScore = (base: t, reference: t) => { + let klDivergence = (base: t, reference: t) => { let referenceIsZero = switch Distributions.Common.isZeroEverywhere( PointSetTypes.Mixed(reference), ) { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index d7baad9f..7b905316 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -196,15 +196,15 @@ module T = Dist({ | Continuous(m) => Continuous.T.variance(m) } - let logScore = (t1: t, t2: t) => + let klDivergence = (t1: t, t2: t) => switch (t1, t2) { - | (Continuous(t1), Continuous(t2)) => Continuous.T.logScore(t1, t2) - | (Discrete(t1), Discrete(t2)) => Discrete.T.logScore(t1, t2) - | (Mixed(t1), Mixed(t2)) => Mixed.T.logScore(t1, t2) + | (Continuous(t1), Continuous(t2)) => Continuous.T.klDivergence(t1, t2) + | (Discrete(t1), Discrete(t2)) => Discrete.T.klDivergence(t1, t2) + | (Mixed(t1), Mixed(t2)) => Mixed.T.klDivergence(t1, t2) | _ => { let t1 = toMixed(t1) let t2 = toMixed(t2) - Mixed.T.logScore(t1, t2) + Mixed.T.klDivergence(t1, t2) } } }) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 1d99022a..1175767d 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -222,6 +222,8 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) | ("scaleLog10", [EvDistribution(dist)]) => Helpers.toDistFn(Scale(#Logarithm, 10.0), dist) | ("scaleLog", [EvDistribution(dist), EvNumber(float)]) => Helpers.toDistFn(Scale(#Logarithm, float), dist) + | ("scaleLogWithThreshold", [EvDistribution(dist), EvNumber(base), EvNumber(eps)]) => + Helpers.toDistFn(Scale(#LogarithmWithThreshold(eps), base), dist) | ("scalePow", [EvDistribution(dist), EvNumber(float)]) => Helpers.toDistFn(Scale(#Power, float), dist) | ("scaleExp", [EvDistribution(dist)]) => diff --git a/packages/squiggle-lang/src/rescript/Utility/Operation.res b/packages/squiggle-lang/src/rescript/Utility/Operation.res index bd4e799f..f124ffcd 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Operation.res +++ b/packages/squiggle-lang/src/rescript/Utility/Operation.res @@ -8,6 +8,7 @@ type algebraicOperation = [ | #Divide | #Power | #Logarithm + | #LogarithmWithThreshold(float) ] type convolutionOperation = [ @@ -18,7 +19,7 @@ type convolutionOperation = [ @genType type pointwiseOperation = [#Add | #Multiply | #Power] -type scaleOperation = [#Multiply | #Power | #Logarithm | #Divide] +type scaleOperation = [#Multiply | #Power | #Logarithm | #LogarithmWithThreshold(float) | #Divide] type distToFloatOperation = [ | #Pdf(float) | #Cdf(float) @@ -35,7 +36,7 @@ module Convolution = { | #Add => Some(#Add) | #Subtract => Some(#Subtract) | #Multiply => Some(#Multiply) - | #Divide | #Power | #Logarithm => None + | #Divide | #Power | #Logarithm | #LogarithmWithThreshold(_) => None } let canDoAlgebraicOperation = (op: algebraicOperation): bool => @@ -108,6 +109,12 @@ module Algebraic = { | #Power => power(a, b) | #Divide => divide(a, b) | #Logarithm => logarithm(a, b) + | #LogarithmWithThreshold(eps) => + if a < eps { + Ok(0.0) + } else { + logarithm(a, b) + } } let toString = x => @@ -118,6 +125,7 @@ module Algebraic = { | #Power => "**" | #Divide => "/" | #Logarithm => "log" + | #LogarithmWithThreshold(_) => "log" } let format = (a, b, c) => b ++ (" " ++ (toString(a) ++ (" " ++ c))) @@ -162,6 +170,12 @@ module Scale = { } else { logarithm(a, b) } + | #LogarithmWithThreshold(eps) => + if a < eps { + Ok(0.0) + } else { + logarithm(a, b) + } } let format = (operation: t, value, scaleBy) => @@ -170,14 +184,14 @@ module Scale = { | #Divide => j`verticalDivide($value, $scaleBy) ` | #Power => j`verticalPower($value, $scaleBy) ` | #Logarithm => j`verticalLog($value, $scaleBy) ` + | #LogarithmWithThreshold(eps) => j`verticalLog($value, $scaleBy, epsilon=$eps) ` } let toIntegralSumCacheFn = x => switch x { | #Multiply => (a, b) => Some(a *. b) | #Divide => (a, b) => Some(a /. b) - | #Power => (_, _) => None - | #Logarithm => (_, _) => None + | #Power | #Logarithm | #LogarithmWithThreshold(_) => (_, _) => None } let toIntegralCacheFn = x => @@ -186,6 +200,7 @@ module Scale = { | #Divide => (_, _) => None | #Power => (_, _) => None | #Logarithm => (_, _) => None + | #LogarithmWithThreshold(_) => (_, _) => None } } From 898547f3a3f7e05af9cc6618a1cfc867f8f85989 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 4 May 2022 13:53:32 -0400 Subject: [PATCH 021/340] `klDivergence` is now `LogarithmWithThreshold` --- .../Distributions/PointSetDist/Continuous.res | 9 +++++++-- .../Distributions/PointSetDist/Discrete.res | 2 +- .../rescript/Distributions/PointSetDist/Mixed.res | 8 +++++--- .../PointSetDist/PointSetDist_Scoring.res | 15 +++++++++++++-- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 93f6c1c9..c713900f 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -280,7 +280,11 @@ module T = Dist({ if referenceIsZero { Ok(0.0) } else { - combinePointwise(PointSetDist_Scoring.KLDivergence.logScore, base, reference) + combinePointwise( + PointSetDist_Scoring.KLDivergence.logScore(~eps=MagicNumbers.Epsilon.seven), + base, + reference, + ) |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) |> E.R.fmap(integralEndY) } @@ -289,7 +293,8 @@ module T = Dist({ let isNormalized = (t: t): bool => { let areaUnderIntegral = t |> updateIntegralCache(Some(T.integral(t))) |> T.integralEndY - areaUnderIntegral < 1. +. 1e-7 && areaUnderIntegral > 1. -. 1e-7 + areaUnderIntegral < 1. +. MagicNumbers.Epsilon.seven && + areaUnderIntegral > 1. -. MagicNumbers.Epsilon.seven } let downsampleEquallyOverX = (length, t): t => diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 8ec9410f..372eb3d1 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -240,7 +240,7 @@ module T = Dist({ Ok(0.0) } else { combinePointwise( - ~fn=PointSetDist_Scoring.KLDivergence.logScore, + ~fn=PointSetDist_Scoring.KLDivergence.logScore(~eps=MagicNumbers.Epsilon.ten), base, reference, ) |> E.R2.bind(integralEndYResult) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 66f353f6..1521a13c 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -311,9 +311,11 @@ module T = Dist({ if referenceIsZero { Ok(0.0) } else { - combinePointwise(PointSetDist_Scoring.KLDivergence.logScore, base, reference) |> E.R.fmap( - integralEndY, - ) + combinePointwise( + PointSetDist_Scoring.KLDivergence.logScore(~eps=MagicNumbers.Epsilon.ten), + base, + reference, + ) |> E.R.fmap(integralEndY) } } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 4a607281..d43aeba6 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -1,7 +1,8 @@ module KLDivergence = { let logFn = Js.Math.log let subtraction = (a, b) => Ok(a -. b) - let logScore = (a: float, b: float): result => + let multiply = (a: float, b: float): result => Ok(a *. b) + let logScoreDirect = (a: float, b: float): result => if a == 0.0 { Error(Operation.NegativeInfinityError) } else if b == 0.0 { @@ -10,5 +11,15 @@ module KLDivergence = { let quot = a /. b quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(b *. logFn(quot)) } - let multiply = (a: float, b: float): result => Ok(a *. b) + let logScoreWithThreshold = (~eps: float, a: float, b: float): result => + if abs_float(a) < eps { + Ok(0.0) + } else { + logScoreDirect(a, b) + } + let logScore = (~eps: option=?, a: float, b: float): result => + switch eps { + | None => logScoreDirect(a, b) + | Some(eps') => logScoreWithThreshold(~eps=eps', a, b) + } } From 6211d3cfb0daef22070281c8c9557d50305eafdd Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 4 May 2022 14:55:49 -0400 Subject: [PATCH 022/340] Some sorta klDivergence conclusion Value: [1e-6 to 1e-3] --- .../src/rescript/Distributions/PointSetDist/Continuous.res | 2 +- .../Distributions/PointSetDist/PointSetDist_Scoring.res | 2 +- packages/squiggle-lang/src/rescript/Utility/Operation.res | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index c713900f..b9b6b985 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -281,7 +281,7 @@ module T = Dist({ Ok(0.0) } else { combinePointwise( - PointSetDist_Scoring.KLDivergence.logScore(~eps=MagicNumbers.Epsilon.seven), + PointSetDist_Scoring.KLDivergence.logScore(~eps=MagicNumbers.Epsilon.ten), base, reference, ) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index d43aeba6..34113edb 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -6,7 +6,7 @@ module KLDivergence = { if a == 0.0 { Error(Operation.NegativeInfinityError) } else if b == 0.0 { - Error(Operation.DivisionByZeroError) + Ok(b) } else { let quot = a /. b quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(b *. logFn(quot)) diff --git a/packages/squiggle-lang/src/rescript/Utility/Operation.res b/packages/squiggle-lang/src/rescript/Utility/Operation.res index f124ffcd..3a5f667c 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Operation.res +++ b/packages/squiggle-lang/src/rescript/Utility/Operation.res @@ -164,12 +164,7 @@ module Scale = { | #Multiply => Ok(a *. b) | #Divide => divide(a, b) | #Power => power(a, b) - | #Logarithm => - if a < MagicNumbers.Epsilon.ten { - Error(NegativeInfinityError) - } else { - logarithm(a, b) - } + | #Logarithm => logarithm(a, b) | #LogarithmWithThreshold(eps) => if a < eps { Ok(0.0) From a25c83edf806e55096fe16bb5d53b4d20a54c559 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Wed, 4 May 2022 21:55:22 +0000 Subject: [PATCH 023/340] Always puts new elements on different lines. Closes #480 --- packages/components/src/components/SquiggleChart.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 9e65c130..638dcb34 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -54,7 +54,7 @@ export const VariableBox: React.FC = ({ ); } else { - return <>{children}; + return
{children}
; } }; From dd942fe29e45a85021215aa0ffc14f622c1b06d0 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 4 May 2022 18:19:47 -0400 Subject: [PATCH 024/340] cleanup; CR Value: [1e-9 to 1e-5] --- .../__tests__/Distributions/Dotwise_test.res | 4 ++-- .../__tests__/Distributions/Score_test.res | 11 ----------- .../squiggle-lang/__tests__/TS/Score_test.ts | 19 ------------------- .../squiggle-lang/__tests__/TestHelpers.res | 1 - 4 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 packages/squiggle-lang/__tests__/Distributions/Score_test.res delete mode 100644 packages/squiggle-lang/__tests__/TS/Score_test.ts diff --git a/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res b/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res index 6a61e3e1..9a77d3e5 100644 --- a/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res @@ -9,7 +9,7 @@ describe("dotSubtract", () => { test("mean of normal minus exponential (unit)", () => { let mean = 0.0 let rate = 10.0 - + exception MeanFailed let dotDifference = DistributionOperation.Constructors.pointwiseSubtract( ~env, mkNormal(mean, 1.0), @@ -19,7 +19,7 @@ describe("dotSubtract", () => { let meanAnalytical = mean -. 1.0 /. rate switch meanResult { | Ok(meanValue) => meanValue->expect->toBeCloseTo(meanAnalytical) - | Error(err) => err->expect->toBe(DistributionTypes.OperationError(DivisionByZeroError)) + | Error(_) => raise(MeanFailed) } }) Skip.test("mean of normal minus exponential (property)", () => { diff --git a/packages/squiggle-lang/__tests__/Distributions/Score_test.res b/packages/squiggle-lang/__tests__/Distributions/Score_test.res deleted file mode 100644 index 33cb0c82..00000000 --- a/packages/squiggle-lang/__tests__/Distributions/Score_test.res +++ /dev/null @@ -1,11 +0,0 @@ -/* -This test case comes via Nuño https://github.com/quantified-uncertainty/squiggle/issues/433 -*/ -open Jest -open Expect - -describe("KL divergence", () => { - test("our's agrees with analytical", () => { - true->expect->toBe(true) - }) -}) diff --git a/packages/squiggle-lang/__tests__/TS/Score_test.ts b/packages/squiggle-lang/__tests__/TS/Score_test.ts deleted file mode 100644 index a7d24023..00000000 --- a/packages/squiggle-lang/__tests__/TS/Score_test.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { testRun } from "./TestHelpers"; - -describe("KL divergence", () => { - test.skip("by integral solver agrees with analytical", () => { - let squiggleStringKL = `prediction=normal(4, 1) - answer=normal(1,1) - logSubtraction=dotSubtract(scaleLog(answer),scaleLog(prediction)) - klintegrand=dotMultiply(logSubtraction, answer) - klintegral = integralSum(klintegrand) - analyticalKl = log(1 / 1) + 1 ^ 2 / (2 * 1 ^ 2) + ((4 - 1) * (1 - 4) / (2 * 1 * 1)) - 1 / 2 - klintegral - analyticalKl`; - let squiggleResultKL = testRun(squiggleStringKL); - expect(squiggleResultKL.value).toBeCloseTo(0); - }); -}); - -let squiggleStringLS = `prediction=normal(4,1) - answer=normal(1,1) - logScore(prediction, answer)`; diff --git a/packages/squiggle-lang/__tests__/TestHelpers.res b/packages/squiggle-lang/__tests__/TestHelpers.res index c9ed718e..54c4c814 100644 --- a/packages/squiggle-lang/__tests__/TestHelpers.res +++ b/packages/squiggle-lang/__tests__/TestHelpers.res @@ -70,4 +70,3 @@ let cauchyMakeR = (local, rate) => fmapGenDist(SymbolicDist.Cauchy.make(local, r let lognormalMakeR = (mu, sigma) => fmapGenDist(SymbolicDist.Lognormal.make(mu, sigma)) let triangularMakeR = (low, mode, high) => fmapGenDist(SymbolicDist.Triangular.make(low, mode, high)) -// let floatMakeR = x =>E.R.fmap(s => DistributionTypes.Symbolic(s), SymbolicDist.Float.make(x)) From 3898753b0092097efefda00616029cb0d6379b57 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Wed, 4 May 2022 22:35:04 +0000 Subject: [PATCH 025/340] Change gradient of one color to solid color --- packages/components/src/vega-specs/spec-distributions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/vega-specs/spec-distributions.json b/packages/components/src/vega-specs/spec-distributions.json index 5ca9576f..74559a03 100644 --- a/packages/components/src/vega-specs/spec-distributions.json +++ b/packages/components/src/vega-specs/spec-distributions.json @@ -48,7 +48,7 @@ "value": 0 }, "fill": { - "signal": "{gradient: 'linear', x1: 1, y1: 1, x2: 0, y2: 1, stops: [ {offset: 0.0, color: '#4C78A8'}] }" + "value": "#4C78A8" }, "interpolate": { "value": "monotone" From 72b7a7e2742be46f6d271a4b103d2019d7621281 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Wed, 4 May 2022 22:59:58 +0000 Subject: [PATCH 026/340] squiggle-components 0.2.20 --- packages/components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/package.json b/packages/components/package.json index b7841dda..77a70d6d 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@quri/squiggle-components", - "version": "0.2.19", + "version": "0.2.20", "license": "MIT", "dependencies": { "@quri/squiggle-lang": "^0.2.8", From 32a881d06a7785537c577d3dea92c8759050b48b Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Thu, 5 May 2022 10:38:33 -0400 Subject: [PATCH 027/340] Call Jstat for mean instead of calculate it Value: [1e-8 to 1e-4] --- .../__tests__/Distributions/Dotwise_test.res | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res b/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res index 9a77d3e5..7725aa54 100644 --- a/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/Dotwise_test.res @@ -16,12 +16,20 @@ describe("dotSubtract", () => { mkExponential(rate), ) let meanResult = E.R2.bind(DistributionOperation.Constructors.mean(~env), dotDifference) - let meanAnalytical = mean -. 1.0 /. rate + let meanAnalytical = + mean -. + SymbolicDist.Exponential.mean({rate: rate})->E.R2.toExn( + "On trusted input this should never happen", + ) switch meanResult { | Ok(meanValue) => meanValue->expect->toBeCloseTo(meanAnalytical) | Error(_) => raise(MeanFailed) } }) + /* + It seems like this test should work, and it's plausible that + there's some bug in `pointwiseSubtract` + */ Skip.test("mean of normal minus exponential (property)", () => { assert_( property2(float_(), floatRange(1e-5, 1e5), (mean, rate) => { @@ -33,12 +41,11 @@ describe("dotSubtract", () => { ) let meanResult = E.R2.bind(DistributionOperation.Constructors.mean(~env), dotDifference) // according to algebra or random variables, - let meanAnalytical = mean -. 1.0 /. rate - Js.Console.log3( - mean, - rate, - E.R.fmap(x => abs_float(x -. meanAnalytical) /. abs_float(meanAnalytical), meanResult), - ) + let meanAnalytical = + mean -. + SymbolicDist.Exponential.mean({rate: rate})->E.R2.toExn( + "On trusted input this should never happen", + ) switch meanResult { | Ok(meanValue) => abs_float(meanValue -. meanAnalytical) /. abs_float(meanValue) < 1e-2 // 1% relative error | Error(err) => err === DistributionTypes.OperationError(DivisionByZeroError) From 24b2aefce770cbc0d57048d6f9f4fb15fdc658b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 May 2022 14:45:33 +0000 Subject: [PATCH 028/340] :arrow_up: Bump webpack-dev-server from 4.8.1 to 4.9.0 Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.8.1 to 4.9.0. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.8.1...v4.9.0) --- updated-dependencies: - dependency-name: webpack-dev-server dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 31 +++++++------------------------ 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 77a70d6d..06724c87 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -45,7 +45,7 @@ "web-vitals": "^2.1.4", "webpack": "^5.72.0", "webpack-cli": "^4.9.2", - "webpack-dev-server": "^4.8.1" + "webpack-dev-server": "^4.9.0" }, "scripts": { "start": "cross-env REACT_APP_FAST_REFRESH=false && start-storybook -p 6006 -s public", diff --git a/yarn.lock b/yarn.lock index 4dc8caf1..d808fc2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5308,13 +5308,6 @@ async-validator@^4.1.0: resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.1.1.tgz#3cd1437faa2de64743f7d56649dd904c946a18fe" integrity sha512-p4DO/JXwjs8klJyJL8Q2oM4ks5fUTze/h5k10oPPKMiLe1fj3G1QMzPHNmN1Py4ycOk7WlO2DcGXv1qiESJCZA== -async@^2.6.2: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== - dependencies: - lodash "^4.17.14" - async@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" @@ -7442,7 +7435,7 @@ debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: dependencies: ms "2.1.2" -debug@^3.0.0, debug@^3.1.1, debug@^3.2.7: +debug@^3.0.0, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== @@ -11672,7 +11665,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.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.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== @@ -12153,7 +12146,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== @@ -13118,15 +13111,6 @@ polished@^4.0.5: dependencies: "@babel/runtime" "^7.17.8" -portfinder@^1.0.28: - version "1.0.28" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" - integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== - dependencies: - async "^2.6.2" - debug "^3.1.1" - mkdirp "^0.5.5" - posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -18087,10 +18071,10 @@ webpack-dev-middleware@^5.3.1: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@^4.6.0, webpack-dev-server@^4.7.4, webpack-dev-server@^4.8.1: - version "4.8.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.8.1.tgz#58f9d797710d6e25fa17d6afab8708f958c11a29" - integrity sha512-dwld70gkgNJa33czmcj/PlKY/nOy/BimbrgZRaR9vDATBQAYgLzggR0nxDtPLJiLrMgZwbE6RRfJ5vnBBasTyg== +webpack-dev-server@^4.6.0, webpack-dev-server@^4.7.4, webpack-dev-server@^4.9.0: + version "4.9.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.0.tgz#737dbf44335bb8bde68f8f39127fc401c97a1557" + integrity sha512-+Nlb39iQSOSsFv0lWUuUTim3jDQO8nhK3E68f//J2r5rIcp4lULHXz2oZ0UVdEeWXEh5lSzYUlzarZhDAeAVQw== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" @@ -18112,7 +18096,6 @@ webpack-dev-server@^4.6.0, webpack-dev-server@^4.7.4, webpack-dev-server@^4.8.1: ipaddr.js "^2.0.1" open "^8.0.9" p-retry "^4.5.0" - portfinder "^1.0.28" rimraf "^3.0.2" schema-utils "^4.0.0" selfsigned "^2.0.1" From 690467d0bee7e847eebf6f28f2018c53c489d9ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 May 2022 14:46:10 +0000 Subject: [PATCH 029/340] :arrow_up: Bump @docusaurus/core from 2.0.0-beta.18 to 2.0.0-beta.19 Bumps [@docusaurus/core](https://github.com/facebook/docusaurus/tree/HEAD/packages/docusaurus) from 2.0.0-beta.18 to 2.0.0-beta.19. - [Release notes](https://github.com/facebook/docusaurus/releases) - [Changelog](https://github.com/facebook/docusaurus/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/docusaurus/commits/v2.0.0-beta.19/packages/docusaurus) --- updated-dependencies: - dependency-name: "@docusaurus/core" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/website/package.json | 2 +- yarn.lock | 354 ++++++++++++++++++++++++++-------- 2 files changed, 276 insertions(+), 80 deletions(-) diff --git a/packages/website/package.json b/packages/website/package.json index c830fc27..cec13018 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -12,7 +12,7 @@ "format": "prettier --write ." }, "dependencies": { - "@docusaurus/core": "2.0.0-beta.18", + "@docusaurus/core": "2.0.0-beta.19", "@docusaurus/preset-classic": "2.0.0-beta.18", "@quri/squiggle-components": "0.2.9", "clsx": "^1.1.1", diff --git a/yarn.lock b/yarn.lock index 4dc8caf1..c74265c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -188,11 +188,16 @@ dependencies: "@babel/highlight" "^7.16.7" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7": +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2" integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== +"@babel/compat-data@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab" + integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw== + "@babel/core@7.12.9": version "7.12.9" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" @@ -215,21 +220,21 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.16.0", "@babel/core@^7.17.8", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe" - integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw== +"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.16.0", "@babel/core@^7.17.10", "@babel/core@^7.17.8", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.10.tgz#74ef0fbf56b7dfc3f198fc2d927f4f03e12f4b05" + integrity sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.9" - "@babel/helper-compilation-targets" "^7.17.7" + "@babel/generator" "^7.17.10" + "@babel/helper-compilation-targets" "^7.17.10" "@babel/helper-module-transforms" "^7.17.7" "@babel/helpers" "^7.17.9" - "@babel/parser" "^7.17.9" + "@babel/parser" "^7.17.10" "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.9" - "@babel/types" "^7.17.0" + "@babel/traverse" "^7.17.10" + "@babel/types" "^7.17.10" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -245,14 +250,14 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.17.7", "@babel/generator@^7.17.9", "@babel/generator@^7.7.2": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.9.tgz#f4af9fd38fa8de143c29fce3f71852406fc1e2fc" - integrity sha512-rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ== +"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.17.10", "@babel/generator@^7.17.7", "@babel/generator@^7.7.2": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.10.tgz#c281fa35b0c349bbe9d02916f4ae08fc85ed7189" + integrity sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg== dependencies: - "@babel/types" "^7.17.0" + "@babel/types" "^7.17.10" + "@jridgewell/gen-mapping" "^0.1.0" jsesc "^2.5.1" - source-map "^0.5.0" "@babel/helper-annotate-as-pure@^7.16.0", "@babel/helper-annotate-as-pure@^7.16.7": version "7.16.7" @@ -269,7 +274,7 @@ "@babel/helper-explode-assignable-expression" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7": +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w== @@ -279,6 +284,16 @@ browserslist "^4.17.5" semver "^6.3.0" +"@babel/helper-compilation-targets@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz#09c63106d47af93cf31803db6bc49fef354e2ebe" + integrity sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ== + dependencies: + "@babel/compat-data" "^7.17.10" + "@babel/helper-validator-option" "^7.16.7" + browserslist "^4.20.2" + semver "^6.3.0" + "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d" @@ -292,7 +307,7 @@ "@babel/helper-replace-supers" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" -"@babel/helper-create-regexp-features-plugin@^7.16.7": +"@babel/helper-create-regexp-features-plugin@^7.16.7", "@babel/helper-create-regexp-features-plugin@^7.17.0": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA== @@ -481,11 +496,16 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.8", "@babel/parser@^7.17.9": +"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.8": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef" integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg== +"@babel/parser@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.10.tgz#873b16db82a8909e0fbd7f115772f4b739f6ce78" + integrity sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" @@ -519,7 +539,7 @@ "@babel/helper-create-class-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-class-static-block@^7.16.7": +"@babel/plugin-proposal-class-static-block@^7.17.6": version "7.17.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c" integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA== @@ -605,7 +625,7 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.0" "@babel/plugin-transform-parameters" "^7.12.1" -"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.16.7": +"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.17.3": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390" integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw== @@ -864,7 +884,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.16.7": +"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.17.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1" integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ== @@ -941,7 +961,7 @@ "@babel/helper-plugin-utils" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.16.8": +"@babel/plugin-transform-modules-commonjs@^7.17.9": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6" integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw== @@ -951,7 +971,7 @@ "@babel/helper-simple-access" "^7.17.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.16.7": +"@babel/plugin-transform-modules-systemjs@^7.17.8": version "7.17.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859" integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw== @@ -970,12 +990,12 @@ "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252" - integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw== +"@babel/plugin-transform-named-capturing-groups-regex@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.10.tgz#715dbcfafdb54ce8bccd3d12e8917296a4ba66a4" + integrity sha512-v54O6yLaJySCs6mGzaVOUw9T967GnH38T6CQSAtnzdNPwu84l2qAjssKzo/WSO8Yi7NF+7ekm5cVbF/5qiIgNA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-create-regexp-features-plugin" "^7.17.0" "@babel/plugin-transform-new-target@^7.16.7": version "7.16.7" @@ -1046,7 +1066,7 @@ "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-regenerator@^7.16.7": +"@babel/plugin-transform-regenerator@^7.17.9": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz#0a33c3a61cf47f45ed3232903683a0afd2d3460c" integrity sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ== @@ -1060,10 +1080,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-runtime@^7.16.4", "@babel/plugin-transform-runtime@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz#0a2e08b5e2b2d95c4b1d3b3371a2180617455b70" - integrity sha512-fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A== +"@babel/plugin-transform-runtime@^7.16.4", "@babel/plugin-transform-runtime@^7.17.0", "@babel/plugin-transform-runtime@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.10.tgz#b89d821c55d61b5e3d3c3d1d636d8d5a81040ae1" + integrity sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig== dependencies: "@babel/helper-module-imports" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" @@ -1132,27 +1152,27 @@ "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.12.11", "@babel/preset-env@^7.15.6", "@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.4": - version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982" - integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g== +"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.12.11", "@babel/preset-env@^7.15.6", "@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.4", "@babel/preset-env@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.17.10.tgz#a81b093669e3eb6541bb81a23173c5963c5de69c" + integrity sha512-YNgyBHZQpeoBSRBg0xixsZzfT58Ze1iZrajvv0lJc70qDDGuGfonEnMGfWeSY0mQ3JTuCWFbMkzFRVafOyJx4g== dependencies: - "@babel/compat-data" "^7.16.8" - "@babel/helper-compilation-targets" "^7.16.7" + "@babel/compat-data" "^7.17.10" + "@babel/helper-compilation-targets" "^7.17.10" "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-validator-option" "^7.16.7" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7" "@babel/plugin-proposal-async-generator-functions" "^7.16.8" "@babel/plugin-proposal-class-properties" "^7.16.7" - "@babel/plugin-proposal-class-static-block" "^7.16.7" + "@babel/plugin-proposal-class-static-block" "^7.17.6" "@babel/plugin-proposal-dynamic-import" "^7.16.7" "@babel/plugin-proposal-export-namespace-from" "^7.16.7" "@babel/plugin-proposal-json-strings" "^7.16.7" "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7" "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7" "@babel/plugin-proposal-numeric-separator" "^7.16.7" - "@babel/plugin-proposal-object-rest-spread" "^7.16.7" + "@babel/plugin-proposal-object-rest-spread" "^7.17.3" "@babel/plugin-proposal-optional-catch-binding" "^7.16.7" "@babel/plugin-proposal-optional-chaining" "^7.16.7" "@babel/plugin-proposal-private-methods" "^7.16.11" @@ -1178,7 +1198,7 @@ "@babel/plugin-transform-block-scoping" "^7.16.7" "@babel/plugin-transform-classes" "^7.16.7" "@babel/plugin-transform-computed-properties" "^7.16.7" - "@babel/plugin-transform-destructuring" "^7.16.7" + "@babel/plugin-transform-destructuring" "^7.17.7" "@babel/plugin-transform-dotall-regex" "^7.16.7" "@babel/plugin-transform-duplicate-keys" "^7.16.7" "@babel/plugin-transform-exponentiation-operator" "^7.16.7" @@ -1187,15 +1207,15 @@ "@babel/plugin-transform-literals" "^7.16.7" "@babel/plugin-transform-member-expression-literals" "^7.16.7" "@babel/plugin-transform-modules-amd" "^7.16.7" - "@babel/plugin-transform-modules-commonjs" "^7.16.8" - "@babel/plugin-transform-modules-systemjs" "^7.16.7" + "@babel/plugin-transform-modules-commonjs" "^7.17.9" + "@babel/plugin-transform-modules-systemjs" "^7.17.8" "@babel/plugin-transform-modules-umd" "^7.16.7" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.17.10" "@babel/plugin-transform-new-target" "^7.16.7" "@babel/plugin-transform-object-super" "^7.16.7" "@babel/plugin-transform-parameters" "^7.16.7" "@babel/plugin-transform-property-literals" "^7.16.7" - "@babel/plugin-transform-regenerator" "^7.16.7" + "@babel/plugin-transform-regenerator" "^7.17.9" "@babel/plugin-transform-reserved-words" "^7.16.7" "@babel/plugin-transform-shorthand-properties" "^7.16.7" "@babel/plugin-transform-spread" "^7.16.7" @@ -1205,11 +1225,11 @@ "@babel/plugin-transform-unicode-escapes" "^7.16.7" "@babel/plugin-transform-unicode-regex" "^7.16.7" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.16.8" + "@babel/types" "^7.17.10" babel-plugin-polyfill-corejs2 "^0.3.0" babel-plugin-polyfill-corejs3 "^0.5.0" babel-plugin-polyfill-regenerator "^0.3.0" - core-js-compat "^3.20.2" + core-js-compat "^3.22.1" semver "^6.3.0" "@babel/preset-flow@^7.12.1": @@ -1264,7 +1284,7 @@ pirates "^4.0.5" source-map-support "^0.5.16" -"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.17.8": +"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.17.8", "@babel/runtime-corejs3@^7.17.9": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.9.tgz#3d02d0161f0fbf3ada8e88159375af97690f4055" integrity sha512-WxYHHUWF2uZ7Hp1K+D1xQgbgkGUfA+5UPOegEXGt2Y5SMog/rYCVaifLZDbw8UkNXozEqqrZTy6bglL7xTaCOw== @@ -1288,19 +1308,19 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.9.tgz#1f9b207435d9ae4a8ed6998b2b82300d83c37a0d" - integrity sha512-PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw== +"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.10", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.10.tgz#1ee1a5ac39f4eac844e6cf855b35520e5eb6f8b5" + integrity sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw== dependencies: "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.9" + "@babel/generator" "^7.17.10" "@babel/helper-environment-visitor" "^7.16.7" "@babel/helper-function-name" "^7.17.9" "@babel/helper-hoist-variables" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.9" - "@babel/types" "^7.17.0" + "@babel/parser" "^7.17.10" + "@babel/types" "^7.17.10" debug "^4.1.0" globals "^11.1.0" @@ -1312,6 +1332,14 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" +"@babel/types@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.10.tgz#d35d7b4467e439fcf06d195f8100e0fea7fc82c4" + integrity sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A== + dependencies: + "@babel/helper-validator-identifier" "^7.16.7" + to-fast-properties "^2.0.0" + "@base2/pretty-print-object@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz#371ba8be66d556812dc7fb169ebc3c08378f69d4" @@ -1515,6 +1543,83 @@ webpack-merge "^5.8.0" webpackbar "^5.0.2" +"@docusaurus/core@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.19.tgz#b3e0008affea95b84ab4fbec16cfea77a10d452a" + integrity sha512-pHjnghPiLCogFF5FCMZrJJBGbT4wW2GEtUdRemMqWt0zru/0iQPwUQOKc2yhZTwCBCGaA5EqY/+I08W9FQIUJg== + dependencies: + "@babel/core" "^7.17.10" + "@babel/generator" "^7.17.10" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-transform-runtime" "^7.17.10" + "@babel/preset-env" "^7.17.10" + "@babel/preset-react" "^7.16.7" + "@babel/preset-typescript" "^7.16.7" + "@babel/runtime" "^7.17.9" + "@babel/runtime-corejs3" "^7.17.9" + "@babel/traverse" "^7.17.10" + "@docusaurus/cssnano-preset" "2.0.0-beta.19" + "@docusaurus/logger" "2.0.0-beta.19" + "@docusaurus/mdx-loader" "2.0.0-beta.19" + "@docusaurus/react-loadable" "5.5.2" + "@docusaurus/utils" "2.0.0-beta.19" + "@docusaurus/utils-common" "2.0.0-beta.19" + "@docusaurus/utils-validation" "2.0.0-beta.19" + "@slorber/static-site-generator-webpack-plugin" "^4.0.4" + "@svgr/webpack" "^6.2.1" + autoprefixer "^10.4.5" + babel-loader "^8.2.5" + babel-plugin-dynamic-import-node "2.3.0" + boxen "^6.2.1" + chokidar "^3.5.3" + clean-css "^5.3.0" + cli-table3 "^0.6.2" + combine-promises "^1.1.0" + commander "^5.1.0" + copy-webpack-plugin "^10.2.4" + core-js "^3.22.3" + css-loader "^6.7.1" + css-minimizer-webpack-plugin "^3.4.1" + cssnano "^5.1.7" + del "^6.0.0" + detect-port "^1.3.0" + escape-html "^1.0.3" + eta "^1.12.3" + file-loader "^6.2.0" + fs-extra "^10.1.0" + html-minifier-terser "^6.1.0" + html-tags "^3.2.0" + html-webpack-plugin "^5.5.0" + import-fresh "^3.3.0" + leven "^3.1.0" + lodash "^4.17.21" + mini-css-extract-plugin "^2.6.0" + postcss "^8.4.13" + postcss-loader "^6.2.1" + prompts "^2.4.2" + react-dev-utils "^12.0.1" + react-helmet-async "^1.3.0" + react-loadable "npm:@docusaurus/react-loadable@5.5.2" + react-loadable-ssr-addon-v5-slorber "^1.0.1" + react-router "^5.2.0" + react-router-config "^5.1.1" + react-router-dom "^5.2.0" + remark-admonitions "^1.2.1" + rtl-detect "^1.0.4" + semver "^7.3.7" + serve-handler "^6.1.3" + shelljs "^0.8.5" + terser-webpack-plugin "^5.3.1" + tslib "^2.4.0" + update-notifier "^5.1.0" + url-loader "^4.1.1" + wait-on "^6.0.1" + webpack "^5.72.0" + webpack-bundle-analyzer "^4.5.0" + webpack-dev-server "^4.8.1" + webpack-merge "^5.8.0" + webpackbar "^5.0.2" + "@docusaurus/cssnano-preset@2.0.0-beta.18": version "2.0.0-beta.18" resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.18.tgz#235ac9064fe8f8da618349ce5305be3ed3a44e29" @@ -1524,6 +1629,15 @@ postcss "^8.4.12" postcss-sort-media-queries "^4.2.1" +"@docusaurus/cssnano-preset@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.19.tgz#d15221c1befe4c7ca2415ca7d4073d38a64d6507" + integrity sha512-1Wn4qWgy3m0+kxh/JEqjJfHrqWC37kLwkplE51AfXLxz8xyVJ0H0MvhOkLjSkEABTSWFl4DDaW2uf+qpgtZWaw== + dependencies: + cssnano-preset-advanced "^5.3.3" + postcss "^8.4.13" + postcss-sort-media-queries "^4.2.1" + "@docusaurus/logger@2.0.0-beta.18": version "2.0.0-beta.18" resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.18.tgz#12302f312a083eb018caa28505b63f5dd4ab6a91" @@ -1532,6 +1646,14 @@ chalk "^4.1.2" tslib "^2.3.1" +"@docusaurus/logger@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.19.tgz#fa4f5e73568ba5ec86ff32ae217403258548af00" + integrity sha512-ILfiSRxoP/3hzmuFy+vUhw4kfTiH6w1woP3N0pGPqMrq1Ui+Fv7V5Pvb3KFq+OvdpTYUpxfDYDq31BUWzS3DtQ== + dependencies: + chalk "^4.1.2" + tslib "^2.4.0" + "@docusaurus/mdx-loader@2.0.0-beta.18": version "2.0.0-beta.18" resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.18.tgz#4a9fc0607e0a210a7d7db3108415208dd36e33d3" @@ -1554,6 +1676,28 @@ url-loader "^4.1.1" webpack "^5.70.0" +"@docusaurus/mdx-loader@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.19.tgz#f40a5926d02d18e280e517d12d75a43a347ccc25" + integrity sha512-e53ipkQL4Y6mYesTXM3HMASPoo4NaGTS2GC8luTHnhNcKcsgRWmQiMT8/o3Fk6E2UeDZF7O0eyTqX2l2fjOSLQ== + dependencies: + "@babel/parser" "^7.17.10" + "@babel/traverse" "^7.17.10" + "@docusaurus/logger" "2.0.0-beta.19" + "@docusaurus/utils" "2.0.0-beta.19" + "@mdx-js/mdx" "^1.6.22" + escape-html "^1.0.3" + file-loader "^6.2.0" + fs-extra "^10.1.0" + image-size "^1.0.1" + mdast-util-to-string "^2.0.0" + remark-emoji "^2.2.0" + stringify-object "^3.3.0" + tslib "^2.4.0" + unist-util-visit "^2.0.3" + url-loader "^4.1.1" + webpack "^5.72.0" + "@docusaurus/module-type-aliases@2.0.0-beta.18": version "2.0.0-beta.18" resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.0.0-beta.18.tgz#001379229c58cbc3ed565e19437cbda86d5e8742" @@ -1775,6 +1919,13 @@ dependencies: tslib "^2.3.1" +"@docusaurus/utils-common@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.19.tgz#ff22fc3245315799935f772b5e6d0028ae9e5937" + integrity sha512-nld3OnyGgM43TqlZ3v1IjqEPa+6yuYSMTlWBVYmq+HONig9fkvlyZTZia28ip8gHlFwk6JHMmD9W/5wXfJn56Q== + dependencies: + tslib "^2.4.0" + "@docusaurus/utils-validation@2.0.0-beta.18": version "2.0.0-beta.18" resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.18.tgz#0dabf113d2c53ee685a715cd4caae6e219e9e41e" @@ -1786,6 +1937,17 @@ js-yaml "^4.1.0" tslib "^2.3.1" +"@docusaurus/utils-validation@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.19.tgz#53e56e66a1446e25b2b86aa015312cb647c6d7a1" + integrity sha512-mv0OfFZbMF8pfK85JszGiZyubfjJ7Y+avNUInKXetqvFCtmoNRwiHBYvcjroi70jFkIS+Mr7SkVviv5+zx1Sww== + dependencies: + "@docusaurus/logger" "2.0.0-beta.19" + "@docusaurus/utils" "2.0.0-beta.19" + joi "^17.6.0" + js-yaml "^4.1.0" + tslib "^2.4.0" + "@docusaurus/utils@2.0.0-beta.18": version "2.0.0-beta.18" resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.18.tgz#c3fe0e9fac30db4510962263993fd0ee2679eebb" @@ -1807,6 +1969,27 @@ url-loader "^4.1.1" webpack "^5.70.0" +"@docusaurus/utils@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.19.tgz#c3fb547f9ec708b8eed370e4d009bac213a37ce8" + integrity sha512-AQwOGyfLaiSJ2FYkZsMIi7VuGZt0P8upXgfKMeP97ekY+P1gn+6Ah7L8zIQkIVzzl0UMk7tn7kYS/jhCVKAFvg== + dependencies: + "@docusaurus/logger" "2.0.0-beta.19" + "@svgr/webpack" "^6.2.1" + file-loader "^6.2.0" + fs-extra "^10.1.0" + github-slugger "^1.4.0" + globby "^11.1.0" + gray-matter "^4.0.3" + js-yaml "^4.1.0" + lodash "^4.17.21" + micromatch "^4.0.5" + resolve-pathname "^3.0.0" + shelljs "^0.8.5" + tslib "^2.4.0" + url-loader "^4.1.1" + webpack "^5.72.0" + "@emotion/cache@^10.0.27": version "10.0.29" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0" @@ -5400,7 +5583,7 @@ babel-jest@^27.4.2, babel-jest@^27.5.1: graceful-fs "^4.2.9" slash "^3.0.0" -babel-loader@^8.0.0, babel-loader@^8.2.3, babel-loader@^8.2.4: +babel-loader@^8.0.0, babel-loader@^8.2.3, babel-loader@^8.2.4, babel-loader@^8.2.5: version "8.2.5" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e" integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ== @@ -6419,7 +6602,7 @@ clean-css@^4.2.3: dependencies: source-map "~0.6.0" -clean-css@^5.2.2, clean-css@^5.2.4: +clean-css@^5.2.2, clean-css@^5.2.4, clean-css@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.0.tgz#ad3d8238d5f3549e83d5f87205189494bc7cbb59" integrity sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ== @@ -6441,7 +6624,7 @@ cli-boxes@^3.0.0: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-3.0.0.tgz#71a10c716feeba005e4504f36329ef0b17cf3145" integrity sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g== -cli-table3@^0.6.1: +cli-table3@^0.6.1, cli-table3@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.2.tgz#aaf5df9d8b5bf12634dc8b3040806a0c07120d2a" integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw== @@ -6810,7 +6993,7 @@ copy-webpack-plugin@^10.2.4: schema-utils "^4.0.0" serialize-javascript "^6.0.0" -core-js-compat@^3.20.2, core-js-compat@^3.21.0, core-js-compat@^3.8.1: +core-js-compat@^3.21.0, core-js-compat@^3.8.1: version "3.22.3" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.3.tgz#9b10d786052d042bc97ee8df9c0d1fb6a49c2005" integrity sha512-wliMbvPI2idgFWpFe7UEyHMvu6HWgW8WA+HnDRtgzoSDYvXFMpoGX1H3tPDDXrcfUSyXafCLDd7hOeMQHEZxGw== @@ -6818,6 +7001,14 @@ core-js-compat@^3.20.2, core-js-compat@^3.21.0, core-js-compat@^3.8.1: browserslist "^4.20.3" semver "7.0.0" +core-js-compat@^3.22.1: + version "3.22.4" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.4.tgz#d700f451e50f1d7672dcad0ac85d910e6691e579" + integrity sha512-dIWcsszDezkFZrfm1cnB4f/J85gyhiCpxbgBdohWCDtSVuAaChTSpPV7ldOQf/Xds2U5xCIJZOK82G4ZPAIswA== + dependencies: + browserslist "^4.20.3" + semver "7.0.0" + core-js-pure@^3.20.2, core-js-pure@^3.8.1, core-js-pure@^3.8.2: version "3.22.3" resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.3.tgz#181d1b6321fb29fe99c16a1f28beb840ab84ad36" @@ -6828,10 +7019,10 @@ core-js@^2.4.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.0.4, core-js@^3.19.2, core-js@^3.21.1, core-js@^3.6.5, core-js@^3.8.2: - version "3.22.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.3.tgz#498c41d997654cb00e81c7a54b44f0ab21ab01d5" - integrity sha512-1t+2a/d2lppW1gkLXx3pKPVGbBdxXAkqztvWb1EJ8oF8O2gIGiytzflNiFEehYwVK/t2ryUsGBoOFFvNx95mbg== +core-js@^3.0.4, core-js@^3.19.2, core-js@^3.21.1, core-js@^3.22.3, core-js@^3.6.5, core-js@^3.8.2: + version "3.22.4" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.4.tgz#f4b3f108d45736935aa028444a69397e40d8c531" + integrity sha512-1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w== core-util-is@~1.0.0: version "1.0.3" @@ -7175,7 +7366,7 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-advanced@^5.3.1: +cssnano-preset-advanced@^5.3.1, cssnano-preset-advanced@^5.3.3: version "5.3.3" resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.3.3.tgz#848422118d7a62b5b29a53edc160f58c7f7f7539" integrity sha512-AB9SmTSC2Gd8T7PpKUsXFJ3eNsg7dc4CTZ0+XAJ29MNxyJsrCEk7N1lw31bpHrsQH2PVJr21bbWgGAfA9j0dIA== @@ -7227,7 +7418,7 @@ cssnano-utils@^3.1.0: resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== -cssnano@^5.0.6, cssnano@^5.1.5: +cssnano@^5.0.6, cssnano@^5.1.5, cssnano@^5.1.7: version "5.1.7" resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.7.tgz#99858bef6c76c9240f0cdc9239570bc7db8368be" integrity sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg== @@ -9030,7 +9221,7 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^10.0.0, fs-extra@^10.0.1: +fs-extra@^10.0.0, fs-extra@^10.0.1, fs-extra@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== @@ -9757,7 +9948,7 @@ html-minifier-terser@^6.0.2, html-minifier-terser@^6.1.0: relateurl "^0.2.7" terser "^5.10.0" -html-tags@^3.1.0: +html-tags@^3.1.0, html-tags@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961" integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg== @@ -12242,11 +12433,16 @@ nano-css@^5.3.1: stacktrace-js "^2.0.2" stylis "^4.0.6" -nanoid@^3.1.23, nanoid@^3.3.1: +nanoid@^3.1.23: version "3.3.3" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== +nanoid@^3.3.3: + version "3.3.4" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" + integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -13739,12 +13935,12 @@ postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0 picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.12, postcss@^8.4.4, postcss@^8.4.7: - version "8.4.12" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905" - integrity sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg== +postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.12, postcss@^8.4.13, postcss@^8.4.4, postcss@^8.4.7: + version "8.4.13" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.13.tgz#7c87bc268e79f7f86524235821dfdf9f73e5d575" + integrity sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA== dependencies: - nanoid "^3.3.1" + nanoid "^3.3.3" picocolors "^1.0.0" source-map-js "^1.0.2" @@ -14622,7 +14818,7 @@ react-fast-compare@^3.0.1, react-fast-compare@^3.2.0: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== -react-helmet-async@*, react-helmet-async@^1.0.7, react-helmet-async@^1.2.3: +react-helmet-async@*, react-helmet-async@^1.0.7, react-helmet-async@^1.2.3, react-helmet-async@^1.3.0: 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== @@ -15127,7 +15323,7 @@ remark-admonitions@^1.2.1: unified "^8.4.2" unist-util-visit "^2.0.1" -remark-emoji@^2.1.0: +remark-emoji@^2.1.0, remark-emoji@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/remark-emoji/-/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" integrity sha512-P3cj9s5ggsUvWw5fS2uzCHJMGuXYRb0NnZqYlNecewXt8QBU9n5vW3DUUKOhepS8F9CwdMx9B8a3i7pqFWAI5w== @@ -15641,7 +15837,7 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@7.x, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: +semver@7.x, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: version "7.3.7" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== @@ -17004,7 +17200,7 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1: +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== From a92e32b0ec7ea5fcd52fee53d52a068248b7811e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 May 2022 14:55:35 +0000 Subject: [PATCH 030/340] :arrow_up: Bump @docusaurus/preset-classic Bumps [@docusaurus/preset-classic](https://github.com/facebook/docusaurus/tree/HEAD/packages/docusaurus-preset-classic) from 2.0.0-beta.18 to 2.0.0-beta.19. - [Release notes](https://github.com/facebook/docusaurus/releases) - [Changelog](https://github.com/facebook/docusaurus/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/docusaurus/commits/v2.0.0-beta.19/packages/docusaurus-preset-classic) --- updated-dependencies: - dependency-name: "@docusaurus/preset-classic" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/website/package.json | 2 +- yarn.lock | 487 ++++++++++++---------------------- 2 files changed, 168 insertions(+), 321 deletions(-) diff --git a/packages/website/package.json b/packages/website/package.json index cec13018..0a545009 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@docusaurus/core": "2.0.0-beta.19", - "@docusaurus/preset-classic": "2.0.0-beta.18", + "@docusaurus/preset-classic": "2.0.0-beta.19", "@quri/squiggle-components": "0.2.9", "clsx": "^1.1.1", "prism-react-renderer": "^1.2.1", diff --git a/yarn.lock b/yarn.lock index b9e1df2d..3d59a5ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -220,7 +220,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.16.0", "@babel/core@^7.17.10", "@babel/core@^7.17.8", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0": +"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.16.0", "@babel/core@^7.17.10", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.10.tgz#74ef0fbf56b7dfc3f198fc2d927f4f03e12f4b05" integrity sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA== @@ -250,7 +250,7 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.17.10", "@babel/generator@^7.17.7", "@babel/generator@^7.7.2": +"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.17.10", "@babel/generator@^7.7.2": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.10.tgz#c281fa35b0c349bbe9d02916f4ae08fc85ed7189" integrity sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg== @@ -496,7 +496,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.8": +"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef" integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg== @@ -1080,7 +1080,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-runtime@^7.16.4", "@babel/plugin-transform-runtime@^7.17.0", "@babel/plugin-transform-runtime@^7.17.10": +"@babel/plugin-transform-runtime@^7.16.4", "@babel/plugin-transform-runtime@^7.17.10": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.10.tgz#b89d821c55d61b5e3d3c3d1d636d8d5a81040ae1" integrity sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig== @@ -1152,7 +1152,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.12.11", "@babel/preset-env@^7.15.6", "@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.4", "@babel/preset-env@^7.17.10": +"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.12.11", "@babel/preset-env@^7.15.6", "@babel/preset-env@^7.16.4", "@babel/preset-env@^7.17.10": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.17.10.tgz#a81b093669e3eb6541bb81a23173c5963c5de69c" integrity sha512-YNgyBHZQpeoBSRBg0xixsZzfT58Ze1iZrajvv0lJc70qDDGuGfonEnMGfWeSY0mQ3JTuCWFbMkzFRVafOyJx4g== @@ -1284,7 +1284,7 @@ pirates "^4.0.5" source-map-support "^0.5.16" -"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.17.8", "@babel/runtime-corejs3@^7.17.9": +"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.17.9": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.9.tgz#3d02d0161f0fbf3ada8e88159375af97690f4055" integrity sha512-WxYHHUWF2uZ7Hp1K+D1xQgbgkGUfA+5UPOegEXGt2Y5SMog/rYCVaifLZDbw8UkNXozEqqrZTy6bglL7xTaCOw== @@ -1464,85 +1464,6 @@ "@docsearch/css" "3.0.0" algoliasearch "^4.0.0" -"@docusaurus/core@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.18.tgz#44c6eefe29257462df630640a35f0c86bd80639a" - integrity sha512-puV7l+0/BPSi07Xmr8tVktfs1BzhC8P5pm6Bs2CfvysCJ4nefNCD1CosPc1PGBWy901KqeeEJ1aoGwj9tU3AUA== - dependencies: - "@babel/core" "^7.17.8" - "@babel/generator" "^7.17.7" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-transform-runtime" "^7.17.0" - "@babel/preset-env" "^7.16.11" - "@babel/preset-react" "^7.16.7" - "@babel/preset-typescript" "^7.16.7" - "@babel/runtime" "^7.17.8" - "@babel/runtime-corejs3" "^7.17.8" - "@babel/traverse" "^7.17.3" - "@docusaurus/cssnano-preset" "2.0.0-beta.18" - "@docusaurus/logger" "2.0.0-beta.18" - "@docusaurus/mdx-loader" "2.0.0-beta.18" - "@docusaurus/react-loadable" "5.5.2" - "@docusaurus/utils" "2.0.0-beta.18" - "@docusaurus/utils-common" "2.0.0-beta.18" - "@docusaurus/utils-validation" "2.0.0-beta.18" - "@slorber/static-site-generator-webpack-plugin" "^4.0.4" - "@svgr/webpack" "^6.2.1" - autoprefixer "^10.4.4" - babel-loader "^8.2.4" - babel-plugin-dynamic-import-node "2.3.0" - boxen "^6.2.1" - chokidar "^3.5.3" - clean-css "^5.2.4" - cli-table3 "^0.6.1" - combine-promises "^1.1.0" - commander "^5.1.0" - copy-webpack-plugin "^10.2.4" - core-js "^3.21.1" - css-loader "^6.7.1" - css-minimizer-webpack-plugin "^3.4.1" - cssnano "^5.1.5" - del "^6.0.0" - detect-port "^1.3.0" - escape-html "^1.0.3" - eta "^1.12.3" - file-loader "^6.2.0" - fs-extra "^10.0.1" - html-minifier-terser "^6.1.0" - html-tags "^3.1.0" - html-webpack-plugin "^5.5.0" - import-fresh "^3.3.0" - is-root "^2.1.0" - leven "^3.1.0" - lodash "^4.17.21" - mini-css-extract-plugin "^2.6.0" - nprogress "^0.2.0" - postcss "^8.4.12" - postcss-loader "^6.2.1" - prompts "^2.4.2" - react-dev-utils "^12.0.0" - react-helmet-async "^1.2.3" - react-loadable "npm:@docusaurus/react-loadable@5.5.2" - react-loadable-ssr-addon-v5-slorber "^1.0.1" - react-router "^5.2.0" - react-router-config "^5.1.1" - react-router-dom "^5.2.0" - remark-admonitions "^1.2.1" - rtl-detect "^1.0.4" - semver "^7.3.5" - serve-handler "^6.1.3" - shelljs "^0.8.5" - terser-webpack-plugin "^5.3.1" - tslib "^2.3.1" - update-notifier "^5.1.0" - url-loader "^4.1.1" - wait-on "^6.0.1" - webpack "^5.70.0" - webpack-bundle-analyzer "^4.5.0" - webpack-dev-server "^4.7.4" - webpack-merge "^5.8.0" - webpackbar "^5.0.2" - "@docusaurus/core@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.19.tgz#b3e0008affea95b84ab4fbec16cfea77a10d452a" @@ -1620,15 +1541,6 @@ webpack-merge "^5.8.0" webpackbar "^5.0.2" -"@docusaurus/cssnano-preset@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.18.tgz#235ac9064fe8f8da618349ce5305be3ed3a44e29" - integrity sha512-VxhYmpyx16Wv00W9TUfLVv0NgEK/BwP7pOdWoaiELEIAMV7SO1+6iB8gsFUhtfKZ31I4uPVLMKrCyWWakoFeFA== - dependencies: - cssnano-preset-advanced "^5.3.1" - postcss "^8.4.12" - postcss-sort-media-queries "^4.2.1" - "@docusaurus/cssnano-preset@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.19.tgz#d15221c1befe4c7ca2415ca7d4073d38a64d6507" @@ -1638,14 +1550,6 @@ postcss "^8.4.13" postcss-sort-media-queries "^4.2.1" -"@docusaurus/logger@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.18.tgz#12302f312a083eb018caa28505b63f5dd4ab6a91" - integrity sha512-frNe5vhH3mbPmH980Lvzaz45+n1PQl3TkslzWYXQeJOkFX17zUd3e3U7F9kR1+DocmAqHkgAoWuXVcvEoN29fg== - dependencies: - chalk "^4.1.2" - tslib "^2.3.1" - "@docusaurus/logger@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.19.tgz#fa4f5e73568ba5ec86ff32ae217403258548af00" @@ -1654,28 +1558,6 @@ chalk "^4.1.2" tslib "^2.4.0" -"@docusaurus/mdx-loader@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.18.tgz#4a9fc0607e0a210a7d7db3108415208dd36e33d3" - integrity sha512-pOmAQM4Y1jhuZTbEhjh4ilQa74Mh6Q0pMZn1xgIuyYDdqvIOrOlM/H0i34YBn3+WYuwsGim4/X0qynJMLDUA4A== - dependencies: - "@babel/parser" "^7.17.8" - "@babel/traverse" "^7.17.3" - "@docusaurus/logger" "2.0.0-beta.18" - "@docusaurus/utils" "2.0.0-beta.18" - "@mdx-js/mdx" "^1.6.22" - escape-html "^1.0.3" - file-loader "^6.2.0" - fs-extra "^10.0.1" - image-size "^1.0.1" - mdast-util-to-string "^2.0.0" - remark-emoji "^2.1.0" - stringify-object "^3.3.0" - tslib "^2.3.1" - unist-util-visit "^2.0.2" - url-loader "^4.1.1" - webpack "^5.70.0" - "@docusaurus/mdx-loader@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.19.tgz#f40a5926d02d18e280e517d12d75a43a347ccc25" @@ -1698,130 +1580,131 @@ url-loader "^4.1.1" webpack "^5.72.0" -"@docusaurus/module-type-aliases@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.0.0-beta.18.tgz#001379229c58cbc3ed565e19437cbda86d5e8742" - integrity sha512-e6mples8FZRyT7QyqidGS6BgkROjM+gljJsdOqoctbtBp+SZ5YDjwRHOmoY7eqEfsQNOaFZvT2hK38ui87hCRA== +"@docusaurus/module-type-aliases@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.0.0-beta.19.tgz#60c2eea0c3cac58e83ced6f696ff4e395de8d627" + integrity sha512-VlumB8un3zNZxe7sanAoCnM+WefDsfX/QlSP/uD6w9pdfJDAO7e2/YJRwP0UWmGJ659xd+MGopGyLzA4ga+HaA== dependencies: - "@docusaurus/types" "2.0.0-beta.18" + "@docusaurus/types" "2.0.0-beta.19" "@types/react" "*" "@types/react-router-config" "*" "@types/react-router-dom" "*" react-helmet-async "*" -"@docusaurus/plugin-content-blog@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.18.tgz#95fe3dfc8bae9bf153c65a3a441234c450cbac0a" - integrity sha512-qzK83DgB+mxklk3PQC2nuTGPQD/8ogw1nXSmaQpyXAyhzcz4CXAZ9Swl/Ee9A/bvPwQGnSHSP3xqIYl8OkFtfw== +"@docusaurus/plugin-content-blog@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.19.tgz#401065b456a4b12049c12adee0bdf36366e2df40" + integrity sha512-VDCtAUU4Ub2UWktzGfxT+E+JHj73XSWjJ8wNMJAtXwmOr4Lmhu9bDAuo74zL4tqFkfrYr4OLEcRpgwIDCdBHWg== dependencies: - "@docusaurus/core" "2.0.0-beta.18" - "@docusaurus/logger" "2.0.0-beta.18" - "@docusaurus/mdx-loader" "2.0.0-beta.18" - "@docusaurus/utils" "2.0.0-beta.18" - "@docusaurus/utils-common" "2.0.0-beta.18" - "@docusaurus/utils-validation" "2.0.0-beta.18" + "@docusaurus/core" "2.0.0-beta.19" + "@docusaurus/logger" "2.0.0-beta.19" + "@docusaurus/mdx-loader" "2.0.0-beta.19" + "@docusaurus/utils" "2.0.0-beta.19" + "@docusaurus/utils-common" "2.0.0-beta.19" + "@docusaurus/utils-validation" "2.0.0-beta.19" cheerio "^1.0.0-rc.10" feed "^4.2.2" - fs-extra "^10.0.1" + fs-extra "^10.1.0" lodash "^4.17.21" reading-time "^1.5.0" remark-admonitions "^1.2.1" - tslib "^2.3.1" + tslib "^2.4.0" + unist-util-visit "^2.0.3" utility-types "^3.10.0" - webpack "^5.70.0" + webpack "^5.72.0" -"@docusaurus/plugin-content-docs@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.18.tgz#fef52d945da2928e0f4f3f9a9384d9ee7f2d4288" - integrity sha512-z4LFGBJuzn4XQiUA7OEA2SZTqlp+IYVjd3NrCk/ZUfNi1tsTJS36ATkk9Y6d0Nsp7K2kRXqaXPsz4adDgeIU+Q== +"@docusaurus/plugin-content-docs@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.19.tgz#0a5011e772b4945821b4d3d03ab7def69202ca04" + integrity sha512-PjgPTprfRgBRixTur4aaOy+zBxXMOzk3oCHA19+SIDkOSDnGEhMdJM/2+NNeCa/TeF69HUPw4ISzi9UQsSGyFA== dependencies: - "@docusaurus/core" "2.0.0-beta.18" - "@docusaurus/logger" "2.0.0-beta.18" - "@docusaurus/mdx-loader" "2.0.0-beta.18" - "@docusaurus/utils" "2.0.0-beta.18" - "@docusaurus/utils-validation" "2.0.0-beta.18" + "@docusaurus/core" "2.0.0-beta.19" + "@docusaurus/logger" "2.0.0-beta.19" + "@docusaurus/mdx-loader" "2.0.0-beta.19" + "@docusaurus/utils" "2.0.0-beta.19" + "@docusaurus/utils-validation" "2.0.0-beta.19" combine-promises "^1.1.0" - fs-extra "^10.0.1" + fs-extra "^10.1.0" import-fresh "^3.3.0" js-yaml "^4.1.0" lodash "^4.17.21" remark-admonitions "^1.2.1" - tslib "^2.3.1" + tslib "^2.4.0" utility-types "^3.10.0" - webpack "^5.70.0" + webpack "^5.72.0" -"@docusaurus/plugin-content-pages@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.18.tgz#0fef392be3fea3d85c212caf4eb744ead920c30b" - integrity sha512-CJ2Xeb9hQrMeF4DGywSDVX2TFKsQpc8ZA7czyeBAAbSFsoRyxXPYeSh8aWljqR4F1u/EKGSKy0Shk/D4wumaHw== +"@docusaurus/plugin-content-pages@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.19.tgz#09c7882fbd4c745c0acdcccf2285c19239a118de" + integrity sha512-WzGrXikIGXQcfQU+GbDCEXelRr2bp8/koxQIbGC3axlWuWR6OPSet7dq8pV5PWgUbeXPZamMrYUPQv7FuCWQ3A== dependencies: - "@docusaurus/core" "2.0.0-beta.18" - "@docusaurus/mdx-loader" "2.0.0-beta.18" - "@docusaurus/utils" "2.0.0-beta.18" - "@docusaurus/utils-validation" "2.0.0-beta.18" - fs-extra "^10.0.1" + "@docusaurus/core" "2.0.0-beta.19" + "@docusaurus/mdx-loader" "2.0.0-beta.19" + "@docusaurus/utils" "2.0.0-beta.19" + "@docusaurus/utils-validation" "2.0.0-beta.19" + fs-extra "^10.1.0" remark-admonitions "^1.2.1" - tslib "^2.3.1" - webpack "^5.70.0" + tslib "^2.4.0" + webpack "^5.72.0" -"@docusaurus/plugin-debug@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.18.tgz#d4582532e59b538a23398f7c444b005367efa922" - integrity sha512-inLnLERgG7q0WlVmK6nYGHwVqREz13ivkynmNygEibJZToFRdgnIPW+OwD8QzgC5MpQTJw7+uYjcitpBumy1Gw== +"@docusaurus/plugin-debug@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.19.tgz#d510b1b9d63ff9ffeb8efd88743c4f15ef123683" + integrity sha512-QczGjFvUcKNjuIAbZtGKkwHW8cfpPTaaKE82W1rXpa5OtzQYpK8ybMh8+cHKQeTks/l9B0korDYJdWYUjWbYvw== dependencies: - "@docusaurus/core" "2.0.0-beta.18" - "@docusaurus/utils" "2.0.0-beta.18" - fs-extra "^10.0.1" + "@docusaurus/core" "2.0.0-beta.19" + "@docusaurus/utils" "2.0.0-beta.19" + fs-extra "^10.1.0" react-json-view "^1.21.3" - tslib "^2.3.1" + tslib "^2.4.0" -"@docusaurus/plugin-google-analytics@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.18.tgz#a9b1659abb3f588e866aaa742ec4c82fe943eda3" - integrity sha512-s9dRBWDrZ1uu3wFXPCF7yVLo/+5LUFAeoxpXxzory8gn9GYDt8ZDj80h5DUyCLxiy72OG6bXWNOYS/Vc6cOPXQ== +"@docusaurus/plugin-google-analytics@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.19.tgz#be167a357e3d7eed93e63f229120c17eaf9fb25c" + integrity sha512-e15Fz+qReONeR8yZbtMejiY2T9USzNUZ5i+iDSLFujC0cAPW6XzA15+bzg2wcpC4HRwIsLsaAJkY8Z3stFjcdw== dependencies: - "@docusaurus/core" "2.0.0-beta.18" - "@docusaurus/utils-validation" "2.0.0-beta.18" - tslib "^2.3.1" + "@docusaurus/core" "2.0.0-beta.19" + "@docusaurus/utils-validation" "2.0.0-beta.19" + tslib "^2.4.0" -"@docusaurus/plugin-google-gtag@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.18.tgz#b51611ac01915523ddcfc9732f7862cf4996a0e1" - integrity sha512-h7vPuLVo/9pHmbFcvb4tCpjg4SxxX4k+nfVDyippR254FM++Z/nA5pRB0WvvIJ3ZTe0ioOb5Wlx2xdzJIBHUNg== +"@docusaurus/plugin-google-gtag@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.19.tgz#a9f14f9a025cd3af0d7495d6e45d409fb8d8c4db" + integrity sha512-0dWj6+5YmRNBsGMqucaKQUMJ7ebxf6b1IqwJ5Y0p6v8ZgEC2avXoiAYNCR+IujyJSKzGSW+MqqGrxRFvqitjdQ== dependencies: - "@docusaurus/core" "2.0.0-beta.18" - "@docusaurus/utils-validation" "2.0.0-beta.18" - tslib "^2.3.1" + "@docusaurus/core" "2.0.0-beta.19" + "@docusaurus/utils-validation" "2.0.0-beta.19" + tslib "^2.4.0" -"@docusaurus/plugin-sitemap@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.18.tgz#7e8217e95bede5719bd02265dcf7eb2fea76b675" - integrity sha512-Klonht0Ye3FivdBpS80hkVYNOH+8lL/1rbCPEV92rKhwYdwnIejqhdKct4tUTCl8TYwWiyeUFQqobC/5FNVZPQ== +"@docusaurus/plugin-sitemap@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.19.tgz#4d506e2d4679af7231428b9214b6d06c329a9e42" + integrity sha512-UwkL8Pe7AmOgnPcnDzlKkWUKhprc4dGBBAYrMl27vX1CQDU9fgnFLFAe3Bi+y93bjgRjrWVkUPN1+Gc/HOR5ig== dependencies: - "@docusaurus/core" "2.0.0-beta.18" - "@docusaurus/utils" "2.0.0-beta.18" - "@docusaurus/utils-common" "2.0.0-beta.18" - "@docusaurus/utils-validation" "2.0.0-beta.18" - fs-extra "^10.0.1" + "@docusaurus/core" "2.0.0-beta.19" + "@docusaurus/utils" "2.0.0-beta.19" + "@docusaurus/utils-common" "2.0.0-beta.19" + "@docusaurus/utils-validation" "2.0.0-beta.19" + fs-extra "^10.1.0" sitemap "^7.1.1" - tslib "^2.3.1" + tslib "^2.4.0" -"@docusaurus/preset-classic@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.18.tgz#82f6905d34a13e46289ac4d2f1125e47033bd9d8" - integrity sha512-TfDulvFt/vLWr/Yy7O0yXgwHtJhdkZ739bTlFNwEkRMAy8ggi650e52I1I0T79s67llecb4JihgHPW+mwiVkCQ== +"@docusaurus/preset-classic@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.19.tgz#ad314afa0cb0b2327bc7b501cfef5e7321d71dd6" + integrity sha512-bKGl/0VzO053jen1tlADIJh0YotQcL4oJplEn4fMo7GRfEtEnShRVPppIAsO4JZeMcAvofzkeV6x5MP2n9XI3w== dependencies: - "@docusaurus/core" "2.0.0-beta.18" - "@docusaurus/plugin-content-blog" "2.0.0-beta.18" - "@docusaurus/plugin-content-docs" "2.0.0-beta.18" - "@docusaurus/plugin-content-pages" "2.0.0-beta.18" - "@docusaurus/plugin-debug" "2.0.0-beta.18" - "@docusaurus/plugin-google-analytics" "2.0.0-beta.18" - "@docusaurus/plugin-google-gtag" "2.0.0-beta.18" - "@docusaurus/plugin-sitemap" "2.0.0-beta.18" - "@docusaurus/theme-classic" "2.0.0-beta.18" - "@docusaurus/theme-common" "2.0.0-beta.18" - "@docusaurus/theme-search-algolia" "2.0.0-beta.18" + "@docusaurus/core" "2.0.0-beta.19" + "@docusaurus/plugin-content-blog" "2.0.0-beta.19" + "@docusaurus/plugin-content-docs" "2.0.0-beta.19" + "@docusaurus/plugin-content-pages" "2.0.0-beta.19" + "@docusaurus/plugin-debug" "2.0.0-beta.19" + "@docusaurus/plugin-google-analytics" "2.0.0-beta.19" + "@docusaurus/plugin-google-gtag" "2.0.0-beta.19" + "@docusaurus/plugin-sitemap" "2.0.0-beta.19" + "@docusaurus/theme-classic" "2.0.0-beta.19" + "@docusaurus/theme-common" "2.0.0-beta.19" + "@docusaurus/theme-search-algolia" "2.0.0-beta.19" "@docusaurus/react-loadable@5.5.2", "react-loadable@npm:@docusaurus/react-loadable@5.5.2": version "5.5.2" @@ -1831,94 +1714,90 @@ "@types/react" "*" prop-types "^15.6.2" -"@docusaurus/theme-classic@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.18.tgz#a3632e83923ed4372f80999128375cd0b378d3f8" - integrity sha512-WJWofvSGKC4Luidk0lyUwkLnO3DDynBBHwmt4QrV+aAVWWSOHUjA2mPOF6GLGuzkZd3KfL9EvAfsU0aGE1Hh5g== +"@docusaurus/theme-classic@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.19.tgz#40b548a6af8607a62da7b6b0484aa8e45c827aa6" + integrity sha512-Z1Bbdv26YNhYW+obemUEW0nplN0t6AWOj9dZmqD6dyhlxDQra4yB3rodnjpDioNEQyMEJZISZXG+AlSWLjyzUg== dependencies: - "@docusaurus/core" "2.0.0-beta.18" - "@docusaurus/plugin-content-blog" "2.0.0-beta.18" - "@docusaurus/plugin-content-docs" "2.0.0-beta.18" - "@docusaurus/plugin-content-pages" "2.0.0-beta.18" - "@docusaurus/theme-common" "2.0.0-beta.18" - "@docusaurus/theme-translations" "2.0.0-beta.18" - "@docusaurus/utils" "2.0.0-beta.18" - "@docusaurus/utils-common" "2.0.0-beta.18" - "@docusaurus/utils-validation" "2.0.0-beta.18" + "@docusaurus/core" "2.0.0-beta.19" + "@docusaurus/plugin-content-blog" "2.0.0-beta.19" + "@docusaurus/plugin-content-docs" "2.0.0-beta.19" + "@docusaurus/plugin-content-pages" "2.0.0-beta.19" + "@docusaurus/theme-common" "2.0.0-beta.19" + "@docusaurus/theme-translations" "2.0.0-beta.19" + "@docusaurus/utils" "2.0.0-beta.19" + "@docusaurus/utils-common" "2.0.0-beta.19" + "@docusaurus/utils-validation" "2.0.0-beta.19" "@mdx-js/react" "^1.6.22" clsx "^1.1.1" copy-text-to-clipboard "^3.0.1" - infima "0.2.0-alpha.38" + infima "0.2.0-alpha.39" lodash "^4.17.21" - postcss "^8.4.12" + nprogress "^0.2.0" + postcss "^8.4.13" prism-react-renderer "^1.3.1" - prismjs "^1.27.0" + prismjs "^1.28.0" react-router-dom "^5.2.0" rtlcss "^3.5.0" -"@docusaurus/theme-common@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.0.0-beta.18.tgz#abf74f82c37d2ce813f92447cb020831290059fb" - integrity sha512-3pI2Q6ttScDVTDbuUKAx+TdC8wmwZ2hfWk8cyXxksvC9bBHcyzXhSgcK8LTsszn2aANyZ3e3QY2eNSOikTFyng== +"@docusaurus/theme-common@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.0.0-beta.19.tgz#0f0eab66900509c3302917fbbade894c27e357ac" + integrity sha512-Pj1EaGHjFLO2FluZLIF32N+dspunuocbXTeDe2doQCMP5fKX87hUHNSG/qi/KBSueBFNW0yZtCTxFHK+jIn+eg== dependencies: - "@docusaurus/module-type-aliases" "2.0.0-beta.18" - "@docusaurus/plugin-content-blog" "2.0.0-beta.18" - "@docusaurus/plugin-content-docs" "2.0.0-beta.18" - "@docusaurus/plugin-content-pages" "2.0.0-beta.18" + "@docusaurus/module-type-aliases" "2.0.0-beta.19" + "@docusaurus/plugin-content-blog" "2.0.0-beta.19" + "@docusaurus/plugin-content-docs" "2.0.0-beta.19" + "@docusaurus/plugin-content-pages" "2.0.0-beta.19" clsx "^1.1.1" parse-numeric-range "^1.3.0" prism-react-renderer "^1.3.1" - tslib "^2.3.1" + tslib "^2.4.0" utility-types "^3.10.0" -"@docusaurus/theme-search-algolia@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.18.tgz#cbdda8982deac4556848e04853b7f32d93886c02" - integrity sha512-2w97KO/gnjI49WVtYQqENpQ8iO1Sem0yaTxw7/qv/ndlmIAQD0syU4yx6GsA7bTQCOGwKOWWzZSetCgUmTnWgA== +"@docusaurus/theme-search-algolia@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.19.tgz#7eef4556e29b946a778f8293112cfd88c79d02f9" + integrity sha512-peWPLoKsHNIk2PLEBeEc06B3Plz4cDKx3AyQJn9tt0dyVYMHuy0x0eqr3akwAubMC6KkF3UFaKFjB6ELK92KwA== dependencies: "@docsearch/react" "^3.0.0" - "@docusaurus/core" "2.0.0-beta.18" - "@docusaurus/logger" "2.0.0-beta.18" - "@docusaurus/plugin-content-docs" "2.0.0-beta.18" - "@docusaurus/theme-common" "2.0.0-beta.18" - "@docusaurus/theme-translations" "2.0.0-beta.18" - "@docusaurus/utils" "2.0.0-beta.18" - "@docusaurus/utils-validation" "2.0.0-beta.18" + "@docusaurus/core" "2.0.0-beta.19" + "@docusaurus/logger" "2.0.0-beta.19" + "@docusaurus/plugin-content-docs" "2.0.0-beta.19" + "@docusaurus/theme-common" "2.0.0-beta.19" + "@docusaurus/theme-translations" "2.0.0-beta.19" + "@docusaurus/utils" "2.0.0-beta.19" + "@docusaurus/utils-validation" "2.0.0-beta.19" algoliasearch "^4.13.0" - algoliasearch-helper "^3.7.4" + algoliasearch-helper "^3.8.2" clsx "^1.1.1" eta "^1.12.3" - fs-extra "^10.0.1" + fs-extra "^10.1.0" lodash "^4.17.21" - tslib "^2.3.1" + tslib "^2.4.0" utility-types "^3.10.0" -"@docusaurus/theme-translations@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.0.0-beta.18.tgz#292699ce89b013262683faf7f4ee7b75a8745a79" - integrity sha512-1uTEUXlKC9nco1Lx9H5eOwzB+LP4yXJG5wfv1PMLE++kJEdZ40IVorlUi3nJnaa9/lJNq5vFvvUDrmeNWsxy/Q== +"@docusaurus/theme-translations@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.0.0-beta.19.tgz#1f669a343e093ec89677cf2955757e179f47df5b" + integrity sha512-qjG1HNIPu193iOnJNvlNpPgN6AS8B8M8nQBhzkrBgI2XakirZoo6OHtl0traxBffGw2JpZp0vUq0BsX4DyLZJQ== dependencies: - fs-extra "^10.0.1" - tslib "^2.3.1" + fs-extra "^10.1.0" + tslib "^2.4.0" -"@docusaurus/types@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-2.0.0-beta.18.tgz#9446928a6b751eefde390420b39eac32ba26abb2" - integrity sha512-zkuSmPQYP3+z4IjGHlW0nGzSSpY7Sit0Nciu/66zSb5m07TK72t6T1MlpCAn/XijcB9Cq6nenC3kJh66nGsKYg== +"@docusaurus/types@2.0.0-beta.19": + version "2.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-2.0.0-beta.19.tgz#c2f0a29f6d54b11f3a336e03446b3991019f6b1f" + integrity sha512-aaKyQahhB18cDa4yl0WPOWr9GYcH+6rujGWce2SbMIzlKLhokAXRNO2gUFmqFNafIFyb6B+WpZVBpA0+O2aGPw== dependencies: commander "^5.1.0" + history "^4.9.0" joi "^17.6.0" + react-helmet-async "^1.3.0" utility-types "^3.10.0" - webpack "^5.70.0" + webpack "^5.72.0" webpack-merge "^5.8.0" -"@docusaurus/utils-common@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.18.tgz#46cf0bed2a7c532b2b85eab5bb914ff118b2c4e9" - integrity sha512-pK83EcOIiKCLGhrTwukZMo5jqd1sqqqhQwOVyxyvg+x9SY/lsnNzScA96OEfm+qQLBwK1OABA7Xc1wfkgkUxvw== - dependencies: - tslib "^2.3.1" - "@docusaurus/utils-common@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.19.tgz#ff22fc3245315799935f772b5e6d0028ae9e5937" @@ -1926,17 +1805,6 @@ dependencies: tslib "^2.4.0" -"@docusaurus/utils-validation@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.18.tgz#0dabf113d2c53ee685a715cd4caae6e219e9e41e" - integrity sha512-3aDrXjJJ8Cw2MAYEk5JMNnr8UHPxmVNbPU/PIHFWmWK09nJvs3IQ8nc9+8I30aIjRdIyc/BIOCxgvAcJ4hsxTA== - dependencies: - "@docusaurus/logger" "2.0.0-beta.18" - "@docusaurus/utils" "2.0.0-beta.18" - joi "^17.6.0" - js-yaml "^4.1.0" - tslib "^2.3.1" - "@docusaurus/utils-validation@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.19.tgz#53e56e66a1446e25b2b86aa015312cb647c6d7a1" @@ -1948,27 +1816,6 @@ js-yaml "^4.1.0" tslib "^2.4.0" -"@docusaurus/utils@2.0.0-beta.18": - version "2.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.18.tgz#c3fe0e9fac30db4510962263993fd0ee2679eebb" - integrity sha512-v2vBmH7xSbPwx3+GB90HgLSQdj+Rh5ELtZWy7M20w907k0ROzDmPQ/8Ke2DK3o5r4pZPGnCrsB3SaYI83AEmAA== - dependencies: - "@docusaurus/logger" "2.0.0-beta.18" - "@svgr/webpack" "^6.2.1" - file-loader "^6.2.0" - fs-extra "^10.0.1" - github-slugger "^1.4.0" - globby "^11.1.0" - gray-matter "^4.0.3" - js-yaml "^4.1.0" - lodash "^4.17.21" - micromatch "^4.0.5" - resolve-pathname "^3.0.0" - shelljs "^0.8.5" - tslib "^2.3.1" - url-loader "^4.1.1" - webpack "^5.70.0" - "@docusaurus/utils@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.19.tgz#c3fb547f9ec708b8eed370e4d009bac213a37ce8" @@ -5089,7 +4936,7 @@ ajv@^8.0.0, ajv@^8.6.0, ajv@^8.8.0: require-from-string "^2.0.2" uri-js "^4.2.2" -algoliasearch-helper@^3.7.4: +algoliasearch-helper@^3.8.2: version "3.8.2" resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.8.2.tgz#35726dc6d211f49dbab0bf6d37b4658165539523" integrity sha512-AXxiF0zT9oYwl8ZBgU/eRXvfYhz7cBA5YrLPlw9inZHdaYF0QEya/f1Zp1mPYMXc1v6VkHwBq4pk6/vayBLICg== @@ -5511,7 +5358,7 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@^10.3.7, autoprefixer@^10.4.4, autoprefixer@^10.4.5: +autoprefixer@^10.3.7, autoprefixer@^10.4.5: version "10.4.5" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.5.tgz#662193c744094b53d3637f39be477e07bd904998" integrity sha512-Fvd8yCoA7lNX/OUllvS+aS1I7WRBclGXsepbvT8ZaPgrH24rgXpZzF0/6Hh3ZEkwg+0AES/Osd196VZmYoEFtw== @@ -5576,7 +5423,7 @@ babel-jest@^27.4.2, babel-jest@^27.5.1: graceful-fs "^4.2.9" slash "^3.0.0" -babel-loader@^8.0.0, babel-loader@^8.2.3, babel-loader@^8.2.4, babel-loader@^8.2.5: +babel-loader@^8.0.0, babel-loader@^8.2.3, babel-loader@^8.2.5: version "8.2.5" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e" integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ== @@ -6595,7 +6442,7 @@ clean-css@^4.2.3: dependencies: source-map "~0.6.0" -clean-css@^5.2.2, clean-css@^5.2.4, clean-css@^5.3.0: +clean-css@^5.2.2, clean-css@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.0.tgz#ad3d8238d5f3549e83d5f87205189494bc7cbb59" integrity sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ== @@ -7012,7 +6859,7 @@ core-js@^2.4.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.0.4, core-js@^3.19.2, core-js@^3.21.1, core-js@^3.22.3, core-js@^3.6.5, core-js@^3.8.2: +core-js@^3.0.4, core-js@^3.19.2, core-js@^3.22.3, core-js@^3.6.5, core-js@^3.8.2: version "3.22.4" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.4.tgz#f4b3f108d45736935aa028444a69397e40d8c531" integrity sha512-1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w== @@ -7359,7 +7206,7 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-advanced@^5.3.1, cssnano-preset-advanced@^5.3.3: +cssnano-preset-advanced@^5.3.3: version "5.3.3" resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.3.3.tgz#848422118d7a62b5b29a53edc160f58c7f7f7539" integrity sha512-AB9SmTSC2Gd8T7PpKUsXFJ3eNsg7dc4CTZ0+XAJ29MNxyJsrCEk7N1lw31bpHrsQH2PVJr21bbWgGAfA9j0dIA== @@ -7411,7 +7258,7 @@ cssnano-utils@^3.1.0: resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== -cssnano@^5.0.6, cssnano@^5.1.5, cssnano@^5.1.7: +cssnano@^5.0.6, cssnano@^5.1.7: version "5.1.7" resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.7.tgz#99858bef6c76c9240f0cdc9239570bc7db8368be" integrity sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg== @@ -9214,7 +9061,7 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^10.0.0, fs-extra@^10.0.1, fs-extra@^10.1.0: +fs-extra@^10.0.0, fs-extra@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== @@ -10211,10 +10058,10 @@ infer-owner@^1.0.3, infer-owner@^1.0.4: resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== -infima@0.2.0-alpha.38: - version "0.2.0-alpha.38" - resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.38.tgz#e41d95c7cd82756549b17df12f613fed4af3d528" - integrity sha512-1WsmqSMI5IqzrUx3goq+miJznHBonbE3aoqZ1AR/i/oHhroxNeSV6Awv5VoVfXBhfTzLSnxkHaRI2qpAMYcCzw== +infima@0.2.0-alpha.39: + version "0.2.0-alpha.39" + resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.39.tgz#054b13ac44f3e9a42bc083988f1a1586add2f59c" + integrity sha512-UyYiwD3nwHakGhuOUfpe3baJ8gkiPpRVx4a4sE/Ag+932+Y6swtLsdPoRR8ezhwqGnduzxmFkjumV9roz6QoLw== inflight@^1.0.4: version "1.0.6" @@ -14008,7 +13855,7 @@ prism-react-renderer@^1.2.1, prism-react-renderer@^1.3.1: resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.1.tgz#88fc9d0df6bed06ca2b9097421349f8c2f24e30d" integrity sha512-xUeDMEz074d0zc5y6rxiMp/dlC7C+5IDDlaEUlcBOFE2wddz7hz5PNupb087mPwTt7T9BrFmewObfCBuf/LKwQ== -prismjs@^1.21.0, prismjs@^1.27.0: +prismjs@^1.21.0, prismjs@^1.28.0: version "1.28.0" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6" integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw== @@ -14716,7 +14563,7 @@ react-colorful@^5.1.2: resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.5.1.tgz#29d9c4e496f2ca784dd2bb5053a3a4340cfaf784" integrity sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg== -react-dev-utils@^12.0.0, react-dev-utils@^12.0.1: +react-dev-utils@^12.0.1: version "12.0.1" resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73" integrity sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ== @@ -14802,7 +14649,7 @@ react-fast-compare@^3.0.1, react-fast-compare@^3.2.0: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== -react-helmet-async@*, react-helmet-async@^1.0.7, react-helmet-async@^1.2.3, react-helmet-async@^1.3.0: +react-helmet-async@*, react-helmet-async@^1.0.7, react-helmet-async@^1.3.0: 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== @@ -15307,7 +15154,7 @@ remark-admonitions@^1.2.1: unified "^8.4.2" unist-util-visit "^2.0.1" -remark-emoji@^2.1.0, remark-emoji@^2.2.0: +remark-emoji@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/remark-emoji/-/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" integrity sha512-P3cj9s5ggsUvWw5fS2uzCHJMGuXYRb0NnZqYlNecewXt8QBU9n5vW3DUUKOhepS8F9CwdMx9B8a3i7pqFWAI5w== @@ -17463,7 +17310,7 @@ unist-util-visit-parents@^3.0.0: "@types/unist" "^2.0.0" unist-util-is "^4.0.0" -unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3: +unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== @@ -18267,7 +18114,7 @@ webpack-dev-middleware@^5.3.1: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@^4.6.0, webpack-dev-server@^4.7.4, webpack-dev-server@^4.9.0: +webpack-dev-server@^4.6.0, webpack-dev-server@^4.8.1, webpack-dev-server@^4.9.0: version "4.9.0" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.0.tgz#737dbf44335bb8bde68f8f39127fc401c97a1557" integrity sha512-+Nlb39iQSOSsFv0lWUuUTim3jDQO8nhK3E68f//J2r5rIcp4lULHXz2oZ0UVdEeWXEh5lSzYUlzarZhDAeAVQw== @@ -18402,7 +18249,7 @@ webpack@4: watchpack "^1.7.4" webpack-sources "^1.4.1" -webpack@^5, webpack@^5.64.4, webpack@^5.70.0, webpack@^5.72.0, webpack@^5.9.0: +webpack@^5, webpack@^5.64.4, webpack@^5.72.0, webpack@^5.9.0: version "5.72.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28" integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w== From b49865d3aaa710c9d51b47a4ac2c37f12ba0976e Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Thu, 5 May 2022 15:37:28 -0400 Subject: [PATCH 031/340] progress on klDivergence (still working) Value: [1e-5 to 1e-2] --- .../Distributions/KlDivergence_test.res | 34 +++++++++++++++++++ .../DistributionOperation.res | 8 ++--- .../DistributionOperation.resi | 2 +- .../Distributions/DistributionTypes.res | 2 +- .../Distributions/PointSetDist/Continuous.res | 22 +++--------- .../Distributions/PointSetDist/Discrete.res | 22 ++++-------- .../PointSetDist/Distributions.res | 14 -------- .../Distributions/PointSetDist/Mixed.res | 20 +++-------- .../PointSetDist/PointSetDist.res | 6 ++-- .../PointSetDist/PointSetDist_Scoring.res | 28 +++++---------- .../src/rescript/MagicNumbers.res | 1 + .../src/rescript/Utility/XYShape.res | 2 +- 12 files changed, 68 insertions(+), 93 deletions(-) create mode 100644 packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res new file mode 100644 index 00000000..b1162124 --- /dev/null +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -0,0 +1,34 @@ +open Jest +open Expect +open TestHelpers + +describe("kl divergence", () => { + let klDivergence = DistributionOperation.Constructors.klDivergence(~env) + test("", () => { + exception KlFailed + let lowAnswer = 4.3526e0 + let highAnswer = 8.5382e0 + let lowPrediction = 4.3526e0 + let highPrediction = 1.2345e1 + let answer = + uniformMakeR(lowAnswer, highAnswer)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) + let prediction = + uniformMakeR(lowPrediction, highPrediction)->E.R2.errMap(s => DistributionTypes.ArgumentError( + s, + )) + // integral along the support of the answer of answer.pdf(x) times log of prediction.pdf(x) divided by answer.pdf(x) dx + let analyticalKl = + -1.0 /. + (highAnswer -. lowAnswer) *. + Js.Math.log((highAnswer -. lowAnswer) /. (highPrediction -. lowPrediction)) *. + (highAnswer -. lowAnswer) + let kl = E.R.liftJoin2(klDivergence, prediction, answer) + switch kl { + | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) + | Error(err) => { + Js.Console.log(DistributionTypes.Error.toString(err)) + raise(KlFailed) + } + } + }) +}) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res index 6872136e..80a53eb8 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res @@ -10,8 +10,8 @@ type env = { } let defaultEnv = { - sampleCount: 10000, - xyPointLength: 10000, + sampleCount: MagicNumbers.Environment.defaultSampleCount, + xyPointLength: MagicNumbers.Environment.defaultXYPointLength, } type outputType = @@ -128,7 +128,7 @@ let rec run = (~env, functionCallInfo: functionCallInfo): outputType => { let fromDistFn = ( subFnName: DistributionTypes.DistributionOperation.fromDist, dist: genericDist, - ) => { + ): outputType => { let response = switch subFnName { | ToFloat(distToFloatOperation) => GenericDist.toFloatOperation(dist, ~toPointSetFn, ~distToFloatOperation) @@ -261,7 +261,7 @@ module Constructors = { let pdf = (~env, dist, f) => C.pdf(dist, f)->run(~env)->toFloatR let normalize = (~env, dist) => C.normalize(dist)->run(~env)->toDistR let isNormalized = (~env, dist) => C.isNormalized(dist)->run(~env)->toBoolR - let logScore = (~env, dist1, dist2) => C.logScore(dist1, dist2)->run(~env)->toFloatR + let klDivergence = (~env, dist1, dist2) => C.klDivergence(dist1, dist2)->run(~env)->toFloatR let toPointSet = (~env, dist) => C.toPointSet(dist)->run(~env)->toDistR let toSampleSet = (~env, dist, n) => C.toSampleSet(dist, n)->run(~env)->toDistR let fromSamples = (~env, xs) => C.fromSamples(xs)->run(~env)->toDistR diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi index 7476b619..200be7d7 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi @@ -60,7 +60,7 @@ module Constructors: { @genType let isNormalized: (~env: env, genericDist) => result @genType - let logScore: (~env: env, genericDist, genericDist) => result + let klDivergence: (~env: env, genericDist, genericDist) => result @genType let toPointSet: (~env: env, genericDist) => result @genType diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res index 03210270..a9f7dfbe 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res @@ -160,7 +160,7 @@ module Constructors = { let fromSamples = (xs): t => FromSamples(xs) let truncate = (dist, left, right): t => FromDist(ToDist(Truncate(left, right)), dist) let inspect = (dist): t => FromDist(ToDist(Inspect), dist) - let logScore = (dist1, dist2): t => FromDist(ToScore(KLDivergence(dist2)), dist1) + let klDivergence = (dist1, dist2): t => FromDist(ToScore(KLDivergence(dist2)), dist1) let scalePower = (dist, n): t => FromDist(ToDist(Scale(#Power, n)), dist) let scaleLogarithm = (dist, n): t => FromDist(ToDist(Scale(#Logarithm, n)), dist) let scaleLogarithmWithThreshold = (dist, n, eps): t => FromDist( diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index b9b6b985..f0614a27 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -270,24 +270,10 @@ module T = Dist({ let variance = (t: t): float => XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) - let klDivergence = (base: t, reference: t) => { - let referenceIsZero = switch Distributions.Common.isZeroEverywhere( - PointSetTypes.Continuous(reference), - ) { - | Continuous(b) => b - | _ => false - } - if referenceIsZero { - Ok(0.0) - } else { - combinePointwise( - PointSetDist_Scoring.KLDivergence.logScore(~eps=MagicNumbers.Epsilon.ten), - base, - reference, - ) - |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) - |> E.R.fmap(integralEndY) - } + let klDivergence = (prediction: t, answer: t) => { + combinePointwise(PointSetDist_Scoring.KLDivergence.integrand, prediction, answer) + |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) + |> E.R.fmap(integralEndY) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 372eb3d1..53a8f45c 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -229,21 +229,11 @@ module T = Dist({ XYShape.Analysis.getVarianceDangerously(t, mean, getMeanOfSquares) } - let klDivergence = (base: t, reference: t) => { - let referenceIsZero = switch Distributions.Common.isZeroEverywhere( - PointSetTypes.Discrete(reference), - ) { - | Discrete(b) => b - | _ => false - } - if referenceIsZero { - Ok(0.0) - } else { - combinePointwise( - ~fn=PointSetDist_Scoring.KLDivergence.logScore(~eps=MagicNumbers.Epsilon.ten), - base, - reference, - ) |> E.R2.bind(integralEndYResult) - } + let klDivergence = (prediction: t, answer: t) => { + combinePointwise( + ~fn=PointSetDist_Scoring.KLDivergence.integrand, + prediction, + answer, + ) |> E.R2.bind(integralEndYResult) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res index 5c9ee1aa..85ffe4b1 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res @@ -96,18 +96,4 @@ module Common = { None | (Some(s1), Some(s2)) => combineFn(s1, s2) } - - let isZeroEverywhere = (d: PointSetTypes.pointSetDist) => { - let isZero = (x: float): bool => x == 0.0 - PointSetTypes.ShapeMonad.fmap( - d, - ( - mixed => - E.A.all(isZero, mixed.continuous.xyShape.ys) && - E.A.all(isZero, mixed.discrete.xyShape.ys), - disc => E.A.all(isZero, disc.xyShape.ys), - cont => E.A.all(isZero, cont.xyShape.ys), - ), - ) - } } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 1521a13c..743ad231 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -301,22 +301,10 @@ module T = Dist({ } } - let klDivergence = (base: t, reference: t) => { - let referenceIsZero = switch Distributions.Common.isZeroEverywhere( - PointSetTypes.Mixed(reference), - ) { - | Mixed(b) => b - | _ => false - } - if referenceIsZero { - Ok(0.0) - } else { - combinePointwise( - PointSetDist_Scoring.KLDivergence.logScore(~eps=MagicNumbers.Epsilon.ten), - base, - reference, - ) |> E.R.fmap(integralEndY) - } + let klDivergence = (prediction: t, answer: t) => { + combinePointwise(PointSetDist_Scoring.KLDivergence.integrand, prediction, answer) |> E.R.fmap( + integralEndY, + ) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index 7b905316..c5cf466a 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -202,9 +202,9 @@ module T = Dist({ | (Discrete(t1), Discrete(t2)) => Discrete.T.klDivergence(t1, t2) | (Mixed(t1), Mixed(t2)) => Mixed.T.klDivergence(t1, t2) | _ => { - let t1 = toMixed(t1) - let t2 = toMixed(t2) - Mixed.T.klDivergence(t1, t2) + let t1' = toMixed(t1) + let t2' = toMixed(t2) + Mixed.T.klDivergence(t1', t2') } } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 34113edb..4b50c725 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -1,25 +1,15 @@ module KLDivergence = { let logFn = Js.Math.log - let subtraction = (a, b) => Ok(a -. b) - let multiply = (a: float, b: float): result => Ok(a *. b) - let logScoreDirect = (a: float, b: float): result => - if a == 0.0 { + let integrand = (predictionElement: float, answerElement: float): result< + float, + Operation.Error.t, + > => + if predictionElement == 0.0 { Error(Operation.NegativeInfinityError) - } else if b == 0.0 { - Ok(b) + } else if answerElement == 0.0 { + Ok(answerElement) } else { - let quot = a /. b - quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(b *. logFn(quot)) - } - let logScoreWithThreshold = (~eps: float, a: float, b: float): result => - if abs_float(a) < eps { - Ok(0.0) - } else { - logScoreDirect(a, b) - } - let logScore = (~eps: option=?, a: float, b: float): result => - switch eps { - | None => logScoreDirect(a, b) - | Some(eps') => logScoreWithThreshold(~eps=eps', a, b) + let quot = predictionElement /. answerElement + quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(-.answerElement *. logFn(quot)) } } diff --git a/packages/squiggle-lang/src/rescript/MagicNumbers.res b/packages/squiggle-lang/src/rescript/MagicNumbers.res index 0f059c03..13beafe4 100644 --- a/packages/squiggle-lang/src/rescript/MagicNumbers.res +++ b/packages/squiggle-lang/src/rescript/MagicNumbers.res @@ -6,6 +6,7 @@ module Math = { module Epsilon = { let ten = 1e-10 let seven = 1e-7 + let five = 1e-5 } module Environment = { diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index a90c68e5..c0263927 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -468,7 +468,7 @@ module Range = { // TODO: I think this isn't needed by any functions anymore. let stepsToContinuous = t => { // TODO: It would be nicer if this the diff didn't change the first element, and also maybe if there were a more elegant way of doing this. - let diff = T.xTotalRange(t) |> (r => r *. 0.00001) + let diff = T.xTotalRange(t) |> (r => r *. MagicNumbers.Epsilon.five) let items = switch E.A.toRanges(Belt.Array.zip(t.xs, t.ys)) { | Ok(items) => Some( From dcf56d7bc6ea803a6ddf384300e2ec01be74a566 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Thu, 5 May 2022 20:02:12 -0400 Subject: [PATCH 032/340] `combineAlongSupportOfSecondArgument` implemented, tests still failing Value: [1e-4 to 4e-2] --- .../Distributions/KlDivergence_test.res | 35 +++++-- .../squiggle-lang/__tests__/XYShape_test.res | 13 --- .../Distributions/PointSetDist/Continuous.res | 10 +- .../Distributions/PointSetDist/Discrete.res | 12 +-- .../Distributions/PointSetDist/Mixed.res | 2 +- .../PointSetDist/PointSetDist_Scoring.res | 6 +- .../src/rescript/Utility/XYShape.res | 92 +++++++++++++++---- 7 files changed, 117 insertions(+), 53 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index b1162124..659f4b69 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -4,11 +4,11 @@ open TestHelpers describe("kl divergence", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) - test("", () => { - exception KlFailed - let lowAnswer = 4.3526e0 + exception KlFailed + test("of two uniforms is equal to the analytic expression", () => { + let lowAnswer = 2.3526e0 let highAnswer = 8.5382e0 - let lowPrediction = 4.3526e0 + let lowPrediction = 2.3526e0 let highPrediction = 1.2345e1 let answer = uniformMakeR(lowAnswer, highAnswer)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) @@ -17,11 +17,30 @@ describe("kl divergence", () => { s, )) // integral along the support of the answer of answer.pdf(x) times log of prediction.pdf(x) divided by answer.pdf(x) dx + let analyticalKl = Js.Math.log((highPrediction -. lowPrediction) /. (highAnswer -. lowAnswer)) + let kl = E.R.liftJoin2(klDivergence, prediction, answer) + switch kl { + | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) + | Error(err) => { + Js.Console.log(DistributionTypes.Error.toString(err)) + raise(KlFailed) + } + } + }) + test("of two normals is equal to the formula", () => { + // This test case comes via Nuño https://github.com/quantified-uncertainty/squiggle/issues/433 + let mean1 = 4.0 + let mean2 = 1.0 + let stdev1 = 1.0 + let stdev2 = 1.0 + + let prediction = + normalMakeR(mean1, stdev1)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) + let answer = normalMakeR(mean2, stdev2)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) let analyticalKl = - -1.0 /. - (highAnswer -. lowAnswer) *. - Js.Math.log((highAnswer -. lowAnswer) /. (highPrediction -. lowPrediction)) *. - (highAnswer -. lowAnswer) + Js.Math.log(stdev2 /. stdev1) +. + stdev1 ** 2.0 /. 2.0 /. stdev2 ** 2.0 +. + (mean1 -. mean2) ** 2.0 /. 2.0 /. stdev2 ** 2.0 -. 0.5 let kl = E.R.liftJoin2(klDivergence, prediction, answer) switch kl { | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) diff --git a/packages/squiggle-lang/__tests__/XYShape_test.res b/packages/squiggle-lang/__tests__/XYShape_test.res index 38535020..60d716ca 100644 --- a/packages/squiggle-lang/__tests__/XYShape_test.res +++ b/packages/squiggle-lang/__tests__/XYShape_test.res @@ -38,19 +38,6 @@ describe("XYShapes", () => { ) }) - describe("logScorePoint", () => { - makeTest("When identical", XYShape.logScorePoint(30, pointSetDist1, pointSetDist1), Some(0.0)) - makeTest( - "When similar", - XYShape.logScorePoint(30, pointSetDist1, pointSetDist2), - Some(1.658971191043856), - ) - makeTest( - "When very different", - XYShape.logScorePoint(30, pointSetDist1, pointSetDist3), - Some(210.3721280423322), - ) - }) describe("integrateWithTriangles", () => makeTest( "integrates correctly", diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index f0614a27..b5eb0330 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -86,6 +86,7 @@ let stepwiseToLinear = (t: t): t => // Note: This results in a distribution with as many points as the sum of those in t1 and t2. let combinePointwise = ( + ~combiner=XYShape.PointwiseCombination.combine, ~integralSumCachesFn=(_, _) => None, ~distributionType: PointSetTypes.distributionType=#PDF, fn: (float, float) => result, @@ -119,7 +120,7 @@ let combinePointwise = ( let interpolator = XYShape.XtoY.continuousInterpolator(t1.interpolation, extrapolation) - XYShape.PointwiseCombination.combine(fn, interpolator, t1.xyShape, t2.xyShape)->E.R2.fmap(x => + combiner(fn, interpolator, t1.xyShape, t2.xyShape)->E.R2.fmap(x => make(~integralSumCache=combinedIntegralSum, x) ) } @@ -271,7 +272,12 @@ module T = Dist({ XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) let klDivergence = (prediction: t, answer: t) => { - combinePointwise(PointSetDist_Scoring.KLDivergence.integrand, prediction, answer) + combinePointwise( + ~combiner=XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument, + PointSetDist_Scoring.KLDivergence.integrand, + prediction, + answer, + ) |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) |> E.R.fmap(integralEndY) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 53a8f45c..3aa92230 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -33,6 +33,7 @@ let shapeFn = (fn, t: t) => t |> getShape |> fn let lastY = (t: t) => t |> getShape |> XYShape.T.lastY let combinePointwise = ( + ~combiner=XYShape.PointwiseCombination.combine, ~integralSumCachesFn=(_, _) => None, ~fn=(a, b) => Ok(a +. b), t1: PointSetTypes.discreteShape, @@ -48,12 +49,10 @@ let combinePointwise = ( // It could be done for pointwise additions, but is that ever needed? make( - XYShape.PointwiseCombination.combine( - fn, - XYShape.XtoY.discreteInterpolator, - t1.xyShape, - t2.xyShape, - )->E.R.toExn("Addition operation should never fail", _), + combiner(fn, XYShape.XtoY.discreteInterpolator, t1.xyShape, t2.xyShape)->E.R.toExn( + "Addition operation should never fail", + _, + ), )->Ok } @@ -231,6 +230,7 @@ module T = Dist({ let klDivergence = (prediction: t, answer: t) => { combinePointwise( + ~combiner=XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument, ~fn=PointSetDist_Scoring.KLDivergence.integrand, prediction, answer, diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 743ad231..50cd8939 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -48,7 +48,7 @@ let combinePointwise = ( |> E.A.fmap(toDiscrete) |> E.A.O.concatSomes |> Discrete.reduce(~integralSumCachesFn, fn) - |> E.R.toExn("foo") + |> E.R.toExn("Theoretically unreachable state") let reducedContinuous = [t1, t2] diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 4b50c725..7a1f6f61 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -1,5 +1,5 @@ module KLDivergence = { - let logFn = Js.Math.log + let logFn = Js.Math.log // base e let integrand = (predictionElement: float, answerElement: float): result< float, Operation.Error.t, @@ -7,9 +7,9 @@ module KLDivergence = { if predictionElement == 0.0 { Error(Operation.NegativeInfinityError) } else if answerElement == 0.0 { - Ok(answerElement) + Ok(0.0) } else { let quot = predictionElement /. answerElement - quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(-.answerElement *. logFn(quot)) + quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(answerElement *. logFn(quot)) } } diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index c0263927..8c3e7d92 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -97,7 +97,20 @@ module T = { let equallyDividedXs = (t: t, newLength) => E.A.Floats.range(minX(t), maxX(t), newLength) let toJs = (t: t) => {"xs": t.xs, "ys": t.ys} let filterYValues = (fn, t: t): t => t |> zip |> E.A.filter(((_, y)) => fn(y)) |> fromZippedArray - + let filterOkYs = (xs: array, ys: array>): t => { + let n = E.A.length(xs) // Assume length(xs) == length(ys) + let newXs = [] + let newYs = [] + for i in 0 to n - 1 { + switch ys[i] { + | Ok(y) => + let _ = Js.Array.push(xs[i], newXs) + let _ = Js.Array.push(y, newYs) + | Error(_) => () + } + } + {xs: newXs, ys: newYs} + } module Validator = { let fnName = "XYShape validate" let notSortedError = (p: string): error => NotSorted(p) @@ -377,6 +390,64 @@ module PointwiseCombination = { } `) + // This function is used for kl divergence + let combineAlongSupportOfSecondArgument: ( + (float, float) => result, + interpolator, + T.t, + T.t, + ) => result = (fn, interpolator, t1, t2) => { + let newYs = [] + let newXs = [] + let (l1, l2) = (E.A.length(t1.xs), E.A.length(t2.xs)) + let (i, j) = (ref(0), ref(0)) + let minX = t2.xs[0] + let maxX = t2.xs[l2 - 1] + while j.contents < l2 - 1 && i.contents < l1 - 1 { + let (x, y1, y2) = { + let x1 = t1.xs[i.contents + 1] + let x2 = t2.xs[j.contents + 1] + /* if t1 has to catch up to t2 */ if ( + i.contents < l1 - 1 && j.contents < l2 && x1 < x2 && minX <= x1 && x2 <= maxX + ) { + i := i.contents + 1 + let x = x1 + let y1 = t1.ys[i.contents] + let y2 = interpolator(t2, j.contents, x) + (x, y1, y2) + } else if ( + /* if t2 has to catch up to t1 */ + i.contents < l1 && j.contents < l2 - 1 && x1 > x2 && x2 >= minX && maxX >= x1 + ) { + j := j.contents + 1 + let x = x2 + let y1 = interpolator(t1, i.contents, x) + let y2 = t2.ys[j.contents] + (x, y1, y2) + } else if ( + /* move both ahead if they are equal */ + i.contents < l1 - 1 && j.contents < l2 - 1 && x1 == x2 && x1 >= minX && maxX >= x2 + ) { + i := i.contents + 1 + j := j.contents + 1 + let x = x1 + let y1 = t1.ys[i.contents] + let y2 = t2.ys[j.contents] + (x, y1, y2) + } else { + i := i.contents + 1 + (0.0, 0.0, 0.0) // for the function I have in mind, this will error out + // exception PointwiseCombinationError + // raise(PointwiseCombinationError) + } + } + // Js.Console.log(newYs) + let _ = Js.Array.push(fn(y1, y2), newYs) + let _ = Js.Array.push(x, newXs) + } + T.filterOkYs(newXs, newYs)->Ok + } + let addCombine = (interpolator: interpolator, t1: T.t, t2: T.t): T.t => combine((a, b) => Ok(a +. b), interpolator, t1, t2)->E.R.toExn( "Add operation should never fail", @@ -490,25 +561,6 @@ module Range = { } } -let pointLogScore = (prediction, answer) => - switch answer { - | 0. => 0.0 - | answer => answer *. Js.Math.log2(Js.Math.abs_float(prediction /. answer)) - } - -let logScorePoint = (sampleCount, t1, t2) => - PointwiseCombination.combineEvenXs( - ~fn=pointLogScore, - ~xToYSelection=XtoY.linear, - sampleCount, - t1, - t2, - ) - |> Range.integrateWithTriangles - |> E.O.fmap(T.accumulateYs(\"+.")) - |> E.O.fmap(Pairs.last) - |> E.O.fmap(Pairs.y) - module Analysis = { let getVarianceDangerously = (t: 't, mean: 't => float, getMeanOfSquares: 't => float): float => { let meanSquared = mean(t) ** 2.0 From 38d1c7aa618dfcbf73ff0f0dca5b0f9df7ceb79e Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Thu, 5 May 2022 20:42:05 -0400 Subject: [PATCH 033/340] Cleanup with `option<(float, float, float)>` Value: [1e-5 to 1e-3] --- .../src/rescript/Utility/XYShape.res | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 8c3e7d92..886127c0 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -404,17 +404,18 @@ module PointwiseCombination = { let minX = t2.xs[0] let maxX = t2.xs[l2 - 1] while j.contents < l2 - 1 && i.contents < l1 - 1 { - let (x, y1, y2) = { + let someTuple = { let x1 = t1.xs[i.contents + 1] let x2 = t2.xs[j.contents + 1] - /* if t1 has to catch up to t2 */ if ( + if ( + /* if t1 has to catch up to t2 */ i.contents < l1 - 1 && j.contents < l2 && x1 < x2 && minX <= x1 && x2 <= maxX ) { i := i.contents + 1 let x = x1 let y1 = t1.ys[i.contents] let y2 = interpolator(t2, j.contents, x) - (x, y1, y2) + Some((x, y1, y2)) } else if ( /* if t2 has to catch up to t1 */ i.contents < l1 && j.contents < l2 - 1 && x1 > x2 && x2 >= minX && maxX >= x1 @@ -423,7 +424,7 @@ module PointwiseCombination = { let x = x2 let y1 = interpolator(t1, i.contents, x) let y2 = t2.ys[j.contents] - (x, y1, y2) + Some((x, y1, y2)) } else if ( /* move both ahead if they are equal */ i.contents < l1 - 1 && j.contents < l2 - 1 && x1 == x2 && x1 >= minX && maxX >= x2 @@ -433,17 +434,23 @@ module PointwiseCombination = { let x = x1 let y1 = t1.ys[i.contents] let y2 = t2.ys[j.contents] - (x, y1, y2) + Some((x, y1, y2)) } else { i := i.contents + 1 - (0.0, 0.0, 0.0) // for the function I have in mind, this will error out + None + // (0.0, 0.0, 0.0) // for the function I have in mind, this will error out // exception PointwiseCombinationError // raise(PointwiseCombinationError) } } + switch someTuple { + | Some((x, y1, y2)) => { + let _ = Js.Array.push(fn(y1, y2), newYs) + let _ = Js.Array.push(x, newXs) + } + | None => () + } // Js.Console.log(newYs) - let _ = Js.Array.push(fn(y1, y2), newYs) - let _ = Js.Array.push(x, newXs) } T.filterOkYs(newXs, newYs)->Ok } From 87d6f8d4f64a5adfe9bf2dff165ac4b5ba0b236e Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Fri, 6 May 2022 09:49:42 -0400 Subject: [PATCH 034/340] fix: change integrand check order in KL divergence code --- .../Distributions/PointSetDist/PointSetDist_Scoring.res | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 7a1f6f61..5a63d6d9 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -4,10 +4,10 @@ module KLDivergence = { float, Operation.Error.t, > => - if predictionElement == 0.0 { - Error(Operation.NegativeInfinityError) - } else if answerElement == 0.0 { + if answerElement == 0.0 { Ok(0.0) + } else if predictionElement == 0.0 { + Error(Operation.NegativeInfinityError) } else { let quot = predictionElement /. answerElement quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(answerElement *. logFn(quot)) From b393af876209e3807f183ac82e8644a49564d076 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Fri, 6 May 2022 10:04:41 -0400 Subject: [PATCH 035/340] tweak: start building new function from scratch --- .../src/rescript/Utility/XYShape.res | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 886127c0..2f6206a4 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -455,6 +455,27 @@ module PointwiseCombination = { T.filterOkYs(newXs, newYs)->Ok } + let iterpolator2: (xyShape, float) => option = (dist: xyShape, x: float) => { + let l = E.A.length(dist.xs) + let firstPoint = dist.xs[0] + let lastPoint = dist.xs[l - 1] + switch (firstPoint < x, lastPoint > x) { + | (false, false) => Some(0.0) + | (false, true) => Some(0.0) + | (true, false) => Some(0.0) + | (true, true) => None + } + } + + let combineAlongSupportOfSecondArgument2: ( + (float, float) => result, + interpolator, + T.t, + T.t, + ) => result = (fn, interpolator, t1, t2) => { + T.filterOkYs([], [])->Ok + } + let addCombine = (interpolator: interpolator, t1: T.t, t2: T.t): T.t => combine((a, b) => Ok(a +. b), interpolator, t1, t2)->E.R.toExn( "Add operation should never fail", From da6fb8fe8d35e4094c27cc8bd51a78fcefc965d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 May 2022 14:36:36 +0000 Subject: [PATCH 036/340] :arrow_up: Bump @docusaurus/core from 2.0.0-beta.19 to 2.0.0-beta.20 Bumps [@docusaurus/core](https://github.com/facebook/docusaurus/tree/HEAD/packages/docusaurus) from 2.0.0-beta.19 to 2.0.0-beta.20. - [Release notes](https://github.com/facebook/docusaurus/releases) - [Changelog](https://github.com/facebook/docusaurus/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/docusaurus/commits/v2.0.0-beta.20/packages/docusaurus) --- updated-dependencies: - dependency-name: "@docusaurus/core" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/website/package.json | 2 +- yarn.lock | 155 ++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 1 deletion(-) diff --git a/packages/website/package.json b/packages/website/package.json index 0a545009..9132445c 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -12,7 +12,7 @@ "format": "prettier --write ." }, "dependencies": { - "@docusaurus/core": "2.0.0-beta.19", + "@docusaurus/core": "2.0.0-beta.20", "@docusaurus/preset-classic": "2.0.0-beta.19", "@quri/squiggle-components": "0.2.9", "clsx": "^1.1.1", diff --git a/yarn.lock b/yarn.lock index 3d59a5ae..6175f5e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1541,6 +1541,83 @@ webpack-merge "^5.8.0" webpackbar "^5.0.2" +"@docusaurus/core@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.20.tgz#cf4aeeccecacb547a6fb42340c83bed0cccb57c0" + integrity sha512-a3UgZ4lIcIOoZd4j9INqVkWSXEDxR7EicJXt8eq2whg4N5hKGqLHoDSnWfrVSPQn4NoG5T7jhPypphSoysImfQ== + dependencies: + "@babel/core" "^7.17.10" + "@babel/generator" "^7.17.10" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-transform-runtime" "^7.17.10" + "@babel/preset-env" "^7.17.10" + "@babel/preset-react" "^7.16.7" + "@babel/preset-typescript" "^7.16.7" + "@babel/runtime" "^7.17.9" + "@babel/runtime-corejs3" "^7.17.9" + "@babel/traverse" "^7.17.10" + "@docusaurus/cssnano-preset" "2.0.0-beta.20" + "@docusaurus/logger" "2.0.0-beta.20" + "@docusaurus/mdx-loader" "2.0.0-beta.20" + "@docusaurus/react-loadable" "5.5.2" + "@docusaurus/utils" "2.0.0-beta.20" + "@docusaurus/utils-common" "2.0.0-beta.20" + "@docusaurus/utils-validation" "2.0.0-beta.20" + "@slorber/static-site-generator-webpack-plugin" "^4.0.4" + "@svgr/webpack" "^6.2.1" + autoprefixer "^10.4.5" + babel-loader "^8.2.5" + babel-plugin-dynamic-import-node "2.3.0" + boxen "^6.2.1" + chokidar "^3.5.3" + clean-css "^5.3.0" + cli-table3 "^0.6.2" + combine-promises "^1.1.0" + commander "^5.1.0" + copy-webpack-plugin "^10.2.4" + core-js "^3.22.3" + css-loader "^6.7.1" + css-minimizer-webpack-plugin "^3.4.1" + cssnano "^5.1.7" + del "^6.0.0" + detect-port "^1.3.0" + escape-html "^1.0.3" + eta "^1.12.3" + file-loader "^6.2.0" + fs-extra "^10.1.0" + html-minifier-terser "^6.1.0" + html-tags "^3.2.0" + html-webpack-plugin "^5.5.0" + import-fresh "^3.3.0" + leven "^3.1.0" + lodash "^4.17.21" + mini-css-extract-plugin "^2.6.0" + postcss "^8.4.13" + postcss-loader "^6.2.1" + prompts "^2.4.2" + react-dev-utils "^12.0.1" + react-helmet-async "^1.3.0" + react-loadable "npm:@docusaurus/react-loadable@5.5.2" + react-loadable-ssr-addon-v5-slorber "^1.0.1" + react-router "^5.2.0" + react-router-config "^5.1.1" + react-router-dom "^5.2.0" + remark-admonitions "^1.2.1" + rtl-detect "^1.0.4" + semver "^7.3.7" + serve-handler "^6.1.3" + shelljs "^0.8.5" + terser-webpack-plugin "^5.3.1" + tslib "^2.4.0" + update-notifier "^5.1.0" + url-loader "^4.1.1" + wait-on "^6.0.1" + webpack "^5.72.0" + webpack-bundle-analyzer "^4.5.0" + webpack-dev-server "^4.8.1" + webpack-merge "^5.8.0" + webpackbar "^5.0.2" + "@docusaurus/cssnano-preset@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.19.tgz#d15221c1befe4c7ca2415ca7d4073d38a64d6507" @@ -1550,6 +1627,15 @@ postcss "^8.4.13" postcss-sort-media-queries "^4.2.1" +"@docusaurus/cssnano-preset@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.20.tgz#c47722e347fd044f2372e924199eabf61733232f" + integrity sha512-7pfrYuahHl3YYS+gYhbb1YHsq5s5+hk+1KIU7QqNNn4YjrIqAHlOznCQ9XfQfspe9boZmaNFGMZQ1tawNOVLqQ== + dependencies: + cssnano-preset-advanced "^5.3.3" + postcss "^8.4.13" + postcss-sort-media-queries "^4.2.1" + "@docusaurus/logger@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.19.tgz#fa4f5e73568ba5ec86ff32ae217403258548af00" @@ -1558,6 +1644,14 @@ chalk "^4.1.2" tslib "^2.4.0" +"@docusaurus/logger@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.20.tgz#bb49e8516e48082ab96bca11569a18541476d5a6" + integrity sha512-7Rt7c8m3ZM81o5jsm6ENgdbjq/hUICv8Om2i7grynI4GT2aQyFoHcusaNbRji4FZt0DaKT2CQxiAWP8BbD4xzQ== + dependencies: + chalk "^4.1.2" + tslib "^2.4.0" + "@docusaurus/mdx-loader@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.19.tgz#f40a5926d02d18e280e517d12d75a43a347ccc25" @@ -1580,6 +1674,28 @@ url-loader "^4.1.1" webpack "^5.72.0" +"@docusaurus/mdx-loader@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.20.tgz#7016e8ce7e4a11c9ea458e2236d3c93af71f393f" + integrity sha512-BBuf77sji3JxbCEW7Qsv3CXlgpm+iSLTQn6JUK7x8vJ1JYZ3KJbNgpo9TmxIIltpcvNQ/QOy6dvqrpSStaWmKQ== + dependencies: + "@babel/parser" "^7.17.10" + "@babel/traverse" "^7.17.10" + "@docusaurus/logger" "2.0.0-beta.20" + "@docusaurus/utils" "2.0.0-beta.20" + "@mdx-js/mdx" "^1.6.22" + escape-html "^1.0.3" + file-loader "^6.2.0" + fs-extra "^10.1.0" + image-size "^1.0.1" + mdast-util-to-string "^2.0.0" + remark-emoji "^2.2.0" + stringify-object "^3.3.0" + tslib "^2.4.0" + unist-util-visit "^2.0.3" + url-loader "^4.1.1" + webpack "^5.72.0" + "@docusaurus/module-type-aliases@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.0.0-beta.19.tgz#60c2eea0c3cac58e83ced6f696ff4e395de8d627" @@ -1805,6 +1921,13 @@ dependencies: tslib "^2.4.0" +"@docusaurus/utils-common@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.20.tgz#adb914c331d711a3c0ef2ba3f64139acdf4cd781" + integrity sha512-HabHh23vOQn6ygs0PjuCSF/oZaNsYTFsxB2R6EwHNyw01nWgBC3QAcGVmyIWQhlb9p8V3byKgbzVS68hZX5t9A== + dependencies: + tslib "^2.4.0" + "@docusaurus/utils-validation@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.19.tgz#53e56e66a1446e25b2b86aa015312cb647c6d7a1" @@ -1816,6 +1939,17 @@ js-yaml "^4.1.0" tslib "^2.4.0" +"@docusaurus/utils-validation@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.20.tgz#ebf475a4388066bd450877fe920f405c53ff5ad2" + integrity sha512-7MxMoaF4VNAt5vUwvITa6nbkw1tb4WE6hp1VlfIoLCY4D7Wk5cMf1ZFhppCP1UzmPwvFb9zw8fPuvDfB3Tb5nQ== + dependencies: + "@docusaurus/logger" "2.0.0-beta.20" + "@docusaurus/utils" "2.0.0-beta.20" + joi "^17.6.0" + js-yaml "^4.1.0" + tslib "^2.4.0" + "@docusaurus/utils@2.0.0-beta.19": version "2.0.0-beta.19" resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.19.tgz#c3fb547f9ec708b8eed370e4d009bac213a37ce8" @@ -1837,6 +1971,27 @@ url-loader "^4.1.1" webpack "^5.72.0" +"@docusaurus/utils@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.20.tgz#d5a9816a328b2ca5e4e1a3fbf267e3674abacd48" + integrity sha512-eUQquakhrbnvhsmx8jRPLgoyjyzMuOhmQC99m7rotar7XOzROpgEpm7+xVaquG5Ha47WkybE3djHJhKNih7GZQ== + dependencies: + "@docusaurus/logger" "2.0.0-beta.20" + "@svgr/webpack" "^6.2.1" + file-loader "^6.2.0" + fs-extra "^10.1.0" + github-slugger "^1.4.0" + globby "^11.1.0" + gray-matter "^4.0.3" + js-yaml "^4.1.0" + lodash "^4.17.21" + micromatch "^4.0.5" + resolve-pathname "^3.0.0" + shelljs "^0.8.5" + tslib "^2.4.0" + url-loader "^4.1.1" + webpack "^5.72.0" + "@emotion/cache@^10.0.27": version "10.0.29" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0" From 875d6cbb2c75b396995adcbadb9cec5924f18790 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 May 2022 14:37:03 +0000 Subject: [PATCH 037/340] :arrow_up: Bump react-vega from 7.5.0 to 7.5.1 Bumps [react-vega](https://github.com/vega/react-vega) from 7.5.0 to 7.5.1. - [Release notes](https://github.com/vega/react-vega/releases) - [Changelog](https://github.com/vega/react-vega/blob/master/CHANGELOG.md) - [Commits](https://github.com/vega/react-vega/compare/v7.5.0...v7.5.1) --- updated-dependencies: - dependency-name: react-vega dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 06724c87..91b78c1d 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -10,7 +10,7 @@ "react-ace": "^10.1.0", "react-dom": "^18.1.0", "react-use": "^17.3.2", - "react-vega": "^7.5.0", + "react-vega": "^7.5.1", "styled-components": "^5.3.5", "vega": "^5.22.1", "vega-embed": "^6.20.6", diff --git a/yarn.lock b/yarn.lock index 3d59a5ae..cabd0aaf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4215,7 +4215,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^16.9.19", "@types/react@^18.0.1", "@types/react@^18.0.3": +"@types/react@*", "@types/react@^18.0.1", "@types/react@^18.0.3": version "18.0.8" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.8.tgz#a051eb380a9fbcaa404550543c58e1cf5ce4ab87" integrity sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw== @@ -14889,13 +14889,14 @@ react-use@^17.3.2: ts-easing "^0.2.0" tslib "^2.1.0" -react-vega@^7.5.0: - version "7.5.0" - resolved "https://registry.yarnpkg.com/react-vega/-/react-vega-7.5.0.tgz#b9726d4fd7f35299d417d340935e093bf4bed558" - integrity sha512-JysyZ0PdihfSztkbxOd7DcYBrCVotRbkKiGNYWKkLP1D4Mt2Dq0uMwNtBEBGjoWdmrE3Qwd+uz7ekklP6MqxDw== +react-vega@^7.5.1: + version "7.5.1" + resolved "https://registry.yarnpkg.com/react-vega/-/react-vega-7.5.1.tgz#574ada8b53aa8bdae61a286c1e0fb5a8efdbd064" + integrity sha512-pbcSrLsqmUP2+1v+/im99GdGompT0jJwJo9Cjq3QQ9URUYMuEEvfTCergEtfVRcBjC6bPTN6sLbe+8yQSqB4jg== dependencies: - "@types/react" "^16.9.19" + "@types/react" "*" fast-deep-equal "^3.1.1" + prop-types "^15.8.1" vega-embed "^6.5.1" react@^18.0.0, react@^18.1.0: From cc3db79a2aff7b7ccbe3795fe4262bcaf56f3fd8 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Fri, 6 May 2022 10:49:04 -0400 Subject: [PATCH 038/340] feat: kl function but no dealing with errors yet --- .../src/rescript/Utility/Operation.res | 2 + .../src/rescript/Utility/XYShape.res | 59 +++++++++++++++---- 2 files changed, 49 insertions(+), 12 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Utility/Operation.res b/packages/squiggle-lang/src/rescript/Utility/Operation.res index 3a5f667c..b9c1e088 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Operation.res +++ b/packages/squiggle-lang/src/rescript/Utility/Operation.res @@ -55,6 +55,7 @@ type operationError = | ComplexNumberError | InfinityError | NegativeInfinityError + | LogicallyInconsistentPathwayError @genType module Error = { @@ -67,6 +68,7 @@ module Error = { | ComplexNumberError => "Operation returned complex result" | InfinityError => "Operation returned positive infinity" | NegativeInfinityError => "Operation returned negative infinity" + | LogicallyInconsistentPathwayError => "This pathway should have been logically unreachable" } } diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 2f6206a4..a0335f53 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -455,25 +455,60 @@ module PointwiseCombination = { T.filterOkYs(newXs, newYs)->Ok } - let iterpolator2: (xyShape, float) => option = (dist: xyShape, x: float) => { - let l = E.A.length(dist.xs) - let firstPoint = dist.xs[0] - let lastPoint = dist.xs[l - 1] - switch (firstPoint < x, lastPoint > x) { - | (false, false) => Some(0.0) - | (false, true) => Some(0.0) - | (true, false) => Some(0.0) - | (true, true) => None + let getApproximatePdfOfContinuousDistributionAtPoint: (xyShape, float) => option = ( + dist: xyShape, + point: float, + ) => { + let closestFromBelowIndex = E.A.reducei(dist.xs, None, (accumulator, item, index) => + item < point ? Some(index) : accumulator + ) // This could be made more efficient by taking advantage of the fact that these are ordered + let closestFromAboveIndexOption = Belt.Array.getIndexBy(dist.xs, item => item > point) + + let weightedMean = ( + point: float, + closestFromBelow: float, + closestFromAbove: float, + valueclosestFromBelow, + valueclosestFromAbove, + ): float => { + let distance = closestFromAbove -. closestFromBelow + let w1 = (point -. closestFromBelow) /. distance + let w2 = (closestFromAbove -. point) /. distance + let result = w1 *. valueclosestFromAbove +. w2 *. valueclosestFromBelow + result } + + let result = switch (closestFromBelowIndex, closestFromAboveIndexOption) { + | (None, None) => None // all are smaller, and all are larger + | (None, Some(i)) => Some(0.0) // none are smaller, all are larger + | (Some(i), None) => Some(0.0) // all are smaller, none are larger + | (Some(i), Some(j)) => + Some(weightedMean(point, dist.xs[i], dist.xs[j], dist.ys[i], dist.ys[j])) // there is a lowerBound and an upperBound. + } + + result } let combineAlongSupportOfSecondArgument2: ( (float, float) => result, - interpolator, T.t, T.t, - ) => result = (fn, interpolator, t1, t2) => { - T.filterOkYs([], [])->Ok + ) => result = (fn, prediction, answer) => { + let newXs = answer.xs + let combineWithFn = (x: float, i: int) => { + let answerX = x + let answerY = answer.ys[i] + let predictionY = getApproximatePdfOfContinuousDistributionAtPoint(prediction, answerX) + let wrappedResult = E.O.fmap(x => fn(x, answerY), predictionY) + let result = switch wrappedResult { + | Some(x) => x + | None => Error(Operation.LogicallyInconsistentPathwayError) + } + result + } + let newYs = Js.Array.mapi((x, i) => combineWithFn(x, i), answer.xs) + + T.filterOkYs(newXs, newYs)->Ok } let addCombine = (interpolator: interpolator, t1: T.t, t2: T.t): T.t => From 5dd272fb0c8cc751d333c38d7a50842004e6a1ec Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Fri, 6 May 2022 11:45:11 -0400 Subject: [PATCH 039/340] tweak: Add tests for combineAlongSupportOfSecondArgument --- .../Distributions/KlDivergence_test.res | 46 +++++++++++++++++-- .../PointSetDist/PointSetDist_Scoring.res | 2 +- .../src/rescript/Utility/XYShape.res | 18 +++++--- 3 files changed, 54 insertions(+), 12 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index 659f4b69..b749eb11 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -6,10 +6,10 @@ describe("kl divergence", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) exception KlFailed test("of two uniforms is equal to the analytic expression", () => { - let lowAnswer = 2.3526e0 - let highAnswer = 8.5382e0 - let lowPrediction = 2.3526e0 - let highPrediction = 1.2345e1 + let lowAnswer = 0.0 + let highAnswer = 1.0 + let lowPrediction = 0.0 + let highPrediction = 2.0 let answer = uniformMakeR(lowAnswer, highAnswer)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) let prediction = @@ -19,6 +19,8 @@ describe("kl divergence", () => { // integral along the support of the answer of answer.pdf(x) times log of prediction.pdf(x) divided by answer.pdf(x) dx let analyticalKl = Js.Math.log((highPrediction -. lowPrediction) /. (highAnswer -. lowAnswer)) let kl = E.R.liftJoin2(klDivergence, prediction, answer) + Js.Console.log2("Analytical: ", analyticalKl) + Js.Console.log2("Computed: ", kl) switch kl { | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) | Error(err) => { @@ -32,7 +34,7 @@ describe("kl divergence", () => { let mean1 = 4.0 let mean2 = 1.0 let stdev1 = 1.0 - let stdev2 = 1.0 + let stdev2 = 4.0 let prediction = normalMakeR(mean1, stdev1)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) @@ -42,6 +44,10 @@ describe("kl divergence", () => { stdev1 ** 2.0 /. 2.0 /. stdev2 ** 2.0 +. (mean1 -. mean2) ** 2.0 /. 2.0 /. stdev2 ** 2.0 -. 0.5 let kl = E.R.liftJoin2(klDivergence, prediction, answer) + + Js.Console.log2("Analytical: ", analyticalKl) + Js.Console.log2("Computed: ", kl) + switch kl { | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) | Error(err) => { @@ -51,3 +57,33 @@ describe("kl divergence", () => { } }) }) + +describe("combine along support test", () => { + let combineAlongSupportOfSecondArgument = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument + let lowAnswer = 0.0 + let highAnswer = 1.0 + let lowPrediction = -1.0 + let highPrediction = 2.0 + + let answer = + uniformMakeR(lowAnswer, highAnswer)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) + let prediction = + uniformMakeR(lowPrediction, highPrediction)->E.R2.errMap(s => DistributionTypes.ArgumentError( + s, + )) + let answerWrapped = E.R.fmap(a => run(FromDist(ToDist(ToPointSet), a)), answer) + let predictionWrapped = E.R.fmap(a => run(FromDist(ToDist(ToPointSet), a)), prediction) + + let interpolator = XYShape.XtoY.continuousInterpolator(#Stepwise, #UseZero) + let integrand = PointSetDist_Scoring.KLDivergence.integrand + + let result = switch (answerWrapped, predictionWrapped) { + | (Ok(Dist(PointSet(Continuous(a)))), Ok(Dist(PointSet(Continuous(b))))) => + Some(combineAlongSupportOfSecondArgument(integrand, interpolator, a.xyShape, b.xyShape)) + | _ => None + } + test("combine along support test", _ => { + Js.Console.log2("combineAlongSupportOfSecondArgument", result) + false->expect->toBe(true) + }) +}) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 5a63d6d9..70096d2a 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -10,6 +10,6 @@ module KLDivergence = { Error(Operation.NegativeInfinityError) } else { let quot = predictionElement /. answerElement - quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(answerElement *. logFn(quot)) + quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(-.answerElement *. logFn(quot)) } } diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index a0335f53..4af1082e 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -391,7 +391,7 @@ module PointwiseCombination = { `) // This function is used for kl divergence - let combineAlongSupportOfSecondArgument: ( + let combineAlongSupportOfSecondArgument0: ( (float, float) => result, interpolator, T.t, @@ -489,12 +489,12 @@ module PointwiseCombination = { result } - let combineAlongSupportOfSecondArgument2: ( + let combineAlongSupportOfSecondArgument: ( (float, float) => result, + interpolator, T.t, T.t, - ) => result = (fn, prediction, answer) => { - let newXs = answer.xs + ) => result = (fn, interpolator, prediction, answer) => { let combineWithFn = (x: float, i: int) => { let answerX = x let answerY = answer.ys[i] @@ -506,9 +506,15 @@ module PointwiseCombination = { } result } - let newYs = Js.Array.mapi((x, i) => combineWithFn(x, i), answer.xs) + let newYsWithError = Js.Array.mapi((x, i) => combineWithFn(x, i), answer.xs) + let newYsOrError = E.A.R.firstErrorOrOpen(newYsWithError) + let result = switch newYsOrError { + | Ok(a) => Ok({xs: answer.xs, ys: a}) + | Error(b) => Error(b) + } - T.filterOkYs(newXs, newYs)->Ok + // T.filterOkYs(newXs, newYs)->Ok + result } let addCombine = (interpolator: interpolator, t1: T.t, t2: T.t): T.t => From d9a40c973ae836ffc0347a5c57f644692a3ef0dc Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Fri, 6 May 2022 12:26:51 -0400 Subject: [PATCH 040/340] feat: Get KL divergence working except in case of numerical errors () - Quinn was of great help here. - I also left some dead code, which still has to be cleaned up - There are still very annoying numerical errors, so I left one test failing. These are due to how the interpolation is done - Quinn to pick up from here Value: [0.6 to 2] --- .../Distributions/KlDivergence_test.res | 85 +++++++++++++------ packages/squiggle-lang/package.json | 1 + .../Distributions/PointSetDist/Continuous.res | 25 +++++- .../src/rescript/Utility/XYShape.res | 7 +- 4 files changed, 86 insertions(+), 32 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index b749eb11..be884727 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -8,7 +8,7 @@ describe("kl divergence", () => { test("of two uniforms is equal to the analytic expression", () => { let lowAnswer = 0.0 let highAnswer = 1.0 - let lowPrediction = 0.0 + let lowPrediction = -1.0 let highPrediction = 2.0 let answer = uniformMakeR(lowAnswer, highAnswer)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) @@ -29,20 +29,50 @@ describe("kl divergence", () => { } } }) + test( + "of two uniforms is equal to the analytic expression, part 2 (annoying numerical errors)", + () => { + Js.Console.log( + "This will fait because of extremely annoying numerical errors. Will not fail if the two uniforms are a bit different. Very annoying", + ) + let lowAnswer = 0.0 + let highAnswer = 1.0 + let lowPrediction = 0.0 + let highPrediction = 2.0 + let answer = + uniformMakeR(lowAnswer, highAnswer)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) + let prediction = + uniformMakeR( + lowPrediction, + highPrediction, + )->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) + // integral along the support of the answer of answer.pdf(x) times log of prediction.pdf(x) divided by answer.pdf(x) dx + let analyticalKl = Js.Math.log((highPrediction -. lowPrediction) /. (highAnswer -. lowAnswer)) + let kl = E.R.liftJoin2(klDivergence, prediction, answer) + Js.Console.log2("Analytical: ", analyticalKl) + Js.Console.log2("Computed: ", kl) + switch kl { + | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) + | Error(err) => { + Js.Console.log(DistributionTypes.Error.toString(err)) + raise(KlFailed) + } + } + }, + ) test("of two normals is equal to the formula", () => { // This test case comes via Nuño https://github.com/quantified-uncertainty/squiggle/issues/433 let mean1 = 4.0 let mean2 = 1.0 - let stdev1 = 1.0 - let stdev2 = 4.0 + let stdev1 = 4.0 + let stdev2 = 1.0 let prediction = normalMakeR(mean1, stdev1)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) let answer = normalMakeR(mean2, stdev2)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) let analyticalKl = - Js.Math.log(stdev2 /. stdev1) +. - stdev1 ** 2.0 /. 2.0 /. stdev2 ** 2.0 +. - (mean1 -. mean2) ** 2.0 /. 2.0 /. stdev2 ** 2.0 -. 0.5 + Js.Math.log(stdev1 /. stdev2) +. + (stdev2 ** 2.0 +. (mean2 -. mean1) ** 2.0) /. (2.0 *. stdev1 ** 2.0) -. 0.5 let kl = E.R.liftJoin2(klDivergence, prediction, answer) Js.Console.log2("Analytical: ", analyticalKl) @@ -59,30 +89,31 @@ describe("kl divergence", () => { }) describe("combine along support test", () => { - let combineAlongSupportOfSecondArgument = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument - let lowAnswer = 0.0 - let highAnswer = 1.0 - let lowPrediction = -1.0 - let highPrediction = 2.0 + Skip.test("combine along support test", _ => { + // doesn't matter + let combineAlongSupportOfSecondArgument = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument + let lowAnswer = 0.0 + let highAnswer = 1.0 + let lowPrediction = 0.0 + let highPrediction = 2.0 - let answer = - uniformMakeR(lowAnswer, highAnswer)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) - let prediction = - uniformMakeR(lowPrediction, highPrediction)->E.R2.errMap(s => DistributionTypes.ArgumentError( - s, - )) - let answerWrapped = E.R.fmap(a => run(FromDist(ToDist(ToPointSet), a)), answer) - let predictionWrapped = E.R.fmap(a => run(FromDist(ToDist(ToPointSet), a)), prediction) + let answer = + uniformMakeR(lowAnswer, highAnswer)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) + let prediction = + uniformMakeR(lowPrediction, highPrediction)->E.R2.errMap(s => DistributionTypes.ArgumentError( + s, + )) + let answerWrapped = E.R.fmap(a => run(FromDist(ToDist(ToPointSet), a)), answer) + let predictionWrapped = E.R.fmap(a => run(FromDist(ToDist(ToPointSet), a)), prediction) - let interpolator = XYShape.XtoY.continuousInterpolator(#Stepwise, #UseZero) - let integrand = PointSetDist_Scoring.KLDivergence.integrand + let interpolator = XYShape.XtoY.continuousInterpolator(#Stepwise, #UseZero) + let integrand = PointSetDist_Scoring.KLDivergence.integrand - let result = switch (answerWrapped, predictionWrapped) { - | (Ok(Dist(PointSet(Continuous(a)))), Ok(Dist(PointSet(Continuous(b))))) => - Some(combineAlongSupportOfSecondArgument(integrand, interpolator, a.xyShape, b.xyShape)) - | _ => None - } - test("combine along support test", _ => { + let result = switch (answerWrapped, predictionWrapped) { + | (Ok(Dist(PointSet(Continuous(a)))), Ok(Dist(PointSet(Continuous(b))))) => + Some(combineAlongSupportOfSecondArgument(integrand, interpolator, a.xyShape, b.xyShape)) + | _ => None + } Js.Console.log2("combineAlongSupportOfSecondArgument", result) false->expect->toBe(true) }) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 97b710b6..8f3c04a8 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -15,6 +15,7 @@ "test": "jest", "test:ts": "jest __tests__/TS/", "test:rescript": "jest --modulePathIgnorePatterns=__tests__/TS/*", + "test:kldivergence": "jest __tests__/Distributions/KlDivergence_test.*", "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": "yarn clean; yarn build; nyc --reporter=lcov yarn test:ts", diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index b5eb0330..09b8d6b1 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -271,7 +271,7 @@ module T = Dist({ let variance = (t: t): float => XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) - let klDivergence = (prediction: t, answer: t) => { + let klDivergence0 = (prediction: t, answer: t) => { combinePointwise( ~combiner=XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument, PointSetDist_Scoring.KLDivergence.integrand, @@ -281,6 +281,29 @@ module T = Dist({ |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) |> E.R.fmap(integralEndY) } + + let klDivergence = (prediction: t, answer: t) => { + let newShape = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument2( + PointSetDist_Scoring.KLDivergence.integrand, + prediction.xyShape, + answer.xyShape, + ) + let generateContinuousDistFromXYShape: XYShape.xyShape => t = xyShape => { + xyShape: xyShape, + interpolation: #Linear, + integralSumCache: None, + integralCache: None, + } + let _ = Js.Console.log2("prediction", prediction) + let _ = Js.Console.log2("answer", answer) + let _ = Js.Console.log2("newShape", newShape) + switch newShape { + | Ok(tshape) => Ok(integralEndY(generateContinuousDistFromXYShape(tshape))) + | Error(errormessage) => Error(errormessage) + } + //|> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) + //|> E.R.fmap(integralEndY) + } }) let isNormalized = (t: t): bool => { diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 4af1082e..84853c40 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -391,7 +391,7 @@ module PointwiseCombination = { `) // This function is used for kl divergence - let combineAlongSupportOfSecondArgument0: ( + let combineAlongSupportOfSecondArgument: ( (float, float) => result, interpolator, T.t, @@ -489,12 +489,11 @@ module PointwiseCombination = { result } - let combineAlongSupportOfSecondArgument: ( + let combineAlongSupportOfSecondArgument2: ( (float, float) => result, - interpolator, T.t, T.t, - ) => result = (fn, interpolator, prediction, answer) => { + ) => result = (fn, prediction, answer) => { let combineWithFn = (x: float, i: int) => { let answerX = x let answerY = answer.ys[i] From e89f6dcab4714b66594d066d4a30d487c43aeab8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 May 2022 16:35:11 +0000 Subject: [PATCH 041/340] :arrow_up: Bump @docusaurus/preset-classic Bumps [@docusaurus/preset-classic](https://github.com/facebook/docusaurus/tree/HEAD/packages/docusaurus-preset-classic) from 2.0.0-beta.19 to 2.0.0-beta.20. - [Release notes](https://github.com/facebook/docusaurus/releases) - [Changelog](https://github.com/facebook/docusaurus/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/docusaurus/commits/v2.0.0-beta.20/packages/docusaurus-preset-classic) --- updated-dependencies: - dependency-name: "@docusaurus/preset-classic" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/website/package.json | 2 +- yarn.lock | 381 ++++++++++------------------------ 2 files changed, 114 insertions(+), 269 deletions(-) diff --git a/packages/website/package.json b/packages/website/package.json index 9132445c..9cbc361e 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@docusaurus/core": "2.0.0-beta.20", - "@docusaurus/preset-classic": "2.0.0-beta.19", + "@docusaurus/preset-classic": "2.0.0-beta.20", "@quri/squiggle-components": "0.2.9", "clsx": "^1.1.1", "prism-react-renderer": "^1.2.1", diff --git a/yarn.lock b/yarn.lock index 3e4308e6..2a70176e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1464,83 +1464,6 @@ "@docsearch/css" "3.0.0" algoliasearch "^4.0.0" -"@docusaurus/core@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.19.tgz#b3e0008affea95b84ab4fbec16cfea77a10d452a" - integrity sha512-pHjnghPiLCogFF5FCMZrJJBGbT4wW2GEtUdRemMqWt0zru/0iQPwUQOKc2yhZTwCBCGaA5EqY/+I08W9FQIUJg== - dependencies: - "@babel/core" "^7.17.10" - "@babel/generator" "^7.17.10" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-transform-runtime" "^7.17.10" - "@babel/preset-env" "^7.17.10" - "@babel/preset-react" "^7.16.7" - "@babel/preset-typescript" "^7.16.7" - "@babel/runtime" "^7.17.9" - "@babel/runtime-corejs3" "^7.17.9" - "@babel/traverse" "^7.17.10" - "@docusaurus/cssnano-preset" "2.0.0-beta.19" - "@docusaurus/logger" "2.0.0-beta.19" - "@docusaurus/mdx-loader" "2.0.0-beta.19" - "@docusaurus/react-loadable" "5.5.2" - "@docusaurus/utils" "2.0.0-beta.19" - "@docusaurus/utils-common" "2.0.0-beta.19" - "@docusaurus/utils-validation" "2.0.0-beta.19" - "@slorber/static-site-generator-webpack-plugin" "^4.0.4" - "@svgr/webpack" "^6.2.1" - autoprefixer "^10.4.5" - babel-loader "^8.2.5" - babel-plugin-dynamic-import-node "2.3.0" - boxen "^6.2.1" - chokidar "^3.5.3" - clean-css "^5.3.0" - cli-table3 "^0.6.2" - combine-promises "^1.1.0" - commander "^5.1.0" - copy-webpack-plugin "^10.2.4" - core-js "^3.22.3" - css-loader "^6.7.1" - css-minimizer-webpack-plugin "^3.4.1" - cssnano "^5.1.7" - del "^6.0.0" - detect-port "^1.3.0" - escape-html "^1.0.3" - eta "^1.12.3" - file-loader "^6.2.0" - fs-extra "^10.1.0" - html-minifier-terser "^6.1.0" - html-tags "^3.2.0" - html-webpack-plugin "^5.5.0" - import-fresh "^3.3.0" - leven "^3.1.0" - lodash "^4.17.21" - mini-css-extract-plugin "^2.6.0" - postcss "^8.4.13" - postcss-loader "^6.2.1" - prompts "^2.4.2" - react-dev-utils "^12.0.1" - react-helmet-async "^1.3.0" - react-loadable "npm:@docusaurus/react-loadable@5.5.2" - react-loadable-ssr-addon-v5-slorber "^1.0.1" - react-router "^5.2.0" - react-router-config "^5.1.1" - react-router-dom "^5.2.0" - remark-admonitions "^1.2.1" - rtl-detect "^1.0.4" - semver "^7.3.7" - serve-handler "^6.1.3" - shelljs "^0.8.5" - terser-webpack-plugin "^5.3.1" - tslib "^2.4.0" - update-notifier "^5.1.0" - url-loader "^4.1.1" - wait-on "^6.0.1" - webpack "^5.72.0" - webpack-bundle-analyzer "^4.5.0" - webpack-dev-server "^4.8.1" - webpack-merge "^5.8.0" - webpackbar "^5.0.2" - "@docusaurus/core@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.20.tgz#cf4aeeccecacb547a6fb42340c83bed0cccb57c0" @@ -1618,15 +1541,6 @@ webpack-merge "^5.8.0" webpackbar "^5.0.2" -"@docusaurus/cssnano-preset@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.19.tgz#d15221c1befe4c7ca2415ca7d4073d38a64d6507" - integrity sha512-1Wn4qWgy3m0+kxh/JEqjJfHrqWC37kLwkplE51AfXLxz8xyVJ0H0MvhOkLjSkEABTSWFl4DDaW2uf+qpgtZWaw== - dependencies: - cssnano-preset-advanced "^5.3.3" - postcss "^8.4.13" - postcss-sort-media-queries "^4.2.1" - "@docusaurus/cssnano-preset@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.20.tgz#c47722e347fd044f2372e924199eabf61733232f" @@ -1636,14 +1550,6 @@ postcss "^8.4.13" postcss-sort-media-queries "^4.2.1" -"@docusaurus/logger@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.19.tgz#fa4f5e73568ba5ec86ff32ae217403258548af00" - integrity sha512-ILfiSRxoP/3hzmuFy+vUhw4kfTiH6w1woP3N0pGPqMrq1Ui+Fv7V5Pvb3KFq+OvdpTYUpxfDYDq31BUWzS3DtQ== - dependencies: - chalk "^4.1.2" - tslib "^2.4.0" - "@docusaurus/logger@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.20.tgz#bb49e8516e48082ab96bca11569a18541476d5a6" @@ -1652,28 +1558,6 @@ chalk "^4.1.2" tslib "^2.4.0" -"@docusaurus/mdx-loader@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.19.tgz#f40a5926d02d18e280e517d12d75a43a347ccc25" - integrity sha512-e53ipkQL4Y6mYesTXM3HMASPoo4NaGTS2GC8luTHnhNcKcsgRWmQiMT8/o3Fk6E2UeDZF7O0eyTqX2l2fjOSLQ== - dependencies: - "@babel/parser" "^7.17.10" - "@babel/traverse" "^7.17.10" - "@docusaurus/logger" "2.0.0-beta.19" - "@docusaurus/utils" "2.0.0-beta.19" - "@mdx-js/mdx" "^1.6.22" - escape-html "^1.0.3" - file-loader "^6.2.0" - fs-extra "^10.1.0" - image-size "^1.0.1" - mdast-util-to-string "^2.0.0" - remark-emoji "^2.2.0" - stringify-object "^3.3.0" - tslib "^2.4.0" - unist-util-visit "^2.0.3" - url-loader "^4.1.1" - webpack "^5.72.0" - "@docusaurus/mdx-loader@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.20.tgz#7016e8ce7e4a11c9ea458e2236d3c93af71f393f" @@ -1696,28 +1580,28 @@ url-loader "^4.1.1" webpack "^5.72.0" -"@docusaurus/module-type-aliases@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.0.0-beta.19.tgz#60c2eea0c3cac58e83ced6f696ff4e395de8d627" - integrity sha512-VlumB8un3zNZxe7sanAoCnM+WefDsfX/QlSP/uD6w9pdfJDAO7e2/YJRwP0UWmGJ659xd+MGopGyLzA4ga+HaA== +"@docusaurus/module-type-aliases@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.0.0-beta.20.tgz#669605a64b04226c391e0284c44743e137eb2595" + integrity sha512-lUIXLwQEOyYwcb3iCNibPUL6O9ijvYF5xQwehGeVraTEBts/Ch8ZwELFk+XbaGHKh52PiVxuWL2CP4Gdjy5QKw== dependencies: - "@docusaurus/types" "2.0.0-beta.19" + "@docusaurus/types" "2.0.0-beta.20" "@types/react" "*" "@types/react-router-config" "*" "@types/react-router-dom" "*" react-helmet-async "*" -"@docusaurus/plugin-content-blog@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.19.tgz#401065b456a4b12049c12adee0bdf36366e2df40" - integrity sha512-VDCtAUU4Ub2UWktzGfxT+E+JHj73XSWjJ8wNMJAtXwmOr4Lmhu9bDAuo74zL4tqFkfrYr4OLEcRpgwIDCdBHWg== +"@docusaurus/plugin-content-blog@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.20.tgz#7c0d413ac8df9a422a0b3ddd90b77ec491bbda15" + integrity sha512-6aby36Gmny5h2oo/eEZ2iwVsIlBWbRnNNeqT0BYnJO5aj53iCU/ctFPpJVYcw0l2l8+8ITS70FyePIWEsaZ0jA== dependencies: - "@docusaurus/core" "2.0.0-beta.19" - "@docusaurus/logger" "2.0.0-beta.19" - "@docusaurus/mdx-loader" "2.0.0-beta.19" - "@docusaurus/utils" "2.0.0-beta.19" - "@docusaurus/utils-common" "2.0.0-beta.19" - "@docusaurus/utils-validation" "2.0.0-beta.19" + "@docusaurus/core" "2.0.0-beta.20" + "@docusaurus/logger" "2.0.0-beta.20" + "@docusaurus/mdx-loader" "2.0.0-beta.20" + "@docusaurus/utils" "2.0.0-beta.20" + "@docusaurus/utils-common" "2.0.0-beta.20" + "@docusaurus/utils-validation" "2.0.0-beta.20" cheerio "^1.0.0-rc.10" feed "^4.2.2" fs-extra "^10.1.0" @@ -1729,16 +1613,16 @@ utility-types "^3.10.0" webpack "^5.72.0" -"@docusaurus/plugin-content-docs@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.19.tgz#0a5011e772b4945821b4d3d03ab7def69202ca04" - integrity sha512-PjgPTprfRgBRixTur4aaOy+zBxXMOzk3oCHA19+SIDkOSDnGEhMdJM/2+NNeCa/TeF69HUPw4ISzi9UQsSGyFA== +"@docusaurus/plugin-content-docs@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.20.tgz#2a53b9fc355f45bf7c6917f19be7bfa0698b8b9e" + integrity sha512-XOgwUqXtr/DStpB3azdN6wgkKtQkOXOx1XetORzhHnjihrSMn6daxg+spmcJh1ki/mpT3n7yBbKJxVNo+VB38Q== dependencies: - "@docusaurus/core" "2.0.0-beta.19" - "@docusaurus/logger" "2.0.0-beta.19" - "@docusaurus/mdx-loader" "2.0.0-beta.19" - "@docusaurus/utils" "2.0.0-beta.19" - "@docusaurus/utils-validation" "2.0.0-beta.19" + "@docusaurus/core" "2.0.0-beta.20" + "@docusaurus/logger" "2.0.0-beta.20" + "@docusaurus/mdx-loader" "2.0.0-beta.20" + "@docusaurus/utils" "2.0.0-beta.20" + "@docusaurus/utils-validation" "2.0.0-beta.20" combine-promises "^1.1.0" fs-extra "^10.1.0" import-fresh "^3.3.0" @@ -1749,78 +1633,78 @@ utility-types "^3.10.0" webpack "^5.72.0" -"@docusaurus/plugin-content-pages@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.19.tgz#09c7882fbd4c745c0acdcccf2285c19239a118de" - integrity sha512-WzGrXikIGXQcfQU+GbDCEXelRr2bp8/koxQIbGC3axlWuWR6OPSet7dq8pV5PWgUbeXPZamMrYUPQv7FuCWQ3A== +"@docusaurus/plugin-content-pages@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.20.tgz#6a76c7fa049983d2d94d8c4d738802acf01611fe" + integrity sha512-ubY6DG4F0skFKjfNGCbfO34Qf+MZy6C05OtpIYsoA2YU8ADx0nRH7qPgdEkwR3ma860DbY612rleRT13ogSlhg== dependencies: - "@docusaurus/core" "2.0.0-beta.19" - "@docusaurus/mdx-loader" "2.0.0-beta.19" - "@docusaurus/utils" "2.0.0-beta.19" - "@docusaurus/utils-validation" "2.0.0-beta.19" + "@docusaurus/core" "2.0.0-beta.20" + "@docusaurus/mdx-loader" "2.0.0-beta.20" + "@docusaurus/utils" "2.0.0-beta.20" + "@docusaurus/utils-validation" "2.0.0-beta.20" fs-extra "^10.1.0" remark-admonitions "^1.2.1" tslib "^2.4.0" webpack "^5.72.0" -"@docusaurus/plugin-debug@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.19.tgz#d510b1b9d63ff9ffeb8efd88743c4f15ef123683" - integrity sha512-QczGjFvUcKNjuIAbZtGKkwHW8cfpPTaaKE82W1rXpa5OtzQYpK8ybMh8+cHKQeTks/l9B0korDYJdWYUjWbYvw== +"@docusaurus/plugin-debug@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.20.tgz#7c026e81c45fd4f00801a785c928b9e8727a99de" + integrity sha512-acGZmpncPA1XDczpV1ji1ajBCRBY/H2lXN8alSjOB1vh0c/2Qz+KKD05p17lsUbhIyvsnZBa/BaOwtek91Lu7Q== dependencies: - "@docusaurus/core" "2.0.0-beta.19" - "@docusaurus/utils" "2.0.0-beta.19" + "@docusaurus/core" "2.0.0-beta.20" + "@docusaurus/utils" "2.0.0-beta.20" fs-extra "^10.1.0" react-json-view "^1.21.3" tslib "^2.4.0" -"@docusaurus/plugin-google-analytics@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.19.tgz#be167a357e3d7eed93e63f229120c17eaf9fb25c" - integrity sha512-e15Fz+qReONeR8yZbtMejiY2T9USzNUZ5i+iDSLFujC0cAPW6XzA15+bzg2wcpC4HRwIsLsaAJkY8Z3stFjcdw== +"@docusaurus/plugin-google-analytics@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.20.tgz#c1bdbc1239f987f9716fa30c2fd86962c190a765" + integrity sha512-4C5nY25j0R1lntFmpSEalhL7jYA7tWvk0VZObiIxGilLagT/f9gWPQtIjNBe4yzdQvkhiaXpa8xcMcJUAKRJyw== dependencies: - "@docusaurus/core" "2.0.0-beta.19" - "@docusaurus/utils-validation" "2.0.0-beta.19" + "@docusaurus/core" "2.0.0-beta.20" + "@docusaurus/utils-validation" "2.0.0-beta.20" tslib "^2.4.0" -"@docusaurus/plugin-google-gtag@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.19.tgz#a9f14f9a025cd3af0d7495d6e45d409fb8d8c4db" - integrity sha512-0dWj6+5YmRNBsGMqucaKQUMJ7ebxf6b1IqwJ5Y0p6v8ZgEC2avXoiAYNCR+IujyJSKzGSW+MqqGrxRFvqitjdQ== +"@docusaurus/plugin-google-gtag@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.20.tgz#7284bcfad9cb4e5d63605e95f6da73ca8ac8f053" + integrity sha512-EMZdiMTNg4NwE60xwjbetcqMDqAOazMTwQAQ4OuNAclv7oh8+VPCvqRF8s8AxCoI2Uqc7vh8yzNUuM307Ne9JA== dependencies: - "@docusaurus/core" "2.0.0-beta.19" - "@docusaurus/utils-validation" "2.0.0-beta.19" + "@docusaurus/core" "2.0.0-beta.20" + "@docusaurus/utils-validation" "2.0.0-beta.20" tslib "^2.4.0" -"@docusaurus/plugin-sitemap@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.19.tgz#4d506e2d4679af7231428b9214b6d06c329a9e42" - integrity sha512-UwkL8Pe7AmOgnPcnDzlKkWUKhprc4dGBBAYrMl27vX1CQDU9fgnFLFAe3Bi+y93bjgRjrWVkUPN1+Gc/HOR5ig== +"@docusaurus/plugin-sitemap@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.20.tgz#08eada1260cafb273abea33c9c890ab667c7cbd3" + integrity sha512-Rf5a2vOBWjbe7PJJEBDeLZzDA7lsDi+16bqzKN8OKSXlcZLhxjmIpL5NrjANNbpGpL5vbl9z+iqvjbQmZ3QSmA== dependencies: - "@docusaurus/core" "2.0.0-beta.19" - "@docusaurus/utils" "2.0.0-beta.19" - "@docusaurus/utils-common" "2.0.0-beta.19" - "@docusaurus/utils-validation" "2.0.0-beta.19" + "@docusaurus/core" "2.0.0-beta.20" + "@docusaurus/utils" "2.0.0-beta.20" + "@docusaurus/utils-common" "2.0.0-beta.20" + "@docusaurus/utils-validation" "2.0.0-beta.20" fs-extra "^10.1.0" sitemap "^7.1.1" tslib "^2.4.0" -"@docusaurus/preset-classic@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.19.tgz#ad314afa0cb0b2327bc7b501cfef5e7321d71dd6" - integrity sha512-bKGl/0VzO053jen1tlADIJh0YotQcL4oJplEn4fMo7GRfEtEnShRVPppIAsO4JZeMcAvofzkeV6x5MP2n9XI3w== +"@docusaurus/preset-classic@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.20.tgz#19566be713ce0297834cd999392ea3605bc6f574" + integrity sha512-artUDjiYFIlGd2fxk0iqqcJ5xSCrgormOAoind1c0pn8TRXY1WSCQWYI6p4X24jjhSCzLv0s6Z9PMDyxZdivhg== dependencies: - "@docusaurus/core" "2.0.0-beta.19" - "@docusaurus/plugin-content-blog" "2.0.0-beta.19" - "@docusaurus/plugin-content-docs" "2.0.0-beta.19" - "@docusaurus/plugin-content-pages" "2.0.0-beta.19" - "@docusaurus/plugin-debug" "2.0.0-beta.19" - "@docusaurus/plugin-google-analytics" "2.0.0-beta.19" - "@docusaurus/plugin-google-gtag" "2.0.0-beta.19" - "@docusaurus/plugin-sitemap" "2.0.0-beta.19" - "@docusaurus/theme-classic" "2.0.0-beta.19" - "@docusaurus/theme-common" "2.0.0-beta.19" - "@docusaurus/theme-search-algolia" "2.0.0-beta.19" + "@docusaurus/core" "2.0.0-beta.20" + "@docusaurus/plugin-content-blog" "2.0.0-beta.20" + "@docusaurus/plugin-content-docs" "2.0.0-beta.20" + "@docusaurus/plugin-content-pages" "2.0.0-beta.20" + "@docusaurus/plugin-debug" "2.0.0-beta.20" + "@docusaurus/plugin-google-analytics" "2.0.0-beta.20" + "@docusaurus/plugin-google-gtag" "2.0.0-beta.20" + "@docusaurus/plugin-sitemap" "2.0.0-beta.20" + "@docusaurus/theme-classic" "2.0.0-beta.20" + "@docusaurus/theme-common" "2.0.0-beta.20" + "@docusaurus/theme-search-algolia" "2.0.0-beta.20" "@docusaurus/react-loadable@5.5.2", "react-loadable@npm:@docusaurus/react-loadable@5.5.2": version "5.5.2" @@ -1830,20 +1714,20 @@ "@types/react" "*" prop-types "^15.6.2" -"@docusaurus/theme-classic@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.19.tgz#40b548a6af8607a62da7b6b0484aa8e45c827aa6" - integrity sha512-Z1Bbdv26YNhYW+obemUEW0nplN0t6AWOj9dZmqD6dyhlxDQra4yB3rodnjpDioNEQyMEJZISZXG+AlSWLjyzUg== +"@docusaurus/theme-classic@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.20.tgz#c4c7712c2b35c5654433228729f92ec73e6c598e" + integrity sha512-rs4U68x8Xk6rPsZC/7eaPxCKqzXX1S45FICKmq/IZuaDaQyQIijCvv2ssxYnUyVZUNayZfJK7ZtNu+A0kzYgSQ== dependencies: - "@docusaurus/core" "2.0.0-beta.19" - "@docusaurus/plugin-content-blog" "2.0.0-beta.19" - "@docusaurus/plugin-content-docs" "2.0.0-beta.19" - "@docusaurus/plugin-content-pages" "2.0.0-beta.19" - "@docusaurus/theme-common" "2.0.0-beta.19" - "@docusaurus/theme-translations" "2.0.0-beta.19" - "@docusaurus/utils" "2.0.0-beta.19" - "@docusaurus/utils-common" "2.0.0-beta.19" - "@docusaurus/utils-validation" "2.0.0-beta.19" + "@docusaurus/core" "2.0.0-beta.20" + "@docusaurus/plugin-content-blog" "2.0.0-beta.20" + "@docusaurus/plugin-content-docs" "2.0.0-beta.20" + "@docusaurus/plugin-content-pages" "2.0.0-beta.20" + "@docusaurus/theme-common" "2.0.0-beta.20" + "@docusaurus/theme-translations" "2.0.0-beta.20" + "@docusaurus/utils" "2.0.0-beta.20" + "@docusaurus/utils-common" "2.0.0-beta.20" + "@docusaurus/utils-validation" "2.0.0-beta.20" "@mdx-js/react" "^1.6.22" clsx "^1.1.1" copy-text-to-clipboard "^3.0.1" @@ -1856,34 +1740,34 @@ react-router-dom "^5.2.0" rtlcss "^3.5.0" -"@docusaurus/theme-common@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.0.0-beta.19.tgz#0f0eab66900509c3302917fbbade894c27e357ac" - integrity sha512-Pj1EaGHjFLO2FluZLIF32N+dspunuocbXTeDe2doQCMP5fKX87hUHNSG/qi/KBSueBFNW0yZtCTxFHK+jIn+eg== +"@docusaurus/theme-common@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.0.0-beta.20.tgz#4ec7d77ecd2ade9dad33b8689e3cd51b07e594b0" + integrity sha512-lmdGB3/GQM5z0GH0iHGRXUco4Wfqc6sR5eRKuW4j0sx3+UFVvtbVTTIGt0Cie4Dh6omnFxjPbNDlPDgWr/agVQ== dependencies: - "@docusaurus/module-type-aliases" "2.0.0-beta.19" - "@docusaurus/plugin-content-blog" "2.0.0-beta.19" - "@docusaurus/plugin-content-docs" "2.0.0-beta.19" - "@docusaurus/plugin-content-pages" "2.0.0-beta.19" + "@docusaurus/module-type-aliases" "2.0.0-beta.20" + "@docusaurus/plugin-content-blog" "2.0.0-beta.20" + "@docusaurus/plugin-content-docs" "2.0.0-beta.20" + "@docusaurus/plugin-content-pages" "2.0.0-beta.20" clsx "^1.1.1" parse-numeric-range "^1.3.0" prism-react-renderer "^1.3.1" tslib "^2.4.0" utility-types "^3.10.0" -"@docusaurus/theme-search-algolia@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.19.tgz#7eef4556e29b946a778f8293112cfd88c79d02f9" - integrity sha512-peWPLoKsHNIk2PLEBeEc06B3Plz4cDKx3AyQJn9tt0dyVYMHuy0x0eqr3akwAubMC6KkF3UFaKFjB6ELK92KwA== +"@docusaurus/theme-search-algolia@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.20.tgz#14f2ea376a87d7cfa4840d8c917d1ec62d3a07f7" + integrity sha512-9XAyiXXHgyhDmKXg9RUtnC4WBkYAZUqKT9Ntuk0OaOb4mBwiYUGL74tyP0LLL6T+oa9uEdXiUMlIL1onU8xhvA== dependencies: "@docsearch/react" "^3.0.0" - "@docusaurus/core" "2.0.0-beta.19" - "@docusaurus/logger" "2.0.0-beta.19" - "@docusaurus/plugin-content-docs" "2.0.0-beta.19" - "@docusaurus/theme-common" "2.0.0-beta.19" - "@docusaurus/theme-translations" "2.0.0-beta.19" - "@docusaurus/utils" "2.0.0-beta.19" - "@docusaurus/utils-validation" "2.0.0-beta.19" + "@docusaurus/core" "2.0.0-beta.20" + "@docusaurus/logger" "2.0.0-beta.20" + "@docusaurus/plugin-content-docs" "2.0.0-beta.20" + "@docusaurus/theme-common" "2.0.0-beta.20" + "@docusaurus/theme-translations" "2.0.0-beta.20" + "@docusaurus/utils" "2.0.0-beta.20" + "@docusaurus/utils-validation" "2.0.0-beta.20" algoliasearch "^4.13.0" algoliasearch-helper "^3.8.2" clsx "^1.1.1" @@ -1893,18 +1777,18 @@ tslib "^2.4.0" utility-types "^3.10.0" -"@docusaurus/theme-translations@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.0.0-beta.19.tgz#1f669a343e093ec89677cf2955757e179f47df5b" - integrity sha512-qjG1HNIPu193iOnJNvlNpPgN6AS8B8M8nQBhzkrBgI2XakirZoo6OHtl0traxBffGw2JpZp0vUq0BsX4DyLZJQ== +"@docusaurus/theme-translations@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.0.0-beta.20.tgz#dcc7efb43ff110c19736764c287f6c5128a5dbba" + integrity sha512-O7J/4dHcg7Yr+r3ylgtqmtMEz6d5ScpUxBg8nsNTWOCRoGEXNZVmXSd5l6v72KCyxPZpllPrgjmqkL+I19qWiw== dependencies: fs-extra "^10.1.0" tslib "^2.4.0" -"@docusaurus/types@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-2.0.0-beta.19.tgz#c2f0a29f6d54b11f3a336e03446b3991019f6b1f" - integrity sha512-aaKyQahhB18cDa4yl0WPOWr9GYcH+6rujGWce2SbMIzlKLhokAXRNO2gUFmqFNafIFyb6B+WpZVBpA0+O2aGPw== +"@docusaurus/types@2.0.0-beta.20": + version "2.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-2.0.0-beta.20.tgz#069d40cc225141d5c9a85605a1c61a460814bf5d" + integrity sha512-d4ZIpcrzGsUUcZJL3iz8/iSaewobPPiYfn2Lmmv7GTT5ZPtPkOAtR5mE6+LAf/KpjjgqrC7mpwDKADnOL/ic4Q== dependencies: commander "^5.1.0" history "^4.9.0" @@ -1914,13 +1798,6 @@ webpack "^5.72.0" webpack-merge "^5.8.0" -"@docusaurus/utils-common@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.19.tgz#ff22fc3245315799935f772b5e6d0028ae9e5937" - integrity sha512-nld3OnyGgM43TqlZ3v1IjqEPa+6yuYSMTlWBVYmq+HONig9fkvlyZTZia28ip8gHlFwk6JHMmD9W/5wXfJn56Q== - dependencies: - tslib "^2.4.0" - "@docusaurus/utils-common@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.20.tgz#adb914c331d711a3c0ef2ba3f64139acdf4cd781" @@ -1928,17 +1805,6 @@ dependencies: tslib "^2.4.0" -"@docusaurus/utils-validation@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.19.tgz#53e56e66a1446e25b2b86aa015312cb647c6d7a1" - integrity sha512-mv0OfFZbMF8pfK85JszGiZyubfjJ7Y+avNUInKXetqvFCtmoNRwiHBYvcjroi70jFkIS+Mr7SkVviv5+zx1Sww== - dependencies: - "@docusaurus/logger" "2.0.0-beta.19" - "@docusaurus/utils" "2.0.0-beta.19" - joi "^17.6.0" - js-yaml "^4.1.0" - tslib "^2.4.0" - "@docusaurus/utils-validation@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.20.tgz#ebf475a4388066bd450877fe920f405c53ff5ad2" @@ -1950,27 +1816,6 @@ js-yaml "^4.1.0" tslib "^2.4.0" -"@docusaurus/utils@2.0.0-beta.19": - version "2.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.19.tgz#c3fb547f9ec708b8eed370e4d009bac213a37ce8" - integrity sha512-AQwOGyfLaiSJ2FYkZsMIi7VuGZt0P8upXgfKMeP97ekY+P1gn+6Ah7L8zIQkIVzzl0UMk7tn7kYS/jhCVKAFvg== - dependencies: - "@docusaurus/logger" "2.0.0-beta.19" - "@svgr/webpack" "^6.2.1" - file-loader "^6.2.0" - fs-extra "^10.1.0" - github-slugger "^1.4.0" - globby "^11.1.0" - gray-matter "^4.0.3" - js-yaml "^4.1.0" - lodash "^4.17.21" - micromatch "^4.0.5" - resolve-pathname "^3.0.0" - shelljs "^0.8.5" - tslib "^2.4.0" - url-loader "^4.1.1" - webpack "^5.72.0" - "@docusaurus/utils@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.20.tgz#d5a9816a328b2ca5e4e1a3fbf267e3674abacd48" From 722bfc63662b2c8e64cc6299bf94aa1c4a42bb77 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 6 May 2022 13:58:15 -0400 Subject: [PATCH 042/340] All three tests pass - `uniform` `toPointSet` method has been changed for numerical stability. Value: [1e-1 to 1.75e0] --- .../Distributions/KlDivergence_test.res | 7 ++-- .../Distributions/PointSetDist/Continuous.res | 34 +++++++------------ .../Distributions/PointSetDist/Discrete.res | 2 +- .../SymbolicDist/SymbolicDist.res | 5 +-- .../src/rescript/Utility/XYShape.res | 29 +++++++--------- 5 files changed, 34 insertions(+), 43 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index be884727..f662db9a 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -70,13 +70,14 @@ describe("kl divergence", () => { let prediction = normalMakeR(mean1, stdev1)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) let answer = normalMakeR(mean2, stdev2)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) + // https://stats.stackexchange.com/questions/7440/kl-divergence-between-two-univariate-gaussians let analyticalKl = Js.Math.log(stdev1 /. stdev2) +. (stdev2 ** 2.0 +. (mean2 -. mean1) ** 2.0) /. (2.0 *. stdev1 ** 2.0) -. 0.5 let kl = E.R.liftJoin2(klDivergence, prediction, answer) - Js.Console.log2("Analytical: ", analyticalKl) - Js.Console.log2("Computed: ", kl) + // Js.Console.log2("Analytical: ", analyticalKl) + // Js.Console.log2("Computed: ", kl) switch kl { | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) @@ -91,7 +92,7 @@ describe("kl divergence", () => { describe("combine along support test", () => { Skip.test("combine along support test", _ => { // doesn't matter - let combineAlongSupportOfSecondArgument = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument + let combineAlongSupportOfSecondArgument = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument0 let lowAnswer = 0.0 let highAnswer = 1.0 let lowPrediction = 0.0 diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 09b8d6b1..6b2c8ead 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -271,38 +271,30 @@ module T = Dist({ let variance = (t: t): float => XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) - let klDivergence0 = (prediction: t, answer: t) => { - combinePointwise( - ~combiner=XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument, - PointSetDist_Scoring.KLDivergence.integrand, - prediction, - answer, - ) - |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) - |> E.R.fmap(integralEndY) - } + // let klDivergence0 = (prediction: t, answer: t) => { + // combinePointwise( + // ~combiner=XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument, + // PointSetDist_Scoring.KLDivergence.integrand, + // prediction, + // answer, + // ) + // |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) + // |> E.R.fmap(integralEndY) + // } let klDivergence = (prediction: t, answer: t) => { - let newShape = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument2( + let newShape = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument( PointSetDist_Scoring.KLDivergence.integrand, prediction.xyShape, answer.xyShape, ) - let generateContinuousDistFromXYShape: XYShape.xyShape => t = xyShape => { + let xyShapeToContinuous: XYShape.xyShape => t = xyShape => { xyShape: xyShape, interpolation: #Linear, integralSumCache: None, integralCache: None, } - let _ = Js.Console.log2("prediction", prediction) - let _ = Js.Console.log2("answer", answer) - let _ = Js.Console.log2("newShape", newShape) - switch newShape { - | Ok(tshape) => Ok(integralEndY(generateContinuousDistFromXYShape(tshape))) - | Error(errormessage) => Error(errormessage) - } - //|> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) - //|> E.R.fmap(integralEndY) + newShape->E.R2.fmap(x => x->xyShapeToContinuous->integralEndY) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 3aa92230..31694232 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -230,7 +230,7 @@ module T = Dist({ let klDivergence = (prediction: t, answer: t) => { combinePointwise( - ~combiner=XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument, + ~combiner=XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument0, ~fn=PointSetDist_Scoring.KLDivergence.integrand, prediction, answer, diff --git a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res index fb338ded..c925e39e 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res @@ -396,8 +396,9 @@ module T = { | (#ByWeight, #Uniform(n)) => // In `ByWeight mode, uniform distributions get special treatment because we need two x's // on either side for proper rendering (just left and right of the discontinuities). - let dx = 0.00001 *. (n.high -. n.low) - [n.low -. dx, n.low +. dx, n.high -. dx, n.high +. dx] + let distance = n.high -. n.low + let dx = MagicNumbers.Epsilon.ten *. distance + [n.low -. dx, n.low, n.low +. dx, n.high -. dx, n.high, n.high +. dx] | (#ByWeight, _) => let ys = E.A.Floats.range(minCdfValue, maxCdfValue, n) ys |> E.A.fmap(y => inv(y, dist)) diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 84853c40..295865f8 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -391,7 +391,7 @@ module PointwiseCombination = { `) // This function is used for kl divergence - let combineAlongSupportOfSecondArgument: ( + let combineAlongSupportOfSecondArgument0: ( (float, float) => result, interpolator, T.t, @@ -455,14 +455,14 @@ module PointwiseCombination = { T.filterOkYs(newXs, newYs)->Ok } - let getApproximatePdfOfContinuousDistributionAtPoint: (xyShape, float) => option = ( - dist: xyShape, - point: float, + let approximatePdfOfContinuousDistributionAtPoint: (xyShape, float) => option = ( + distShape, + point, ) => { - let closestFromBelowIndex = E.A.reducei(dist.xs, None, (accumulator, item, index) => + let closestFromBelowIndex = E.A.reducei(distShape.xs, None, (accumulator, item, index) => item < point ? Some(index) : accumulator ) // This could be made more efficient by taking advantage of the fact that these are ordered - let closestFromAboveIndexOption = Belt.Array.getIndexBy(dist.xs, item => item > point) + let closestFromAboveIndexOption = Belt.Array.getIndexBy(distShape.xs, item => item > point) let weightedMean = ( point: float, @@ -480,30 +480,28 @@ module PointwiseCombination = { let result = switch (closestFromBelowIndex, closestFromAboveIndexOption) { | (None, None) => None // all are smaller, and all are larger - | (None, Some(i)) => Some(0.0) // none are smaller, all are larger - | (Some(i), None) => Some(0.0) // all are smaller, none are larger + | (None, Some(_)) => Some(0.0) // none are smaller, all are larger + | (Some(_), None) => Some(0.0) // all are smaller, none are larger | (Some(i), Some(j)) => - Some(weightedMean(point, dist.xs[i], dist.xs[j], dist.ys[i], dist.ys[j])) // there is a lowerBound and an upperBound. + Some(weightedMean(point, distShape.xs[i], distShape.xs[j], distShape.ys[i], distShape.ys[j])) // there is a lowerBound and an upperBound. } result } - let combineAlongSupportOfSecondArgument2: ( + let combineAlongSupportOfSecondArgument: ( (float, float) => result, T.t, T.t, ) => result = (fn, prediction, answer) => { - let combineWithFn = (x: float, i: int) => { - let answerX = x + let combineWithFn = (answerX: float, i: int) => { let answerY = answer.ys[i] - let predictionY = getApproximatePdfOfContinuousDistributionAtPoint(prediction, answerX) + let predictionY = approximatePdfOfContinuousDistributionAtPoint(prediction, answerX) let wrappedResult = E.O.fmap(x => fn(x, answerY), predictionY) - let result = switch wrappedResult { + switch wrappedResult { | Some(x) => x | None => Error(Operation.LogicallyInconsistentPathwayError) } - result } let newYsWithError = Js.Array.mapi((x, i) => combineWithFn(x, i), answer.xs) let newYsOrError = E.A.R.firstErrorOrOpen(newYsWithError) @@ -512,7 +510,6 @@ module PointwiseCombination = { | Error(b) => Error(b) } - // T.filterOkYs(newXs, newYs)->Ok result } From bcf620337a342b7f3eac93c1f5f076d019ee5cf0 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 6 May 2022 14:21:53 -0400 Subject: [PATCH 043/340] Some Cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Btw, Nuño gets a lot of credit for the last commit! Value: [1e-2 to 8e-2] --- .../Distributions/KlDivergence_test.res | 74 ++++++++----------- packages/squiggle-lang/package.json | 1 - 2 files changed, 32 insertions(+), 43 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index f662db9a..7d7def74 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -5,40 +5,9 @@ open TestHelpers describe("kl divergence", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) exception KlFailed - test("of two uniforms is equal to the analytic expression", () => { - let lowAnswer = 0.0 - let highAnswer = 1.0 - let lowPrediction = -1.0 - let highPrediction = 2.0 - let answer = - uniformMakeR(lowAnswer, highAnswer)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) - let prediction = - uniformMakeR(lowPrediction, highPrediction)->E.R2.errMap(s => DistributionTypes.ArgumentError( - s, - )) - // integral along the support of the answer of answer.pdf(x) times log of prediction.pdf(x) divided by answer.pdf(x) dx - let analyticalKl = Js.Math.log((highPrediction -. lowPrediction) /. (highAnswer -. lowAnswer)) - let kl = E.R.liftJoin2(klDivergence, prediction, answer) - Js.Console.log2("Analytical: ", analyticalKl) - Js.Console.log2("Computed: ", kl) - switch kl { - | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) - | Error(err) => { - Js.Console.log(DistributionTypes.Error.toString(err)) - raise(KlFailed) - } - } - }) - test( - "of two uniforms is equal to the analytic expression, part 2 (annoying numerical errors)", - () => { - Js.Console.log( - "This will fait because of extremely annoying numerical errors. Will not fail if the two uniforms are a bit different. Very annoying", - ) - let lowAnswer = 0.0 - let highAnswer = 1.0 - let lowPrediction = 0.0 - let highPrediction = 2.0 + + let testUniform = (lowAnswer, highAnswer, lowPrediction, highPrediction) => { + test("of two uniforms is equal to the analytic expression", () => { let answer = uniformMakeR(lowAnswer, highAnswer)->E.R2.errMap(s => DistributionTypes.ArgumentError(s)) let prediction = @@ -49,8 +18,6 @@ describe("kl divergence", () => { // integral along the support of the answer of answer.pdf(x) times log of prediction.pdf(x) divided by answer.pdf(x) dx let analyticalKl = Js.Math.log((highPrediction -. lowPrediction) /. (highAnswer -. lowAnswer)) let kl = E.R.liftJoin2(klDivergence, prediction, answer) - Js.Console.log2("Analytical: ", analyticalKl) - Js.Console.log2("Computed: ", kl) switch kl { | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) | Error(err) => { @@ -58,8 +25,12 @@ describe("kl divergence", () => { raise(KlFailed) } } - }, - ) + }) + } + testUniform(0.0, 1.0, -1.0, 2.0) + testUniform(0.0, 1.0, 0.0, 2.0) + // testUniform(-1.0, 1.0, 0.0, 2.0) + test("of two normals is equal to the formula", () => { // This test case comes via Nuño https://github.com/quantified-uncertainty/squiggle/issues/433 let mean1 = 4.0 @@ -90,8 +61,7 @@ describe("kl divergence", () => { }) describe("combine along support test", () => { - Skip.test("combine along support test", _ => { - // doesn't matter + test("combine along support test", _ => { let combineAlongSupportOfSecondArgument = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument0 let lowAnswer = 0.0 let highAnswer = 1.0 @@ -115,7 +85,27 @@ describe("combine along support test", () => { Some(combineAlongSupportOfSecondArgument(integrand, interpolator, a.xyShape, b.xyShape)) | _ => None } - Js.Console.log2("combineAlongSupportOfSecondArgument", result) - false->expect->toBe(true) + result + ->expect + ->toEqual( + Some( + Ok({ + xs: [ + 0.0, + MagicNumbers.Epsilon.ten, + 2.0 *. MagicNumbers.Epsilon.ten, + 1.0 -. MagicNumbers.Epsilon.ten, + 1.0, + ], + ys: [ + -0.34657359027997264, + -0.34657359027997264, + -0.34657359027997264, + -0.34657359027997264, + -0.34657359027997264, + ], + }), + ), + ) }) }) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 8f3c04a8..97b710b6 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -15,7 +15,6 @@ "test": "jest", "test:ts": "jest __tests__/TS/", "test:rescript": "jest --modulePathIgnorePatterns=__tests__/TS/*", - "test:kldivergence": "jest __tests__/Distributions/KlDivergence_test.*", "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": "yarn clean; yarn build; nyc --reporter=lcov yarn test:ts", From 33fd5296964f161630c4cae1a25be27b43e2b4b5 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 6 May 2022 14:37:47 -0400 Subject: [PATCH 044/340] Reset `yarn.lock` Value: [1e-10 to 1e-7] --- yarn.lock | 512 ++++++++++++++++++++++++++---------------------------- 1 file changed, 248 insertions(+), 264 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2a70176e..28cc8599 100644 --- a/yarn.lock +++ b/yarn.lock @@ -188,12 +188,7 @@ dependencies: "@babel/highlight" "^7.16.7" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2" - integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== - -"@babel/compat-data@^7.17.10": +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.10": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab" integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw== @@ -274,17 +269,7 @@ "@babel/helper-explode-assignable-expression" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" - integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w== - dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-validator-option" "^7.16.7" - browserslist "^4.17.5" - semver "^6.3.0" - -"@babel/helper-compilation-targets@^7.17.10": +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.10": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz#09c63106d47af93cf31803db6bc49fef354e2ebe" integrity sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ== @@ -496,12 +481,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.9.tgz#9c94189a6062f0291418ca021077983058e171ef" - integrity sha512-vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg== - -"@babel/parser@^7.17.10": +"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.10": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.10.tgz#873b16db82a8909e0fbd7f115772f4b739f6ce78" integrity sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ== @@ -827,9 +807,9 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.16.7", "@babel/plugin-syntax-typescript@^7.7.2": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8" - integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A== + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz#80031e6042cad6a95ed753f672ebd23c30933195" + integrity sha512-xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" @@ -1324,15 +1304,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.11", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" - integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - to-fast-properties "^2.0.0" - -"@babel/types@^7.17.10": +"@babel/types@^7.0.0", "@babel/types@^7.12.11", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.10", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.10.tgz#d35d7b4467e439fcf06d195f8100e0fea7fc82c4" integrity sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A== @@ -1439,6 +1411,18 @@ dependencies: postcss-value-parser "^4.2.0" +"@csstools/postcss-stepped-value-functions@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.0.tgz#f8ffc05e163ba7bcbefc5fdcaf264ce9fd408c16" + integrity sha512-q8c4bs1GumAiRenmFjASBcWSLKrbzHzWl6C2HcaAxAXIiL2rUlUWbqQZUjwVG5tied0rld19j/Mm90K3qI26vw== + dependencies: + postcss-value-parser "^4.2.0" + +"@csstools/postcss-unset-value@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.0.tgz#f6e0e58376f09e381a49bd553772a97a477da3fd" + integrity sha512-T5ZyNSw9G0x0UDFiXV40a7VjKw2b+l4G+S0sctKqxhx8cg9QtMUAGwJBVU9mHPDPoZEmwm0tEoukjl4zb9MU7Q== + "@ctrl/tinycolor@^3.4.0": version "3.4.1" resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz#75b4c27948c81e88ccd3a8902047bcd797f38d32" @@ -1980,9 +1964,9 @@ jest "^27.3.1" "@hapi/hoek@^9.0.0": - version "9.2.1" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" - integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== + version "9.3.0" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" + integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ== "@hapi/topo@^5.0.0": version "5.1.0" @@ -2040,16 +2024,16 @@ jest-util "^27.5.1" slash "^3.0.0" -"@jest/console@^28.0.2": - version "28.0.2" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.0.2.tgz#d11e8b43ae431ae9b3112656848417ae4008fcad" - integrity sha512-tiRpnMeeyQuuzgL5UNSeiqMwF8UOWPbAE5rzcu/1zyq4oPG2Ox6xm4YCOruwbp10F8odWc+XwVxTyGzMSLMqxA== +"@jest/console@^28.1.0": + version "28.1.0" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-28.1.0.tgz#db78222c3d3b0c1db82f1b9de51094c2aaff2176" + integrity sha512-tscn3dlJFGay47kb4qVruQg/XWlmvU0xp3EJOjzzY+sBaI+YgwKcvAmTcyYU7xEiLLIY5HCdWRooAL8dqkFlDA== dependencies: - "@jest/types" "^28.0.2" + "@jest/types" "^28.1.0" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^28.0.2" - jest-util "^28.0.2" + jest-message-util "^28.1.0" + jest-util "^28.1.0" slash "^3.0.0" "@jest/core@^27.5.1": @@ -2174,13 +2158,13 @@ "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-result@^28.0.2": - version "28.0.2" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.0.2.tgz#bc8e15a95347e3c2149572ae06a5a6fed939c522" - integrity sha512-4EUqgjq9VzyUiVTvZfI9IRJD6t3NYBNP4f+Eq8Zr93+hkJ0RrGU4OBTw8tfNzidKX+bmuYzn8FxqpxOPIGGCMA== +"@jest/test-result@^28.1.0": + version "28.1.0" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-28.1.0.tgz#fd149dee123510dd2fcadbbf5f0020f98ad7f12c" + integrity sha512-sBBFIyoPzrZho3N+80P35A5oAkSKlGfsEFfXFWuPGBsW40UAjCkGakZhn4UQK4iQlW2vgCDMRDOob9FGKV8YoQ== dependencies: - "@jest/console" "^28.0.2" - "@jest/types" "^28.0.2" + "@jest/console" "^28.1.0" + "@jest/types" "^28.1.0" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" @@ -2258,10 +2242,10 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" -"@jest/types@^28.0.2": - version "28.0.2" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.0.2.tgz#70b9538c1863fb060b2f438ca008b5563d00c5b4" - integrity sha512-hi3jUdm9iht7I2yrV5C4s3ucCJHUP8Eh3W6rQ1s4n/Qw9rQgsda4eqCt+r3BKRi7klVmZfQlMx1nGlzNMP2d8A== +"@jest/types@^28.1.0": + version "28.1.0" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.0.tgz#508327a89976cbf9bd3e1cc74641a29fd7dfd519" + integrity sha512-xmEggMPr317MIOjjDoZ4ejCSr9Lpbt/u34+dvc99t7DS8YirW5rwZEhzKPC2BMUFkUhI48qs6qLUSGw5FuL0GA== dependencies: "@jest/schemas" "^28.0.2" "@types/istanbul-lib-coverage" "^2.0.0" @@ -2279,24 +2263,24 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/resolve-uri@^3.0.3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.6.tgz#4ac237f4dabc8dd93330386907b97591801f7352" - integrity sha512-R7xHtBSNm+9SyvpJkdQl+qrM3Hm2fea3Ef197M3mUug+v+yR+Rhfbs7PBtcBUVnIWJ4JcAdjvij+c8hXS9p5aw== + version "3.0.7" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe" + integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA== "@jridgewell/set-array@^1.0.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.0.tgz#1179863356ac8fbea64a5a4bcde93a4871012c01" - integrity sha512-SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" + integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== "@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.11" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec" - integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg== + version "1.4.13" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" + integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== "@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.9" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" - integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== + version "0.3.10" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.10.tgz#db436f0917d655393851bc258918c00226c9b183" + integrity sha512-Q0YbBd6OTsXm8Y21+YUSDXupHnodNC2M4O18jtd3iwJ3+vMZNdKGols0a9G6JOK0dcJ3IdUUHoh908ZI6qhk8Q== dependencies: "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" @@ -3922,9 +3906,9 @@ "@types/estree" "*" "@types/eslint@*": - version "8.4.1" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304" - integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA== + version "8.4.2" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.2.tgz#48f2ac58ab9c631cb68845c3d956b28f79fad575" + integrity sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA== dependencies: "@types/estree" "*" "@types/json-schema" "*" @@ -4017,9 +4001,9 @@ integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== "@types/http-proxy@^1.17.8": - version "1.17.8" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55" - integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA== + version "1.17.9" + resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a" + integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw== dependencies: "@types/node" "*" @@ -4097,6 +4081,11 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== +"@types/mocha@^9.1.1": + version "9.1.1" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4" + integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw== + "@types/node-fetch@^2.5.7": version "2.6.1" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975" @@ -4387,13 +4376,13 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^5.5.0": - version "5.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.21.0.tgz#bfc22e0191e6404ab1192973b3b4ea0461c1e878" - integrity sha512-fTU85q8v5ZLpoZEyn/u1S2qrFOhi33Edo2CZ0+q1gDaWWm0JuPh3bgOyU8lM0edIEYgKLDkPFiZX2MOupgjlyg== + version "5.22.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.22.0.tgz#7b52a0de2e664044f28b36419210aea4ab619e2a" + integrity sha512-YCiy5PUzpAeOPGQ7VSGDEY2NeYUV1B0swde2e0HzokRsHBYjSdF6DZ51OuRZxVPHx0032lXGLvOMls91D8FXlg== dependencies: - "@typescript-eslint/scope-manager" "5.21.0" - "@typescript-eslint/type-utils" "5.21.0" - "@typescript-eslint/utils" "5.21.0" + "@typescript-eslint/scope-manager" "5.22.0" + "@typescript-eslint/type-utils" "5.22.0" + "@typescript-eslint/utils" "5.22.0" debug "^4.3.2" functional-red-black-tree "^1.0.1" ignore "^5.1.8" @@ -4402,75 +4391,75 @@ tsutils "^3.21.0" "@typescript-eslint/experimental-utils@^5.0.0": - version "5.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.21.0.tgz#489275ca792f5de7e0d1f4be1f15576ea56b6ca2" - integrity sha512-mzF6ert/6iQoESV0z9v5/mEaJRKL4fv68rHoZ6exM38xjxkw4MNx54B7ferrnMTM/GIRKLDaJ3JPRi+Dxa5Hlg== + version "5.22.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.22.0.tgz#a2b40eaa52ae1d1e316bc861069c40883a7ccf6e" + integrity sha512-rKxoCUtAHwEH6IcAoVpqipY6Th+YKW7WFspAKu0IFdbdKZpveFBeqxxE9Xn+GWikhq1o03V3VXbxIe+GdhggiQ== dependencies: - "@typescript-eslint/utils" "5.21.0" + "@typescript-eslint/utils" "5.22.0" "@typescript-eslint/parser@^5.5.0": - version "5.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.21.0.tgz#6cb72673dbf3e1905b9c432175a3c86cdaf2071f" - integrity sha512-8RUwTO77hstXUr3pZoWZbRQUxXcSXafZ8/5gpnQCfXvgmP9gpNlRGlWzvfbEQ14TLjmtU8eGnONkff8U2ui2Eg== + version "5.22.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.22.0.tgz#7bedf8784ef0d5d60567c5ba4ce162460e70c178" + integrity sha512-piwC4krUpRDqPaPbFaycN70KCP87+PC5WZmrWs+DlVOxxmF+zI6b6hETv7Quy4s9wbkV16ikMeZgXsvzwI3icQ== dependencies: - "@typescript-eslint/scope-manager" "5.21.0" - "@typescript-eslint/types" "5.21.0" - "@typescript-eslint/typescript-estree" "5.21.0" + "@typescript-eslint/scope-manager" "5.22.0" + "@typescript-eslint/types" "5.22.0" + "@typescript-eslint/typescript-estree" "5.22.0" debug "^4.3.2" -"@typescript-eslint/scope-manager@5.21.0": - version "5.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.21.0.tgz#a4b7ed1618f09f95e3d17d1c0ff7a341dac7862e" - integrity sha512-XTX0g0IhvzcH/e3393SvjRCfYQxgxtYzL3UREteUneo72EFlt7UNoiYnikUtmGVobTbhUDByhJ4xRBNe+34kOQ== +"@typescript-eslint/scope-manager@5.22.0": + version "5.22.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.22.0.tgz#590865f244ebe6e46dc3e9cab7976fc2afa8af24" + integrity sha512-yA9G5NJgV5esANJCO0oF15MkBO20mIskbZ8ijfmlKIvQKg0ynVKfHZ15/nhAJN5m8Jn3X5qkwriQCiUntC9AbA== dependencies: - "@typescript-eslint/types" "5.21.0" - "@typescript-eslint/visitor-keys" "5.21.0" + "@typescript-eslint/types" "5.22.0" + "@typescript-eslint/visitor-keys" "5.22.0" -"@typescript-eslint/type-utils@5.21.0": - version "5.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.21.0.tgz#ff89668786ad596d904c21b215e5285da1b6262e" - integrity sha512-MxmLZj0tkGlkcZCSE17ORaHl8Th3JQwBzyXL/uvC6sNmu128LsgjTX0NIzy+wdH2J7Pd02GN8FaoudJntFvSOw== +"@typescript-eslint/type-utils@5.22.0": + version "5.22.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.22.0.tgz#0c0e93b34210e334fbe1bcb7250c470f4a537c19" + integrity sha512-iqfLZIsZhK2OEJ4cQ01xOq3NaCuG5FQRKyHicA3xhZxMgaxQazLUHbH/B2k9y5i7l3+o+B5ND9Mf1AWETeMISA== dependencies: - "@typescript-eslint/utils" "5.21.0" + "@typescript-eslint/utils" "5.22.0" debug "^4.3.2" tsutils "^3.21.0" -"@typescript-eslint/types@5.21.0": - version "5.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.21.0.tgz#8cdb9253c0dfce3f2ab655b9d36c03f72e684017" - integrity sha512-XnOOo5Wc2cBlq8Lh5WNvAgHzpjnEzxn4CJBwGkcau7b/tZ556qrWXQz4DJyChYg8JZAD06kczrdgFPpEQZfDsA== +"@typescript-eslint/types@5.22.0": + version "5.22.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.22.0.tgz#50a4266e457a5d4c4b87ac31903b28b06b2c3ed0" + integrity sha512-T7owcXW4l0v7NTijmjGWwWf/1JqdlWiBzPqzAWhobxft0SiEvMJB56QXmeCQjrPuM8zEfGUKyPQr/L8+cFUBLw== -"@typescript-eslint/typescript-estree@5.21.0": - version "5.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.21.0.tgz#9f0c233e28be2540eaed3df050f0d54fb5aa52de" - integrity sha512-Y8Y2T2FNvm08qlcoSMoNchh9y2Uj3QmjtwNMdRQkcFG7Muz//wfJBGBxh8R7HAGQFpgYpdHqUpEoPQk+q9Kjfg== +"@typescript-eslint/typescript-estree@5.22.0": + version "5.22.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.22.0.tgz#e2116fd644c3e2fda7f4395158cddd38c0c6df97" + integrity sha512-EyBEQxvNjg80yinGE2xdhpDYm41so/1kOItl0qrjIiJ1kX/L/L8WWGmJg8ni6eG3DwqmOzDqOhe6763bF92nOw== dependencies: - "@typescript-eslint/types" "5.21.0" - "@typescript-eslint/visitor-keys" "5.21.0" + "@typescript-eslint/types" "5.22.0" + "@typescript-eslint/visitor-keys" "5.22.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.21.0", "@typescript-eslint/utils@^5.13.0": - version "5.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.21.0.tgz#51d7886a6f0575e23706e5548c7e87bce42d7c18" - integrity sha512-q/emogbND9wry7zxy7VYri+7ydawo2HDZhRZ5k6yggIvXa7PvBbAAZ4PFH/oZLem72ezC4Pr63rJvDK/sTlL8Q== +"@typescript-eslint/utils@5.22.0", "@typescript-eslint/utils@^5.13.0": + version "5.22.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.22.0.tgz#1f2c4897e2cf7e44443c848a13c60407861babd8" + integrity sha512-HodsGb037iobrWSUMS7QH6Hl1kppikjA1ELiJlNSTYf/UdMEwzgj0WIp+lBNb6WZ3zTwb0tEz51j0Wee3iJ3wQ== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.21.0" - "@typescript-eslint/types" "5.21.0" - "@typescript-eslint/typescript-estree" "5.21.0" + "@typescript-eslint/scope-manager" "5.22.0" + "@typescript-eslint/types" "5.22.0" + "@typescript-eslint/typescript-estree" "5.22.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.21.0": - version "5.21.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.21.0.tgz#453fb3662409abaf2f8b1f65d515699c888dd8ae" - integrity sha512-SX8jNN+iHqAF0riZQMkm7e8+POXa/fXw5cxL+gjpyP+FI+JVNhii53EmQgDAfDcBpFekYSlO0fGytMQwRiMQCA== +"@typescript-eslint/visitor-keys@5.22.0": + version "5.22.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.22.0.tgz#f49c0ce406944ffa331a1cfabeed451ea4d0909c" + integrity sha512-DbgTqn2Dv5RFWluG88tn0pP6Ex0ROF+dpDO1TNNZdRtLjUr6bdznjA6f/qNqJLjd2PgguAES2Zgxh/JzwzETDg== dependencies: - "@typescript-eslint/types" "5.21.0" + "@typescript-eslint/types" "5.22.0" eslint-visitor-keys "^3.0.0" "@webassemblyjs/ast@1.11.1": @@ -5039,9 +5028,9 @@ ansi-to-html@^0.6.11: entities "^2.0.0" antd@^4.20.0: - version "4.20.1" - resolved "https://registry.yarnpkg.com/antd/-/antd-4.20.1.tgz#6cd5a406c7172d61a5d0693ea52ee908650cf674" - integrity sha512-asKxOV0a6AijqonbcXkO08/q+XvqS/HmGfaRIS6ZH1ALR3FS2q+kTW52rJZO9rfoOb/ldPhEBVSWiNrbiB+uCQ== + version "4.20.2" + resolved "https://registry.yarnpkg.com/antd/-/antd-4.20.2.tgz#1ed2042a091eecfebd9650c014a1a2e57430ff2b" + integrity sha512-b+Gq1EY8LmcS/ARei/dGI0bWQlJ/j3f3oJ6XjM+ryyT5YWxvf7X3mGc++bTGuLmjn6+/icRL1zItIgcvplcomg== dependencies: "@ant-design/colors" "^6.0.0" "@ant-design/icons" "^4.7.0" @@ -5072,7 +5061,7 @@ antd@^4.20.0: rc-progress "~3.2.1" rc-rate "~2.9.0" rc-resize-observer "^1.2.0" - rc-segmented "~2.0.0" + rc-segmented "~2.1.0 " rc-select "~14.1.1" rc-slider "~10.0.0" rc-steps "~4.1.0" @@ -5210,13 +5199,13 @@ array-flatten@^2.1.2: integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== array-includes@^3.0.3, array-includes@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" - integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== + version "3.1.5" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb" + integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" + define-properties "^1.1.4" + es-abstract "^1.19.5" get-intrinsic "^1.1.1" is-string "^1.0.7" @@ -5358,13 +5347,13 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@^10.3.7, autoprefixer@^10.4.5: - version "10.4.5" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.5.tgz#662193c744094b53d3637f39be477e07bd904998" - integrity sha512-Fvd8yCoA7lNX/OUllvS+aS1I7WRBclGXsepbvT8ZaPgrH24rgXpZzF0/6Hh3ZEkwg+0AES/Osd196VZmYoEFtw== +autoprefixer@^10.3.7, autoprefixer@^10.4.5, autoprefixer@^10.4.6: + version "10.4.7" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.7.tgz#1db8d195f41a52ca5069b7593be167618edbbedf" + integrity sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA== dependencies: - browserslist "^4.20.2" - caniuse-lite "^1.0.30001332" + browserslist "^4.20.3" + caniuse-lite "^1.0.30001335" fraction.js "^4.2.0" normalize-range "^0.1.2" picocolors "^1.0.0" @@ -5983,7 +5972,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1, browserslist@^4.20.2, browserslist@^4.20.3: +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.18.1, browserslist@^4.20.2, browserslist@^4.20.3: version "4.20.3" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf" integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg== @@ -6204,10 +6193,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001332: - version "1.0.30001334" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001334.tgz#892e9965b35285033fc2b8a8eff499fe02f13d8b" - integrity sha512-kbaCEBRRVSoeNs74sCuq92MJyGrMtjWVfhltoHUCW4t4pXFvGjUBrfo47weBRViHkiV3eBYyIsfl956NtHGazw== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001332, caniuse-lite@^1.0.30001335: + version "1.0.30001338" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz#b5dd7a7941a51a16480bdf6ff82bded1628eec0d" + integrity sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ== capture-exit@^2.0.0: version "2.0.0" @@ -6833,15 +6822,7 @@ copy-webpack-plugin@^10.2.4: schema-utils "^4.0.0" serialize-javascript "^6.0.0" -core-js-compat@^3.21.0, core-js-compat@^3.8.1: - version "3.22.3" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.3.tgz#9b10d786052d042bc97ee8df9c0d1fb6a49c2005" - integrity sha512-wliMbvPI2idgFWpFe7UEyHMvu6HWgW8WA+HnDRtgzoSDYvXFMpoGX1H3tPDDXrcfUSyXafCLDd7hOeMQHEZxGw== - dependencies: - browserslist "^4.20.3" - semver "7.0.0" - -core-js-compat@^3.22.1: +core-js-compat@^3.21.0, core-js-compat@^3.22.1, core-js-compat@^3.8.1: version "3.22.4" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.4.tgz#d700f451e50f1d7672dcad0ac85d910e6691e579" integrity sha512-dIWcsszDezkFZrfm1cnB4f/J85gyhiCpxbgBdohWCDtSVuAaChTSpPV7ldOQf/Xds2U5xCIJZOK82G4ZPAIswA== @@ -6850,9 +6831,9 @@ core-js-compat@^3.22.1: semver "7.0.0" core-js-pure@^3.20.2, core-js-pure@^3.8.1, core-js-pure@^3.8.2: - version "3.22.3" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.3.tgz#181d1b6321fb29fe99c16a1f28beb840ab84ad36" - integrity sha512-oN88zz7nmKROMy8GOjs+LN+0LedIvbMdnB5XsTlhcOg1WGARt9l0LFg0zohdoFmCsEZ1h2ZbSQ6azj3M+vhzwQ== + version "3.22.4" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.4.tgz#a992210f4cad8b32786b8654563776c56b0e0d0a" + integrity sha512-4iF+QZkpzIz0prAFuepmxwJ2h5t4agvE8WPYqs2mjLJMNNwJOnpch76w2Q7bUfCPEv/V7wpvOfog0w273M+ZSw== core-js@^2.4.0: version "2.6.12" @@ -7196,10 +7177,10 @@ css@^3.0.0: source-map "^0.6.1" source-map-resolve "^0.6.0" -cssdb@^6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-6.5.0.tgz#61264b71f29c834f09b59cb3e5b43c8226590122" - integrity sha512-Rh7AAopF2ckPXe/VBcoUS9JrCZNSyc60+KpgE6X25vpVxA32TmiqvExjkfhwP4wGSb6Xe8Z/JIyGqwgx/zZYFA== +cssdb@^6.6.1: + version "6.6.1" + resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-6.6.1.tgz#2637fdc57eab452849488de7e8d961ec06f2fe8f" + integrity sha512-0/nZEYfp8SFEzJkMud8NxZJsGfD7RHDJti6GRBLZptIwAzco6RTx1KgwFl4mGWsYS0ZNbCrsY9QryhQ4ldF3Mg== cssesc@^3.0.0: version "3.0.0" @@ -7455,9 +7436,9 @@ date-fns@2.x: integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw== dayjs@1.x: - version "1.11.1" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.1.tgz#90b33a3dda3417258d48ad2771b415def6545eb0" - integrity sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA== + version "1.11.2" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5" + integrity sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw== debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9: version "2.6.9" @@ -7551,7 +7532,7 @@ define-lazy-prop@^2.0.0: resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== -define-properties@^1.1.2, define-properties@^1.1.3: +define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== @@ -7948,9 +7929,9 @@ ejs@^3.1.6: jake "^10.8.5" electron-to-chromium@^1.4.118: - version "1.4.127" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.127.tgz#4ef19d5d920abe2676d938f4170729b44f7f423a" - integrity sha512-nhD6S8nKI0O2MueC6blNOEZio+/PWppE/pevnf3LOlQA/fKPCrDp2Ao4wx4LFwmIkJpVdFdn2763YWLy9ENIZg== + version "1.4.136" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.136.tgz#b6a3595a9c29d6d8f60e092d40ac24f997e4e7ef" + integrity sha512-GnITX8rHnUrIVnTxU9UlsTnSemHUA2iF+6QrRqxFbp/mf0vfuSc/goEyyQhUX3TUUCE3mv/4BNuXOtaJ4ur0eA== element-resize-detector@^1.2.2: version "1.2.4" @@ -8090,17 +8071,19 @@ 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, es-abstract@^1.19.2: - version "1.19.5" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.5.tgz#a2cb01eb87f724e815b278b0dd0d00f36ca9a7f1" - integrity sha512-Aa2G2+Rd3b6kxEUKTF4TaW67czBLyAv3z7VOhYRU50YBx+bbsYZ9xQP4lMNazePuFlybXI0V4MruPos7qUo5fA== +es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5: + version "1.20.0" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.0.tgz#b2d526489cceca004588296334726329e0a6bfb6" + integrity sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" + function.prototype.name "^1.1.5" get-intrinsic "^1.1.1" get-symbol-description "^1.0.0" has "^1.0.3" + has-property-descriptors "^1.0.0" has-symbols "^1.0.3" internal-slot "^1.0.3" is-callable "^1.2.4" @@ -8112,9 +8095,10 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19 object-inspect "^1.12.0" object-keys "^1.1.1" object.assign "^4.1.2" - string.prototype.trimend "^1.0.4" - string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.1" + regexp.prototype.flags "^1.4.1" + string.prototype.trimend "^1.0.5" + string.prototype.trimstart "^1.0.5" + unbox-primitive "^1.0.2" es-array-method-boxes-properly@^1.0.0: version "1.0.0" @@ -8157,9 +8141,9 @@ es-to-primitive@^1.2.1: is-symbol "^1.0.2" es5-shim@^4.5.13: - version "4.6.6" - resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.6.6.tgz#1e0e95bedfdcd933a2d4931a3ac6c79164f18de6" - integrity sha512-Ay5QQE78I2WKUoZVZjL0AIuiIjsmXwZGkyCTH9+n6J1anPbb0ymDA27ASa2Lt0rhOpAlEKy2W0d17gJ1XOQ5eQ== + version "4.6.7" + resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.6.7.tgz#bc67ae0fc3dd520636e0a1601cc73b450ad3e955" + integrity sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ== es6-error@^4.0.1: version "4.1.1" @@ -8586,9 +8570,9 @@ expect@^27.5.1: jest-message-util "^27.5.1" express@^4.17.1, express@^4.17.3: - version "4.18.0" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.0.tgz#7a426773325d0dd5406395220614c0db10b6e8e2" - integrity sha512-EJEXxiTQJS3lIPrU1AE2vRuT7X7E+0KBbpm5GSoK524yl0K8X+er8zS2P14E64eqsVNoWbMCT7MpmQ+ErAhgRg== + version "4.18.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf" + integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q== dependencies: accepts "~1.3.8" array-flatten "1.1.1" @@ -8952,9 +8936,9 @@ flux@^4.0.1: fbjs "^3.0.1" follow-redirects@^1.0.0, follow-redirects@^1.14.7: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" - integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== + version "1.15.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4" + integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ== for-in@^1.0.2: version "1.0.2" @@ -9125,7 +9109,7 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -function.prototype.name@^1.1.0: +function.prototype.name@^1.1.0, function.prototype.name@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== @@ -10941,18 +10925,18 @@ jest-message-util@^27.5.1: slash "^3.0.0" stack-utils "^2.0.3" -jest-message-util@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.0.2.tgz#f3cf36be72be4c4c4058cb34bd6673996d26dee3" - integrity sha512-knK7XyojvwYh1XiF2wmVdskgM/uN11KsjcEWWHfnMZNEdwXCrqB4sCBO94F4cfiAwCS8WFV6CDixDwPlMh/wdA== +jest-message-util@^28.1.0: + version "28.1.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-28.1.0.tgz#7e8f0b9049e948e7b94c2a52731166774ba7d0af" + integrity sha512-RpA8mpaJ/B2HphDMiDlrAZdDytkmwFqgjDZovM21F35lHGeUeCvYmm6W+sbQ0ydaLpg5bFAUuWG1cjqOl8vqrw== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^28.0.2" + "@jest/types" "^28.1.0" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.9" micromatch "^4.0.4" - pretty-format "^28.0.2" + pretty-format "^28.1.0" slash "^3.0.0" stack-utils "^2.0.3" @@ -11132,12 +11116,12 @@ jest-util@^27.0.0, jest-util@^27.5.1: graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-util@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.0.2.tgz#8e22cdd6e0549e0a393055f0e2da7eacc334b143" - integrity sha512-EVdpIRCC8lzqhp9A0u0aAKlsFIzufK6xKxNK7awsnebTdOP4hpyQW5o6Ox2qPl8gbeUKYF+POLyItaND53kpGA== +jest-util@^28.1.0: + version "28.1.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.0.tgz#d54eb83ad77e1dd441408738c5a5043642823be5" + integrity sha512-qYdCKD77k4Hwkose2YBEqQk7PzUf/NSE+rutzceduFveQREeH6b+89Dc9+wjX9dAwHcgdx4yedGA3FQlU/qCTA== dependencies: - "@jest/types" "^28.0.2" + "@jest/types" "^28.1.0" "@types/node" "*" chalk "^4.0.0" ci-info "^3.2.0" @@ -11183,17 +11167,17 @@ jest-watcher@^27.5.1: string-length "^4.0.1" jest-watcher@^28.0.0: - version "28.0.2" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.0.2.tgz#649fa24df531d4071be5784b6274d494d788c88b" - integrity sha512-uIVJLpQ/5VTGQWBiBatHsi7jrCqHjHl0e0dFHMWzwuIfUbdW/muk0DtSr0fteY2T7QTFylv+7a5Rm8sBKrE12Q== + version "28.1.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-28.1.0.tgz#aaa7b4164a4e77eeb5f7d7b25ede5e7b4e9c9aaf" + integrity sha512-tNHMtfLE8Njcr2IRS+5rXYA4BhU90gAOwI9frTGOqd+jX0P/Au/JfRSNqsf5nUTcWdbVYuLxS1KjnzILSoR5hA== dependencies: - "@jest/test-result" "^28.0.2" - "@jest/types" "^28.0.2" + "@jest/test-result" "^28.1.0" + "@jest/types" "^28.1.0" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" emittery "^0.10.2" - jest-util "^28.0.2" + jest-util "^28.1.0" string-length "^4.0.1" jest-worker@^26.2.1, jest-worker@^26.5.0, jest-worker@^26.6.2: @@ -11398,9 +11382,9 @@ jstat@^1.9.5: integrity sha512-cWnp4vObF5GmB2XsIEzxI/1ZTcYlcfNqxQ/9Fp5KFUa0Jf/4tO0ZkGVnqoEHDisJvYgvn5n3eWZbd2xTVJJPUQ== "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1: - version "3.2.2" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.2.tgz#6ab1e52c71dfc0c0707008a91729a9491fe9f76c" - integrity sha512-HDAyJ4MNQBboGpUnHAVUNJs6X0lh058s6FuixsFGP7MgJYpD6Vasd6nzSG5iIfXu1zAYlHJ/zsOKNlrenTUBnw== + version "3.3.0" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz#e624f259143b9062c92b6413ff92a164c80d3ccb" + integrity sha512-XzO9luP6L0xkxwhIJMTJQpZo/eeN60K08jHdexfD569AGxeNug6UketeHXEhROoM8aR7EcUoOQmIhcJQjcuq8Q== dependencies: array-includes "^3.1.4" object.assign "^4.1.2" @@ -11828,11 +11812,12 @@ markdown-to-jsx@^7.1.3: integrity sha512-VI3TyyHlGkO8uFle0IOibzpO1c1iJDcXcS/zBrQrXQQvJ2tpdwVzVZ7XdKsyRz1NdRmre4dqQkMZzUHaKIG/1w== 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== + version "10.5.1" + resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-10.5.1.tgz#7b495f96a624dab8f91878b2a2eff7c75e9e48da" + integrity sha512-xfVDhVB53HqogiSG+4NWAWW9Y3jiItuJv4G/8DC0sU8Qy31P+Pgr8yCzS074i2ZnEd3ekwzn30mdj1GOmNHHaw== dependencies: "@babel/runtime" "^7.17.9" + "@types/mocha" "^9.1.1" complex.js "^2.1.1" decimal.js "^10.3.1" escape-latex "^1.2.0" @@ -12273,12 +12258,7 @@ nano-css@^5.3.1: stacktrace-js "^2.0.2" stylis "^4.0.6" -nanoid@^3.1.23: - version "3.3.3" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" - integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== - -nanoid@^3.3.3: +nanoid@^3.1.23, nanoid@^3.3.3: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== @@ -12602,12 +12582,12 @@ object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0 es-abstract "^1.19.1" object.hasown@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5" - integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.1.tgz#ad1eecc60d03f49460600430d97f23882cf592a3" + integrity sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A== dependencies: - define-properties "^1.1.3" - es-abstract "^1.19.1" + define-properties "^1.1.4" + es-abstract "^1.19.5" object.pick@^1.3.0: version "1.3.0" @@ -13629,9 +13609,9 @@ postcss-place@^7.0.4: postcss-value-parser "^4.2.0" postcss-preset-env@^7.0.1: - version "7.4.4" - resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.4.4.tgz#069e34e31e2a7345154da7936b9fc1fcbdbd6d43" - integrity sha512-MqzSEx/QsvOk562iV9mLTgIvLFEOq1os9QBQfkgnq8TW6yKhVFPGh0gdXSK5ZlmjuNQEga6/x833e86XZF/lug== + version "7.5.0" + resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.5.0.tgz#0c1f23933597d55dab4a90f61eda30b76e710658" + integrity sha512-0BJzWEfCdTtK2R3EiKKSdkE51/DI/BwnhlnicSW482Ym6/DGHud8K0wGLcdjip1epVX0HKo4c8zzTeV/SkiejQ== dependencies: "@csstools/postcss-color-function" "^1.1.0" "@csstools/postcss-font-format-keywords" "^1.0.0" @@ -13641,12 +13621,14 @@ postcss-preset-env@^7.0.1: "@csstools/postcss-normalize-display-values" "^1.0.0" "@csstools/postcss-oklab-function" "^1.1.0" "@csstools/postcss-progressive-custom-properties" "^1.3.0" - autoprefixer "^10.4.5" + "@csstools/postcss-stepped-value-functions" "^1.0.0" + "@csstools/postcss-unset-value" "^1.0.0" + autoprefixer "^10.4.6" browserslist "^4.20.3" css-blank-pseudo "^3.0.3" css-has-pseudo "^3.0.4" css-prefers-color-scheme "^6.0.3" - cssdb "^6.5.0" + cssdb "^6.6.1" postcss-attribute-case-insensitive "^5.0.0" postcss-clamp "^4.1.0" postcss-color-functional-notation "^4.2.2" @@ -13678,9 +13660,9 @@ postcss-preset-env@^7.0.1: postcss-value-parser "^4.2.0" postcss-pseudo-class-any-link@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.2.tgz#81ec491aa43f97f9015e998b7a14263b4630bdf0" - integrity sha512-76XzEQv3g+Vgnz3tmqh3pqQyRojkcJ+pjaePsyhcyf164p9aZsu3t+NWxkZYbcHLK1ju5Qmalti2jPI5IWCe5w== + version "7.1.3" + resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.3.tgz#0e4753518b9f6caa8b649c75b56e69e391d0c12f" + integrity sha512-I9Yp1VV2r8xFwg/JrnAlPCcKmutv6f6Ig6/CHFPqGJiDgYXM9C+0kgLfK4KOXbKNw+63QYl4agRUB0Wi9ftUIg== dependencies: postcss-selector-parser "^6.0.10" @@ -13830,10 +13812,10 @@ pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1: ansi-styles "^5.0.0" react-is "^17.0.1" -pretty-format@^28.0.2: - version "28.0.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.0.2.tgz#6a24d71cbb61a5e5794ba7513fe22101675481bc" - integrity sha512-UmGZ1IERwS3yY35LDMTaBUYI1w4udZDdJGGT/DqQeKG9ZLDn7/K2Jf/JtYSRiHCCKMHvUA+zsEGSmHdpaVp1yw== +pretty-format@^28.1.0: + version "28.1.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.0.tgz#8f5836c6a0dfdb834730577ec18029052191af55" + integrity sha512-79Z4wWOYCdvQkEoEuSlBhHJqWeZ8D8YRPiPctJFCtvuaClGpiwiQYSCUOE6IEKUbbFukKOTFIUAXE8N4EQTo1Q== dependencies: "@jest/schemas" "^28.0.2" ansi-regex "^5.0.1" @@ -14210,9 +14192,9 @@ rc-dropdown@~3.5.0: rc-util "^5.17.0" rc-field-form@~1.26.1: - version "1.26.3" - resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.26.3.tgz#4050000eae0d879fde85672a965c9558ed6ff04b" - integrity sha512-wzQToAwdr8fiq/Nb1KFq+9WYFeALJXKwNGk5/MaCu1AUS7PpVQaN2anzVfWdVBFiiM2N+3DOh64JSOH8s1w3FQ== + version "1.26.4" + resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.26.4.tgz#78553e0f317f0ed7ceea70b1b89d43865dddeb83" + integrity sha512-eCCyiNNaN0NTYTyoziQHD4Fj6mUED21lWkw66vg+kttg0eDw+miD6LsaJbTD5c2bzKjUJTf10AitPG+f5zT4+A== dependencies: "@babel/runtime" "^7.8.4" async-validator "^4.1.0" @@ -14238,18 +14220,18 @@ rc-input-number@~7.3.0: rc-util "^5.9.8" rc-input@~0.0.1-alpha.5: - version "0.0.1-alpha.6" - resolved "https://registry.yarnpkg.com/rc-input/-/rc-input-0.0.1-alpha.6.tgz#b9bcfb41251ca07aa183c03a3574fbc14fa2e426" - integrity sha512-kgpmbxa9vp6kPLW7IP5/Lf6wuaMq+pUq+dPz98vIM58h4wkEKgBQlkMIg9OCEVQIiR8rEPEoe4dO2fc9R0aypQ== + version "0.0.1-alpha.7" + resolved "https://registry.yarnpkg.com/rc-input/-/rc-input-0.0.1-alpha.7.tgz#53e3f13871275c21d92b51f80b698f389ad45dd3" + integrity sha512-eozaqpCYWSY5LBMwlHgC01GArkVEP+XlJ84OMvdkwUnJBSv83Yxa15pZpn7vACAj84uDC4xOA2CoFdbLuqB08Q== dependencies: "@babel/runtime" "^7.11.1" classnames "^2.2.1" rc-util "^5.18.1" rc-mentions@~1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.7.0.tgz#717be883e92b9085df900ab5a3ffab7379247bfa" - integrity sha512-d3tZWCQIseQrn5ZpnUuaeKTQctgGwVzcEUVpVswxvnsLB1/e2H12xHzVqH87AvPkHMs9m3oFZINbuC5Qxevv6g== + version "1.7.1" + resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.7.1.tgz#480ad04af4460ee01b6ccd9137fcea23067aa9be" + integrity sha512-JbCS9bTqt6BYN2vfTPythlScLuc42rIlX85n7975RnkfawXlJjskHOlR3o8EpD4asl4KuA2jKTy0dj39DtSVqg== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" @@ -14272,9 +14254,9 @@ rc-menu@~9.5.1, rc-menu@~9.5.5: shallowequal "^1.1.0" rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motion@^2.4.3, rc-motion@^2.4.4, rc-motion@^2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.5.1.tgz#3eceb7d891079c0f67a72639d30e168b91839e03" - integrity sha512-h3GKMjFJkK+4z6fNfVlIMrb7WFCZsreivVvHOBb38cKcpKDx5g3kpHwn5Ekbo1+g0nnC02Dtap2trfCAPGxllw== + version "2.6.0" + resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.6.0.tgz#c60c3e7f15257f55a8cd7794a539f0e2cc751399" + integrity sha512-1MDWA9+i174CZ0SIDenSYm2Wb9YbRkrexjZWR0CUFu7D6f23E8Y0KsTgk9NGOLJsGak5ELZK/Y5lOlf5wQdzbw== dependencies: "@babel/runtime" "^7.11.1" classnames "^2.2.1" @@ -14350,10 +14332,10 @@ rc-resize-observer@^1.0.0, rc-resize-observer@^1.1.0, rc-resize-observer@^1.2.0: rc-util "^5.15.0" resize-observer-polyfill "^1.5.1" -rc-segmented@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/rc-segmented/-/rc-segmented-2.0.0.tgz#209b55bec85c1a8b1821c30e62d3ebef4da04b52" - integrity sha512-YsdS+aP7E6ZMEY35WSlewJIsrjPbBSP4X/7RvZtzLExKDZwFvXdCPCbWFVDNks4jOYY9TUPYt7qlVifEu9/zXA== +"rc-segmented@~2.1.0 ": + version "2.1.0" + resolved "https://registry.yarnpkg.com/rc-segmented/-/rc-segmented-2.1.0.tgz#0e0afe646c1a0e44a0e18785f518c42633ec8efc" + integrity sha512-hUlonro+pYoZcwrH6Vm56B2ftLfQh046hrwif/VwLIw1j3zGt52p5mREBwmeVzXnSwgnagpOpfafspzs1asjGw== dependencies: "@babel/runtime" "^7.11.1" classnames "^2.2.1" @@ -14361,9 +14343,9 @@ rc-segmented@~2.0.0: rc-util "^5.17.0" rc-select@~14.1.0, rc-select@~14.1.1: - version "14.1.1" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.1.1.tgz#87a51ce515aba5cfa083ae0f5be15e7c550ad93f" - integrity sha512-l2TSSy/rwvfob0SmQ0sPQ1pUMUq65u6U4Y9lc9dvQOMSMzDSga4b3tEgIgzN1YKzakV65wGXMOBVecjixPEZ4Q== + version "14.1.2" + resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.1.2.tgz#59a73726ef82a87b174ed0784cddfccc7e797e4b" + integrity sha512-/QgarL/T/d7MIPcoRmTca2TWHBoHBM1EQIgdaFmvl3qsYRSbrb8NpWcQuJoc9fprXERWxdYSTUThQObHvdEVBQ== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -15436,9 +15418,9 @@ rollup-plugin-terser@^7.0.0: terser "^5.0.0" rollup@^2.43.1: - version "2.70.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.70.2.tgz#808d206a8851628a065097b7ba2053bd83ba0c0d" - integrity sha512-EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg== + version "2.72.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.72.0.tgz#f94280b003bcf9f2f1f2594059a9db5abced371e" + integrity sha512-KqtR2YcO35/KKijg4nx4STO3569aqCUeGRkKWnJ6r+AvBBrVY9L4pmf4NHVrQr4mTOq6msbohflxr2kpihhaOA== optionalDependencies: fsevents "~2.3.2" @@ -16342,21 +16324,23 @@ string.prototype.padstart@^3.0.0: define-properties "^1.1.3" es-abstract "^1.19.1" -string.prototype.trimend@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" - integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== +string.prototype.trimend@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0" + integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" + define-properties "^1.1.4" + es-abstract "^1.19.5" -string.prototype.trimstart@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" - integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== +string.prototype.trimstart@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef" + integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" + define-properties "^1.1.4" + es-abstract "^1.19.5" string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" @@ -17143,7 +17127,7 @@ uglify-js@^3.1.4: resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.4.tgz#fa95c257e88f85614915b906204b9623d4fa340d" integrity sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA== -unbox-primitive@^1.0.1: +unbox-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== @@ -18644,9 +18628,9 @@ ws@^7.3.1, ws@^7.4.6: integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== ws@^8.2.3, ws@^8.4.2: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== + version "8.6.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23" + integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw== xdg-basedir@^4.0.0: version "4.0.0" From 28cb6b9c8832da66a4c46c2bf14e040591e3d0dd Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 6 May 2022 15:09:00 -0400 Subject: [PATCH 045/340] Final cleanup, but typescript is still borked Value: [1e-8 to 1e-6] --- .../Distributions/KlDivergence_test.res | 3 -- .../__tests__/Distributions/Scale_test.res | 30 ++++++++++++------- .../Distributions/PointSetDist/Continuous.res | 11 ------- .../src/rescript/Utility/XYShape.res | 6 ++-- packages/squiggle-lang/tsconfig.json | 7 ++++- 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index 7d7def74..92786950 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -47,9 +47,6 @@ describe("kl divergence", () => { (stdev2 ** 2.0 +. (mean2 -. mean1) ** 2.0) /. (2.0 *. stdev1 ** 2.0) -. 0.5 let kl = E.R.liftJoin2(klDivergence, prediction, answer) - // Js.Console.log2("Analytical: ", analyticalKl) - // Js.Console.log2("Computed: ", kl) - switch kl { | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) | Error(err) => { diff --git a/packages/squiggle-lang/__tests__/Distributions/Scale_test.res b/packages/squiggle-lang/__tests__/Distributions/Scale_test.res index 85622308..d15a0c30 100644 --- a/packages/squiggle-lang/__tests__/Distributions/Scale_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/Scale_test.res @@ -3,17 +3,25 @@ open Expect open TestHelpers describe("Scale logarithm", () => { - // test("mean of the base e scalar logarithm of an exponential(10)", () => { - // let rate = 10.0 - // let scalelog = DistributionOperation.Constructors.scaleLogarithm(~env, mkExponential(rate), MagicNumbers.Math.e) - // - // let meanResult = E.R2.bind(DistributionOperation.Constructors.mean(~env), scalelog) - // let meanAnalytical = Js.Math.log(rate /. MagicNumbers.Math.e) - // switch meanResult { - // | Ok(meanValue) => meanValue -> expect -> toBeCloseTo(meanAnalytical) - // | Error(err) => err -> expect -> toBe(DistributionTypes.OperationError(DivisionByZeroError)) - // } - // }) + /* These tests may not be important, because scalelog isn't normalized + The first one may be failing for a number of reasons. + */ + Skip.test("mean of the base e scalar logarithm of an exponential(10)", () => { + let rate = 10.0 + let scalelog = DistributionOperation.Constructors.scaleLogarithm( + ~env, + mkExponential(rate), + MagicNumbers.Math.e, + ) + + let meanResult = E.R2.bind(DistributionOperation.Constructors.mean(~env), scalelog) + // expected value of log of exponential distribution. + let meanAnalytical = Js.Math.log(rate) +. 1.0 + switch meanResult { + | Ok(meanValue) => meanValue->expect->toBeCloseTo(meanAnalytical) + | Error(err) => err->expect->toBe(DistributionTypes.OperationError(DivisionByZeroError)) + } + }) let low = 10.0 let high = 100.0 let scalelog = DistributionOperation.Constructors.scaleLogarithm(~env, mkUniform(low, high), 2.0) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 6b2c8ead..3aca0c66 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -271,17 +271,6 @@ module T = Dist({ let variance = (t: t): float => XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) - // let klDivergence0 = (prediction: t, answer: t) => { - // combinePointwise( - // ~combiner=XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument, - // PointSetDist_Scoring.KLDivergence.integrand, - // prediction, - // answer, - // ) - // |> E.R.fmap(shapeMap(XYShape.T.filterYValues(Js.Float.isFinite))) - // |> E.R.fmap(integralEndY) - // } - let klDivergence = (prediction: t, answer: t) => { let newShape = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument( PointSetDist_Scoring.KLDivergence.integrand, diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 295865f8..840729f2 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -390,7 +390,9 @@ module PointwiseCombination = { } `) - // This function is used for kl divergence + /* + This is from an approach to kl divergence that was ultimately rejected. Leaving it in for now because it may help us factor `combine` out of raw javascript soon. + */ let combineAlongSupportOfSecondArgument0: ( (float, float) => result, interpolator, @@ -450,7 +452,6 @@ module PointwiseCombination = { } | None => () } - // Js.Console.log(newYs) } T.filterOkYs(newXs, newYs)->Ok } @@ -489,6 +490,7 @@ module PointwiseCombination = { result } + // This function is used for klDivergence let combineAlongSupportOfSecondArgument: ( (float, float) => result, T.t, diff --git a/packages/squiggle-lang/tsconfig.json b/packages/squiggle-lang/tsconfig.json index 7a610d10..2ac0d8bf 100644 --- a/packages/squiggle-lang/tsconfig.json +++ b/packages/squiggle-lang/tsconfig.json @@ -15,5 +15,10 @@ }, "target": "ES6", "include": ["src/**/*"], - "exclude": ["node_modules", "**/*.spec.ts", "webpack.config.js"] + "exclude": [ + "../../node_modules", + "node_modules", + "**/*.spec.ts", + "webpack.config.js" + ] } From 2b7e5b8245d18c8b899d589296b2278ae948536a Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 6 May 2022 15:19:09 -0400 Subject: [PATCH 046/340] `skipLibCheck: true` (Needed for `mocha` transitive dependency build failure) Value: [1e-6 to 1e-4] --- packages/squiggle-lang/tsconfig.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/squiggle-lang/tsconfig.json b/packages/squiggle-lang/tsconfig.json index 2ac0d8bf..ca34ebec 100644 --- a/packages/squiggle-lang/tsconfig.json +++ b/packages/squiggle-lang/tsconfig.json @@ -11,14 +11,10 @@ "outDir": "./dist", "declarationDir": "./dist", "declaration": true, - "composite": true + "composite": true, + "skipLibCheck": true }, "target": "ES6", "include": ["src/**/*"], - "exclude": [ - "../../node_modules", - "node_modules", - "**/*.spec.ts", - "webpack.config.js" - ] + "exclude": ["node_modules", "**/*.spec.ts", "webpack.config.js"] } From 7337af7faf3b7dc6b1f68cdee15433eaa6f23786 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 6 May 2022 15:22:56 -0400 Subject: [PATCH 047/340] un-`^` the `mathjs` version; un `skipLibCheck` the `tsconfig.json` Value: [1e-6 t o1e-4] --- packages/squiggle-lang/package.json | 2 +- packages/squiggle-lang/tsconfig.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 97b710b6..6cbb4906 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -38,7 +38,7 @@ "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", diff --git a/packages/squiggle-lang/tsconfig.json b/packages/squiggle-lang/tsconfig.json index ca34ebec..7a610d10 100644 --- a/packages/squiggle-lang/tsconfig.json +++ b/packages/squiggle-lang/tsconfig.json @@ -11,8 +11,7 @@ "outDir": "./dist", "declarationDir": "./dist", "declaration": true, - "composite": true, - "skipLibCheck": true + "composite": true }, "target": "ES6", "include": ["src/**/*"], From aff2c622f7fc02022f236a6ed6dfecbb919b0ab4 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 6 May 2022 15:24:01 -0400 Subject: [PATCH 048/340] reset lockfile after un-`^`-ing `mathjs` version Value: [1e-7 to 1e-4] --- yarn.lock | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/yarn.lock b/yarn.lock index 28cc8599..41d250d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4081,11 +4081,6 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== -"@types/mocha@^9.1.1": - version "9.1.1" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.1.tgz#e7c4f1001eefa4b8afbd1eee27a237fee3bf29c4" - integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw== - "@types/node-fetch@^2.5.7": version "2.6.1" resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975" @@ -11811,13 +11806,12 @@ 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: - version "10.5.1" - resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-10.5.1.tgz#7b495f96a624dab8f91878b2a2eff7c75e9e48da" - integrity sha512-xfVDhVB53HqogiSG+4NWAWW9Y3jiItuJv4G/8DC0sU8Qy31P+Pgr8yCzS074i2ZnEd3ekwzn30mdj1GOmNHHaw== +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== dependencies: "@babel/runtime" "^7.17.9" - "@types/mocha" "^9.1.1" complex.js "^2.1.1" decimal.js "^10.3.1" escape-latex "^1.2.0" From 2860f28e3219de3d5caf0b61250453094fe22f87 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Mon, 9 May 2022 14:18:50 +0000 Subject: [PATCH 049/340] Merge bindings function Value: [0.0001 to 0.005] --- packages/components/src/index.ts | 2 ++ packages/squiggle-lang/__tests__/TS/JS_test.ts | 18 +++++++++++++++++- packages/squiggle-lang/src/js/index.ts | 12 +++++++++--- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts index ffd9c8e0..a35b28bb 100644 --- a/packages/components/src/index.ts +++ b/packages/components/src/index.ts @@ -9,3 +9,5 @@ import SquigglePlayground, { renderSquigglePlaygroundToDom, } from "./components/SquigglePlayground"; export { SquigglePlayground, renderSquigglePlaygroundToDom }; + +export { mergeBindings } from "@quri/squiggle-lang"; diff --git a/packages/squiggle-lang/__tests__/TS/JS_test.ts b/packages/squiggle-lang/__tests__/TS/JS_test.ts index 76871fc8..8d2d5a1c 100644 --- a/packages/squiggle-lang/__tests__/TS/JS_test.ts +++ b/packages/squiggle-lang/__tests__/TS/JS_test.ts @@ -1,4 +1,9 @@ -import { Distribution, resultMap, defaultBindings } from "../../src/js/index"; +import { + Distribution, + resultMap, + defaultBindings, + mergeBindings, +} from "../../src/js/index"; import { testRun, testRunPartial } from "./TestHelpers"; function Ok(x: b) { @@ -66,6 +71,17 @@ describe("Partials", () => { value: 10, }); }); + test("Can merge bindings from three partials", () => { + let bindings1 = testRunPartial(`x = 1`); + let bindings2 = testRunPartial(`y = 2`); + let bindings3 = testRunPartial(`z = 3`); + expect( + testRun(`x + y + z`, mergeBindings([bindings1, bindings2, bindings3])) + ).toEqual({ + tag: "number", + value: 6, + }); + }); }); describe("JS Imports", () => { diff --git a/packages/squiggle-lang/src/js/index.ts b/packages/squiggle-lang/src/js/index.ts index 589548e3..961d4935 100644 --- a/packages/squiggle-lang/src/js/index.ts +++ b/packages/squiggle-lang/src/js/index.ts @@ -48,7 +48,7 @@ export function run( let i = imports ? imports : defaultImports; let e = environment ? environment : defaultEnvironment; let res: result = evaluateUsingOptions( - { externalBindings: mergeImports(b, i), environment: e }, + { externalBindings: mergeImportsWithBindings(b, i), environment: e }, squiggleString ); return resultMap(res, (x) => createTsExport(x, e)); @@ -67,12 +67,12 @@ export function runPartial( return evaluatePartialUsingExternalBindings( squiggleString, - mergeImports(b, i), + mergeImportsWithBindings(b, i), e ); } -function mergeImports( +function mergeImportsWithBindings( bindings: externalBindings, imports: jsImports ): externalBindings { @@ -90,6 +90,12 @@ type jsImports = { [key: string]: jsValue }; export let defaultImports: jsImports = {}; export let defaultBindings: externalBindings = {}; +export function mergeBindings( + allBindings: externalBindings[] +): externalBindings { + return allBindings.reduce((acc, x) => ({ ...acc, ...x })); +} + function createTsExport( x: expressionValue, environment: environment From de142e4a655a7265206bb14f0bc78b532f7bf424 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 May 2022 14:33:42 +0000 Subject: [PATCH 050/340] :arrow_up: Bump @types/react from 18.0.8 to 18.0.9 Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.0.8 to 18.0.9. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 91b78c1d..d770758b 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -32,7 +32,7 @@ "@types/jest": "^27.5.0", "@types/lodash": "^4.14.182", "@types/node": "^17.0.31", - "@types/react": "^18.0.3", + "@types/react": "^18.0.9", "@types/react-dom": "^18.0.2", "@types/styled-components": "^5.1.24", "@types/webpack": "^5.28.0", diff --git a/yarn.lock b/yarn.lock index 2a70176e..03c121b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4215,10 +4215,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.1", "@types/react@^18.0.3": - version "18.0.8" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.8.tgz#a051eb380a9fbcaa404550543c58e1cf5ce4ab87" - integrity sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw== +"@types/react@*", "@types/react@^18.0.1", "@types/react@^18.0.9": + version "18.0.9" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" + integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" From 06352357a230111cf75ebc66de8c37f592f4a58b Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 9 May 2022 11:14:33 -0400 Subject: [PATCH 051/340] response to CR Value: [1e-5 to 5e-3] --- .../Distributions/KlDivergence_test.res | 6 ++- .../PointSetDist/PointSetDist.res | 8 +--- .../src/rescript/Utility/Operation.res | 2 + .../src/rescript/Utility/XYShape.res | 45 +------------------ 4 files changed, 10 insertions(+), 51 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index 92786950..d9f98d8f 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -27,8 +27,11 @@ describe("kl divergence", () => { } }) } + // The pair on the right (the answer) can be wider than the pair on the left (the prediction), but not the other way around. testUniform(0.0, 1.0, -1.0, 2.0) - testUniform(0.0, 1.0, 0.0, 2.0) + testUniform(0.0, 1.0, 0.0, 2.0) // equal left endpoints + testUniform(0.0, 1.0, -1.0, 1.0) // equal rightendpoints + testUniform(0.0, 1e1, 0.0, 1e1) // equal (klDivergence = 0) // testUniform(-1.0, 1.0, 0.0, 2.0) test("of two normals is equal to the formula", () => { @@ -58,6 +61,7 @@ describe("kl divergence", () => { }) describe("combine along support test", () => { + // This tests the version of the function that we're NOT using. Haven't deleted the test in case we use the code later. test("combine along support test", _ => { let combineAlongSupportOfSecondArgument = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument0 let lowAnswer = 0.0 diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index c5cf466a..0a8d2987 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -199,13 +199,7 @@ module T = Dist({ let klDivergence = (t1: t, t2: t) => switch (t1, t2) { | (Continuous(t1), Continuous(t2)) => Continuous.T.klDivergence(t1, t2) - | (Discrete(t1), Discrete(t2)) => Discrete.T.klDivergence(t1, t2) - | (Mixed(t1), Mixed(t2)) => Mixed.T.klDivergence(t1, t2) - | _ => { - let t1' = toMixed(t1) - let t2' = toMixed(t2) - Mixed.T.klDivergence(t1', t2') - } + | _ => Error(NotYetImplemented) } }) diff --git a/packages/squiggle-lang/src/rescript/Utility/Operation.res b/packages/squiggle-lang/src/rescript/Utility/Operation.res index b9c1e088..cfa18925 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Operation.res +++ b/packages/squiggle-lang/src/rescript/Utility/Operation.res @@ -56,6 +56,7 @@ type operationError = | InfinityError | NegativeInfinityError | LogicallyInconsistentPathwayError + | NotYetImplemented // should be removed when `klDivergence` for mixed and discrete is implemented. @genType module Error = { @@ -69,6 +70,7 @@ module Error = { | InfinityError => "Operation returned positive infinity" | NegativeInfinityError => "Operation returned negative infinity" | LogicallyInconsistentPathwayError => "This pathway should have been logically unreachable" + | NotYetImplemented => "This pathway is not yet implemented" } } diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 840729f2..60d0bbde 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -440,9 +440,6 @@ module PointwiseCombination = { } else { i := i.contents + 1 None - // (0.0, 0.0, 0.0) // for the function I have in mind, this will error out - // exception PointwiseCombinationError - // raise(PointwiseCombinationError) } } switch someTuple { @@ -456,40 +453,6 @@ module PointwiseCombination = { T.filterOkYs(newXs, newYs)->Ok } - let approximatePdfOfContinuousDistributionAtPoint: (xyShape, float) => option = ( - distShape, - point, - ) => { - let closestFromBelowIndex = E.A.reducei(distShape.xs, None, (accumulator, item, index) => - item < point ? Some(index) : accumulator - ) // This could be made more efficient by taking advantage of the fact that these are ordered - let closestFromAboveIndexOption = Belt.Array.getIndexBy(distShape.xs, item => item > point) - - let weightedMean = ( - point: float, - closestFromBelow: float, - closestFromAbove: float, - valueclosestFromBelow, - valueclosestFromAbove, - ): float => { - let distance = closestFromAbove -. closestFromBelow - let w1 = (point -. closestFromBelow) /. distance - let w2 = (closestFromAbove -. point) /. distance - let result = w1 *. valueclosestFromAbove +. w2 *. valueclosestFromBelow - result - } - - let result = switch (closestFromBelowIndex, closestFromAboveIndexOption) { - | (None, None) => None // all are smaller, and all are larger - | (None, Some(_)) => Some(0.0) // none are smaller, all are larger - | (Some(_), None) => Some(0.0) // all are smaller, none are larger - | (Some(i), Some(j)) => - Some(weightedMean(point, distShape.xs[i], distShape.xs[j], distShape.ys[i], distShape.ys[j])) // there is a lowerBound and an upperBound. - } - - result - } - // This function is used for klDivergence let combineAlongSupportOfSecondArgument: ( (float, float) => result, @@ -498,12 +461,8 @@ module PointwiseCombination = { ) => result = (fn, prediction, answer) => { let combineWithFn = (answerX: float, i: int) => { let answerY = answer.ys[i] - let predictionY = approximatePdfOfContinuousDistributionAtPoint(prediction, answerX) - let wrappedResult = E.O.fmap(x => fn(x, answerY), predictionY) - switch wrappedResult { - | Some(x) => x - | None => Error(Operation.LogicallyInconsistentPathwayError) - } + let predictionY = XtoY.linear(answerX, prediction) + fn(predictionY, answerY) } let newYsWithError = Js.Array.mapi((x, i) => combineWithFn(x, i), answer.xs) let newYsOrError = E.A.R.firstErrorOrOpen(newYsWithError) From 814a5f2c58e3fa26295952194d163adc7790a7e2 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 9 May 2022 15:19:56 -0400 Subject: [PATCH 052/340] `mx` polymorphism Value: [1e-3 to 2e-2] --- .../ReducerInterface_GenericDistribution.res | 45 ++++++++++++------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 1175767d..fc1c7f28 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -120,24 +120,39 @@ module Helpers = { } let mixture = (args: array): DistributionOperation.outputType => - switch E.A.last(args) { - | Some(EvArray(b)) => { - let weights = parseNumberArray(b) - let distributions = parseDistributionArray( - Belt.Array.slice(args, ~offset=0, ~len=E.A.length(args) - 1), - ) - switch E.R.merge(distributions, weights) { - | Ok(d, w) => mixtureWithGivenWeights(d, w) + switch args { + | [EvArray(distributions)] => + switch parseDistributionArray(distributions) { + | Ok(distrs) => mixtureWithDefaultWeights(distrs) + | Error(err) => err->ArgumentError->GenDistError + } + | [EvArray(distributions), EvArray(weights)] => + switch (parseDistributionArray(distributions), parseNumberArray(weights)) { + | (Ok(distrs), Ok(wghts)) => mixtureWithGivenWeights(distrs, wghts) + | (Error(err), Ok(_)) => err->ArgumentError->GenDistError + | (Ok(_), Error(err)) => err->ArgumentError->GenDistError + | (Error(err1), Error(err2)) => `${err1}|${err2}`->ArgumentError->GenDistError + } + | _ => + switch E.A.last(args) { + | Some(EvArray(b)) => { + let weights = parseNumberArray(b) + let distributions = parseDistributionArray( + Belt.Array.slice(args, ~offset=0, ~len=E.A.length(args) - 1), + ) + switch E.R.merge(distributions, weights) { + | Ok(d, w) => mixtureWithGivenWeights(d, w) + | Error(err) => GenDistError(ArgumentError(err)) + } + } + | Some(EvNumber(_)) + | Some(EvDistribution(_)) => + switch parseDistributionArray(args) { + | Ok(distributions) => mixtureWithDefaultWeights(distributions) | Error(err) => GenDistError(ArgumentError(err)) } + | _ => GenDistError(ArgumentError("Last argument of mx must be array or distribution")) } - | Some(EvNumber(_)) - | Some(EvDistribution(_)) => - switch parseDistributionArray(args) { - | Ok(distributions) => mixtureWithDefaultWeights(distributions) - | Error(err) => GenDistError(ArgumentError(err)) - } - | _ => GenDistError(ArgumentError("Last argument of mx must be array or distribution")) } } From aab6ac49406fb0116941aa86ae8213998067bad8 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Mon, 9 May 2022 19:21:54 +0000 Subject: [PATCH 053/340] Add an optional simple summary table --- .../src/components/DistributionChart.tsx | 87 +++++++++++++------ .../src/components/SquiggleEditor.tsx | 6 +- .../src/components/SquigglePlayground.tsx | 32 ++++--- 3 files changed, 85 insertions(+), 40 deletions(-) diff --git a/packages/components/src/components/DistributionChart.tsx b/packages/components/src/components/DistributionChart.tsx index f1bb9ce0..43702aaf 100644 --- a/packages/components/src/components/DistributionChart.tsx +++ b/packages/components/src/components/DistributionChart.tsx @@ -44,7 +44,7 @@ export const DistributionChart: React.FC = ({ shape.value.continuous.some((x) => x.x <= 0) || shape.value.discrete.some((x) => x.x <= 0); let spec = buildVegaSpec(isLogX, isExpY); - let widthProp = width ? width - 20 : size.width - 10; + let widthProp = width ? width : size.width; // Check whether we should disable the checkbox var logCheckbox = ( @@ -65,11 +65,11 @@ export const DistributionChart: React.FC = ({ } var result = ( -
+ @@ -80,7 +80,7 @@ export const DistributionChart: React.FC = ({
)} - + ); } else { var result = ( @@ -95,6 +95,12 @@ export const DistributionChart: React.FC = ({ return sized; }; +type ChartContainerProps = { width: string }; + +let ChartContainer = styled.div` + width: ${(props) => props.width}; +`; + function buildVegaSpec(isLogX: boolean, isExpY: boolean): VisualizationSpec { return { ...chartSpecification, @@ -141,10 +147,33 @@ type SummaryTableProps = { distribution: Distribution; }; -const Table = styled.table``; +const Table = styled.table` + margin-left: auto; + margin-right: auto; + border-collapse: collapse; + text-align: center; + border-style: hidden; +`; + +const TableHead = styled.thead` + border-bottom: 1px solid rgb(141 149 167); +`; + +const TableHeadCell = styled.th` + border-right: 1px solid rgb(141 149 167); + border-left: 1px solid rgb(141 149 167); + padding: 0.3em; +`; + +const TableBody = styled.tbody``; + const Row = styled.tr``; -const Cell = styled.td``; -const TableHeader = styled.th``; + +const Cell = styled.td` + padding: 0.3em; + border-right: 1px solid rgb(141 149 167); + border-left: 1px solid rgb(141 149 167); +`; const SummaryTable: React.FC = ({ distribution, @@ -179,26 +208,30 @@ const SummaryTable: React.FC = ({ return ( - - {"Mean"} - {"5%"} - {"10%"} - {"Q1 (25%)"} - {"Median (50%)"} - {"Q3 (75%)"} - {"90%"} - {"95%"} - - - {unwrapResult(mean)} - {unwrapResult(p5)} - {unwrapResult(p10)} - {unwrapResult(Q1)} - {unwrapResult(median)} - {unwrapResult(Q3)} - {unwrapResult(p90)} - {unwrapResult(p95)} - + + + {"Mean"} + {"5%"} + {"10%"} + {"25%"} + {"50%"} + {"75%"} + {"90%"} + {"95%"} + + + + + {unwrapResult(mean)} + {unwrapResult(p5)} + {unwrapResult(p10)} + {unwrapResult(Q1)} + {unwrapResult(median)} + {unwrapResult(Q3)} + {unwrapResult(p90)} + {unwrapResult(p95)} + +
); }; diff --git a/packages/components/src/components/SquiggleEditor.tsx b/packages/components/src/components/SquiggleEditor.tsx index 572dbd76..2601bc21 100644 --- a/packages/components/src/components/SquiggleEditor.tsx +++ b/packages/components/src/components/SquiggleEditor.tsx @@ -43,7 +43,9 @@ export interface SquiggleEditorProps { /** Whether to show detail about types of the returns, default false */ showTypes?: boolean; /** Whether to give users access to graph controls */ - showControls: boolean; + showControls?: boolean; + /** Whether to show a summary table */ + showSummary?: boolean; } const Input = styled.div` @@ -67,6 +69,7 @@ export let SquiggleEditor: React.FC = ({ jsImports = defaultImports, showTypes = false, showControls = false, + showSummary = false, }: SquiggleEditorProps) => { let [expression, setExpression] = React.useState(initialSquiggleString); return ( @@ -95,6 +98,7 @@ export let SquiggleEditor: React.FC = ({ jsImports={jsImports} showTypes={showTypes} showControls={showControls} + showSummary={showSummary} /> ); diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index 424cff8d..dd2b8ecf 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -40,18 +40,11 @@ function FieldFloat(Props: FieldFloatProps) { ); } -interface Props { - initialSquiggleString?: string; - height?: number; - showTypes?: boolean; - showControls?: boolean; -} - -interface Props2 { +interface ShowBoxProps { height: number; } -const ShowBox = styled.div` +const ShowBox = styled.div` border: 1px solid #eee; border-radius: 2px; height: ${(props) => props.height}; @@ -76,12 +69,26 @@ const Row = styled.div` `; const Col = styled.div``; -let SquigglePlayground: FC = ({ +interface PlaygroundProps { + /** The initial squiggle string to put in the playground */ + initialSquiggleString?: string; + /** How many pixels high is the playground */ + height?: number; + /** Whether to show the types of outputs in the playground */ + showTypes?: boolean; + /** Whether to show the log scale controls in the playground */ + showControls?: boolean; + /** Whether to show the summary table in the playground */ + showSummary?: boolean; +} + +let SquigglePlayground: FC = ({ initialSquiggleString = "", height = 300, showTypes = false, showControls = false, -}: Props) => { + showSummary = false, +}: PlaygroundProps) => { let [squiggleString, setSquiggleString] = useState(initialSquiggleString); let [sampleCount, setSampleCount] = useState(1000); let [outputXYPoints, setOutputXYPoints] = useState(1000); @@ -114,6 +121,7 @@ let SquigglePlayground: FC = ({ height={150} showTypes={showTypes} showControls={showControls} + showSummary={showSummary} /> @@ -122,7 +130,7 @@ let SquigglePlayground: FC = ({ ); }; export default SquigglePlayground; -export function renderSquigglePlaygroundToDom(props: Props) { +export function renderSquigglePlaygroundToDom(props: PlaygroundProps) { let parent = document.createElement("div"); ReactDOM.render(, parent); return parent; From 59edd7122e8c5a59d72d483e1b4bec257b1abb74 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 9 May 2022 15:24:46 -0400 Subject: [PATCH 054/340] wrapped error in function Value: [1e-5 to 1e-3] --- .../ReducerInterface_GenericDistribution.res | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index fc1c7f28..fa7be3be 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -119,19 +119,20 @@ module Helpers = { mixtureWithGivenWeights(distributions, weights) } - let mixture = (args: array): DistributionOperation.outputType => + let mixture = (args: array): DistributionOperation.outputType => { + let error = (err: string): DistributionOperation.outputType => err->ArgumentError->GenDistError switch args { | [EvArray(distributions)] => switch parseDistributionArray(distributions) { | Ok(distrs) => mixtureWithDefaultWeights(distrs) - | Error(err) => err->ArgumentError->GenDistError + | Error(err) => error(err) } | [EvArray(distributions), EvArray(weights)] => switch (parseDistributionArray(distributions), parseNumberArray(weights)) { | (Ok(distrs), Ok(wghts)) => mixtureWithGivenWeights(distrs, wghts) - | (Error(err), Ok(_)) => err->ArgumentError->GenDistError - | (Ok(_), Error(err)) => err->ArgumentError->GenDistError - | (Error(err1), Error(err2)) => `${err1}|${err2}`->ArgumentError->GenDistError + | (Error(err), Ok(_)) => error(err) + | (Ok(_), Error(err)) => error(err) + | (Error(err1), Error(err2)) => error(`${err1}|${err2}`) } | _ => switch E.A.last(args) { @@ -142,18 +143,19 @@ module Helpers = { ) switch E.R.merge(distributions, weights) { | Ok(d, w) => mixtureWithGivenWeights(d, w) - | Error(err) => GenDistError(ArgumentError(err)) + | Error(err) => error(err) } } | Some(EvNumber(_)) | Some(EvDistribution(_)) => switch parseDistributionArray(args) { | Ok(distributions) => mixtureWithDefaultWeights(distributions) - | Error(err) => GenDistError(ArgumentError(err)) + | Error(err) => error(err) } - | _ => GenDistError(ArgumentError("Last argument of mx must be array or distribution")) + | _ => error("Last argument of mx must be array or distribution") } } + } } module SymbolicConstructors = { From ca0965015119f6db377f681c6bba6db14661a8c8 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Mon, 9 May 2022 19:55:57 +0000 Subject: [PATCH 055/340] Fix number formatting for summary tables --- .../src/components/DistributionChart.tsx | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/components/src/components/DistributionChart.tsx b/packages/components/src/components/DistributionChart.tsx index 43702aaf..27dbf4b8 100644 --- a/packages/components/src/components/DistributionChart.tsx +++ b/packages/components/src/components/DistributionChart.tsx @@ -17,6 +17,7 @@ import { expYScale, } from "./DistributionVegaScales"; import styled from "styled-components"; +import { NumberShower } from "./NumberShower"; type DistributionChartProps = { distribution: Distribution; @@ -179,24 +180,18 @@ const SummaryTable: React.FC = ({ distribution, }: SummaryTableProps) => { let mean = distribution.mean(); - let median = distribution.inv(0.5); let p5 = distribution.inv(0.05); let p10 = distribution.inv(0.1); - let Q1 = distribution.inv(0.25); - let Q3 = distribution.inv(0.75); + let p25 = distribution.inv(0.25); + let p50 = distribution.inv(0.5); + let p75 = distribution.inv(0.75); let p90 = distribution.inv(0.9); let p95 = distribution.inv(0.95); let unwrapResult = ( x: result ): React.ReactNode => { if (x.tag === "Ok") { - return ( - - {Intl.NumberFormat("en-US", { maximumSignificantDigits: 3 }).format( - x.value - )} - - ); + return ; } else { return ( @@ -225,9 +220,9 @@ const SummaryTable: React.FC = ({ {unwrapResult(mean)} {unwrapResult(p5)} {unwrapResult(p10)} - {unwrapResult(Q1)} - {unwrapResult(median)} - {unwrapResult(Q3)} + {unwrapResult(p25)} + {unwrapResult(p50)} + {unwrapResult(p75)} {unwrapResult(p90)} {unwrapResult(p95)} From b2d80eef86062901db7915483b0219383fd089f3 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 9 May 2022 18:28:35 -0400 Subject: [PATCH 056/340] Removed negative infinity error handling Value: [1e-5 to 1e-3] --- .../Distributions/KlDivergence_test.res | 46 ++++++++++++++++++- .../PointSetDist/PointSetDist_Scoring.res | 3 +- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index d9f98d8f..bb21ba7f 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -2,7 +2,7 @@ open Jest open Expect open TestHelpers -describe("kl divergence", () => { +describe("kl divergence on continuous distributions", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) exception KlFailed @@ -60,6 +60,48 @@ describe("kl divergence", () => { }) }) +describe("kl divergence on discrete distributions", () => { + let klDivergence = DistributionOperation.Constructors.klDivergence(~env) + let mixture = a => DistributionTypes.DistributionOperation.Mixture(a) + exception KlFailed + exception MixtureFailed + let float1 = 1.0 + let float2 = 2.0 + let float3 = 3.0 + let point1 = mkDirac(float1) + let point2 = mkDirac(float2) + let point3 = mkDirac(float3) + test("finite kl divergence", () => { + let answer = [(point1, 1e0), (point2, 1e0)]->mixture->run + let prediction = [(point1, 1e0), (point2, 1e0), (point3, 1e0)]->mixture->run + let kl = switch (prediction, answer) { + | (Dist(prediction'), Dist(answer')) => klDivergence(prediction', answer') + | _ => raise(MixtureFailed) + } + let analyticalKl = Js.Math.log(2.0 /. 3.0) + switch kl { + | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) + | Error(err) => + Js.Console.log(DistributionTypes.Error.toString(err)) + raise(KlFailed) + } + }) + test("infinite kl divergence", () => { + let prediction = [(point1, 1e0), (point2, 1e0)]->mixture->run + let answer = [(point1, 1e0), (point2, 1e0), (point3, 1e0)]->mixture->run + let kl = switch (prediction, answer) { + | (Dist(prediction'), Dist(answer')) => klDivergence(prediction', answer') + | _ => raise(MixtureFailed) + } + switch kl { + | Ok(kl') => kl'->expect->toEqual(neg_infinity) + | Error(err) => + Js.Console.log(DistributionTypes.Error.toString(err)) + raise(KlFailed) + } + }) +}) + describe("combine along support test", () => { // This tests the version of the function that we're NOT using. Haven't deleted the test in case we use the code later. test("combine along support test", _ => { @@ -97,6 +139,7 @@ describe("combine along support test", () => { 2.0 *. MagicNumbers.Epsilon.ten, 1.0 -. MagicNumbers.Epsilon.ten, 1.0, + 1.0 +. MagicNumbers.Epsilon.ten, ], ys: [ -0.34657359027997264, @@ -104,6 +147,7 @@ describe("combine along support test", () => { -0.34657359027997264, -0.34657359027997264, -0.34657359027997264, + infinity, ], }), ), diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 70096d2a..e975dd5c 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -4,10 +4,9 @@ module KLDivergence = { float, Operation.Error.t, > => + // We decided that negative infinity, not an error at answerElement = 0.0, is a desirable value. if answerElement == 0.0 { Ok(0.0) - } else if predictionElement == 0.0 { - Error(Operation.NegativeInfinityError) } else { let quot = predictionElement /. answerElement quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(-.answerElement *. logFn(quot)) From ccd55ef8f1c7a1595e3756415f473ed945f4528b Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 9 May 2022 19:17:27 -0400 Subject: [PATCH 057/340] good evening, not working yet, but out of time for the night Value: [1e-6 to 1e-4] --- .../Distributions/KlDivergence_test.res | 8 +++--- .../squiggle-lang/__tests__/TestHelpers.res | 1 + .../Distributions/PointSetDist/Discrete.res | 26 ++++++++++++++----- .../PointSetDist/PointSetDist.res | 1 + 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index bb21ba7f..2ba5100e 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -19,7 +19,7 @@ describe("kl divergence on continuous distributions", () => { let analyticalKl = Js.Math.log((highPrediction -. lowPrediction) /. (highAnswer -. lowAnswer)) let kl = E.R.liftJoin2(klDivergence, prediction, answer) switch kl { - | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) + | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKl, ~digits=7) | Error(err) => { Js.Console.log(DistributionTypes.Error.toString(err)) raise(KlFailed) @@ -51,7 +51,7 @@ describe("kl divergence on continuous distributions", () => { let kl = E.R.liftJoin2(klDivergence, prediction, answer) switch kl { - | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) + | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKl, ~digits=3) | Error(err) => { Js.Console.log(DistributionTypes.Error.toString(err)) raise(KlFailed) @@ -78,9 +78,9 @@ describe("kl divergence on discrete distributions", () => { | (Dist(prediction'), Dist(answer')) => klDivergence(prediction', answer') | _ => raise(MixtureFailed) } - let analyticalKl = Js.Math.log(2.0 /. 3.0) + let analyticalKl = Js.Math.log(3.0 /. 2.0) switch kl { - | Ok(kl') => kl'->expect->toBeCloseTo(analyticalKl) + | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKl, ~digits=7) | Error(err) => Js.Console.log(DistributionTypes.Error.toString(err)) raise(KlFailed) diff --git a/packages/squiggle-lang/__tests__/TestHelpers.res b/packages/squiggle-lang/__tests__/TestHelpers.res index 54c4c814..21f3c51c 100644 --- a/packages/squiggle-lang/__tests__/TestHelpers.res +++ b/packages/squiggle-lang/__tests__/TestHelpers.res @@ -51,6 +51,7 @@ let mkExponential = rate => DistributionTypes.Symbolic(#Exponential({rate: rate} let mkUniform = (low, high) => DistributionTypes.Symbolic(#Uniform({low: low, high: high})) let mkCauchy = (local, scale) => DistributionTypes.Symbolic(#Cauchy({local: local, scale: scale})) let mkLognormal = (mu, sigma) => DistributionTypes.Symbolic(#Lognormal({mu: mu, sigma: sigma})) +let mkDirac = x => DistributionTypes.Symbolic(#Float(x)) let normalMake = SymbolicDist.Normal.make let betaMake = SymbolicDist.Beta.make diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 31694232..658b7dc9 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -229,11 +229,25 @@ module T = Dist({ } let klDivergence = (prediction: t, answer: t) => { - combinePointwise( - ~combiner=XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument0, - ~fn=PointSetDist_Scoring.KLDivergence.integrand, - prediction, - answer, - ) |> E.R2.bind(integralEndYResult) + let massOrZero = (t: t, x: float): float => { + let i = E.A.findIndex(x' => x' == x, t.xyShape.xs) + switch i { + | None => 0.0 + | Some(i') => t.xyShape.ys[i'] + } + } + let predictionNewYs = E.A.fmap(massOrZero(answer), prediction.xyShape.xs) + let integrand = XYShape.PointwiseCombination.combine( + PointSetDist_Scoring.KLDivergence.integrand, + XYShape.XtoY.continuousInterpolator(#Stepwise, #UseZero), + {XYShape.xs: answer.xyShape.xs, XYShape.ys: predictionNewYs}, + answer.xyShape, + ) + let xyShapeToDiscrete: XYShape.xyShape => t = xyShape => { + xyShape: xyShape, + integralSumCache: None, + integralCache: None, + } + integrand->E.R2.fmap(x => x->xyShapeToDiscrete->integralEndY) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index 0a8d2987..1879ebdd 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -199,6 +199,7 @@ module T = Dist({ let klDivergence = (t1: t, t2: t) => switch (t1, t2) { | (Continuous(t1), Continuous(t2)) => Continuous.T.klDivergence(t1, t2) + | (Discrete(t1), Discrete(t2)) => Discrete.T.klDivergence(t1, t2) | _ => Error(NotYetImplemented) } }) From 066346920869883be65fd28b1ca5eb75fd3a1926 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 May 2022 14:50:15 +0000 Subject: [PATCH 058/340] :arrow_up: Bump webpack from 5.72.0 to 5.72.1 Bumps [webpack](https://github.com/webpack/webpack) from 5.72.0 to 5.72.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.72.0...v5.72.1) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- packages/squiggle-lang/package.json | 2 +- yarn.lock | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index d770758b..b5f1ab7c 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -43,7 +43,7 @@ "tsconfig-paths-webpack-plugin": "^3.5.2", "typescript": "^4.6.3", "web-vitals": "^2.1.4", - "webpack": "^5.72.0", + "webpack": "^5.72.1", "webpack-cli": "^4.9.2", "webpack-dev-server": "^4.9.0" }, diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 6cbb4906..49dad58c 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -60,7 +60,7 @@ "ts-loader": "^9.3.0", "ts-node": "^10.7.0", "typescript": "^4.6.3", - "webpack": "^5.72.0", + "webpack": "^5.72.1", "webpack-cli": "^4.9.2" }, "source": "./src/js/index.ts", diff --git a/yarn.lock b/yarn.lock index 123a0842..a8181cd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8017,7 +8017,7 @@ enhanced-resolve@^4.5.0: memory-fs "^0.5.0" tapable "^1.0.0" -enhanced-resolve@^5.0.0, enhanced-resolve@^5.7.0, enhanced-resolve@^5.9.2: +enhanced-resolve@^5.0.0, enhanced-resolve@^5.7.0, enhanced-resolve@^5.9.3: version "5.9.3" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz#44a342c012cbc473254af5cc6ae20ebd0aae5d88" integrity sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow== @@ -11301,7 +11301,7 @@ json-parse-better-errors@^1.0.2: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== -json-parse-even-better-errors@^2.3.0: +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== @@ -18228,10 +18228,10 @@ webpack@4: watchpack "^1.7.4" webpack-sources "^1.4.1" -webpack@^5, webpack@^5.64.4, webpack@^5.72.0, webpack@^5.9.0: - version "5.72.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28" - integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w== +webpack@^5, webpack@^5.64.4, webpack@^5.72.0, webpack@^5.72.1, webpack@^5.9.0: + version "5.72.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.1.tgz#3500fc834b4e9ba573b9f430b2c0a61e1bb57d13" + integrity sha512-dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" @@ -18242,13 +18242,13 @@ webpack@^5, webpack@^5.64.4, webpack@^5.72.0, webpack@^5.9.0: acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.9.2" + enhanced-resolve "^5.9.3" es-module-lexer "^0.9.0" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" graceful-fs "^4.2.9" - json-parse-better-errors "^1.0.2" + json-parse-even-better-errors "^2.3.1" loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" From 15f1ebb4290de8c4ebc0f22f28866e7e99ae153f Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 11:27:59 -0400 Subject: [PATCH 059/340] KLDivergence on discretes is passing Value: [1e-3 to 2e-1] --- .../Distributions/KlDivergence_test.res | 12 ++++---- .../squiggle-lang/__tests__/TestHelpers.res | 2 +- .../Distributions/PointSetDist/Discrete.res | 28 ++++--------------- .../Distributions/PointSetDist/Mixed.res | 7 +++-- .../PointSetDist/PointSetDist_Scoring.res | 2 ++ 5 files changed, 19 insertions(+), 32 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index 2ba5100e..3ed1788b 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -68,9 +68,9 @@ describe("kl divergence on discrete distributions", () => { let float1 = 1.0 let float2 = 2.0 let float3 = 3.0 - let point1 = mkDirac(float1) - let point2 = mkDirac(float2) - let point3 = mkDirac(float3) + let point1 = mkDelta(float1) + let point2 = mkDelta(float2) + let point3 = mkDelta(float3) test("finite kl divergence", () => { let answer = [(point1, 1e0), (point2, 1e0)]->mixture->run let prediction = [(point1, 1e0), (point2, 1e0), (point3, 1e0)]->mixture->run @@ -94,7 +94,7 @@ describe("kl divergence on discrete distributions", () => { | _ => raise(MixtureFailed) } switch kl { - | Ok(kl') => kl'->expect->toEqual(neg_infinity) + | Ok(kl') => kl'->expect->toEqual(infinity) | Error(err) => Js.Console.log(DistributionTypes.Error.toString(err)) raise(KlFailed) @@ -102,9 +102,9 @@ describe("kl divergence on discrete distributions", () => { }) }) -describe("combine along support test", () => { +describe("combineAlongSupportOfSecondArgument", () => { // This tests the version of the function that we're NOT using. Haven't deleted the test in case we use the code later. - test("combine along support test", _ => { + test("test on two uniforms", _ => { let combineAlongSupportOfSecondArgument = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument0 let lowAnswer = 0.0 let highAnswer = 1.0 diff --git a/packages/squiggle-lang/__tests__/TestHelpers.res b/packages/squiggle-lang/__tests__/TestHelpers.res index 21f3c51c..71805c70 100644 --- a/packages/squiggle-lang/__tests__/TestHelpers.res +++ b/packages/squiggle-lang/__tests__/TestHelpers.res @@ -51,7 +51,7 @@ let mkExponential = rate => DistributionTypes.Symbolic(#Exponential({rate: rate} let mkUniform = (low, high) => DistributionTypes.Symbolic(#Uniform({low: low, high: high})) let mkCauchy = (local, scale) => DistributionTypes.Symbolic(#Cauchy({local: local, scale: scale})) let mkLognormal = (mu, sigma) => DistributionTypes.Symbolic(#Lognormal({mu: mu, sigma: sigma})) -let mkDirac = x => DistributionTypes.Symbolic(#Float(x)) +let mkDelta = x => DistributionTypes.Symbolic(#Float(x)) let normalMake = SymbolicDist.Normal.make let betaMake = SymbolicDist.Beta.make diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 658b7dc9..04265d7c 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -50,7 +50,7 @@ let combinePointwise = ( make( combiner(fn, XYShape.XtoY.discreteInterpolator, t1.xyShape, t2.xyShape)->E.R.toExn( - "Addition operation should never fail", + "Logically unreachable?", _, ), )->Ok @@ -163,7 +163,6 @@ module T = Dist({ } let integralEndY = (t: t) => t.integralSumCache |> E.O.default(t |> integral |> Continuous.lastY) - let integralEndYResult = (t: t) => t->integralEndY->Ok let minX = shapeFn(XYShape.T.minX) let maxX = shapeFn(XYShape.T.maxX) let toDiscreteProbabilityMassFraction = _ => 1.0 @@ -229,25 +228,10 @@ module T = Dist({ } let klDivergence = (prediction: t, answer: t) => { - let massOrZero = (t: t, x: float): float => { - let i = E.A.findIndex(x' => x' == x, t.xyShape.xs) - switch i { - | None => 0.0 - | Some(i') => t.xyShape.ys[i'] - } - } - let predictionNewYs = E.A.fmap(massOrZero(answer), prediction.xyShape.xs) - let integrand = XYShape.PointwiseCombination.combine( - PointSetDist_Scoring.KLDivergence.integrand, - XYShape.XtoY.continuousInterpolator(#Stepwise, #UseZero), - {XYShape.xs: answer.xyShape.xs, XYShape.ys: predictionNewYs}, - answer.xyShape, - ) - let xyShapeToDiscrete: XYShape.xyShape => t = xyShape => { - xyShape: xyShape, - integralSumCache: None, - integralCache: None, - } - integrand->E.R2.fmap(x => x->xyShapeToDiscrete->integralEndY) + combinePointwise( + ~fn=PointSetDist_Scoring.KLDivergence.integrand, + prediction, + answer, + )->E.R2.fmap(integralEndY) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 50cd8939..05465728 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -302,9 +302,10 @@ module T = Dist({ } let klDivergence = (prediction: t, answer: t) => { - combinePointwise(PointSetDist_Scoring.KLDivergence.integrand, prediction, answer) |> E.R.fmap( - integralEndY, - ) + Error(Operation.NotYetImplemented) + // combinePointwise(PointSetDist_Scoring.KLDivergence.integrand, prediction, answer) |> E.R.fmap( + // integralEndY, + // ) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index e975dd5c..b22883df 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -7,6 +7,8 @@ module KLDivergence = { // We decided that negative infinity, not an error at answerElement = 0.0, is a desirable value. if answerElement == 0.0 { Ok(0.0) + } else if predictionElement == 0.0 { + Ok(infinity) } else { let quot = predictionElement /. answerElement quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(-.answerElement *. logFn(quot)) From e058e315ad1af9139f351d1e0d0f74fdbeb52e28 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Tue, 10 May 2022 15:52:13 +0000 Subject: [PATCH 060/340] Function charting --- .../src/components/FunctionChart.tsx | 121 ++++++++++++------ .../src/components/SquiggleChart.tsx | 65 +++++----- .../src/components/SquiggleEditor.tsx | 35 ++--- .../src/components/SquigglePlayground.tsx | 24 +++- packages/squiggle-lang/src/js/index.ts | 37 ++++-- .../squiggle-lang/src/js/rescript_interop.ts | 21 +++ .../src/rescript/TypescriptInterface.res | 3 + 7 files changed, 202 insertions(+), 104 deletions(-) diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index ea00aa9c..8e5abf32 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -1,18 +1,24 @@ import * as React from "react"; import _ from "lodash"; import type { Spec } from "vega"; -import type { Distribution, errorValue, result } from "@quri/squiggle-lang"; +import { + Distribution, + result, + lambdaValue, + environment, + runForeign, + errorValueToString, +} from "@quri/squiggle-lang"; import { createClassFromSpec } from "react-vega"; import * as percentilesSpec from "../vega-specs/spec-percentiles.json"; import { DistributionChart } from "./DistributionChart"; +import { NumberShower } from "./NumberShower"; import { ErrorBox } from "./ErrorBox"; let SquigglePercentilesChart = createClassFromSpec({ spec: percentilesSpec as Spec, }); -type distPlusFn = (a: number) => result; - const _rangeByCount = (start: number, stop: number, count: number) => { const step = (stop - start) / (count - 1); const items = _.range(start, stop, step); @@ -27,51 +33,85 @@ function unwrap(x: result): a { throw Error("FAILURE TO UNWRAP"); } } +export type FunctionChartSettings = { + start: number; + stop: number; + count: number; +}; -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); +interface FunctionChartProps { + fn: lambdaValue; + chartSettings: FunctionChartSettings; + environment: environment; } -export const FunctionChart: React.FC<{ - distPlusFn: distPlusFn; - diagramStart: number; - diagramStop: number; - diagramCount: number; -}> = ({ distPlusFn, diagramStart, diagramStop, diagramCount }) => { +export const FunctionChart: React.FC = ({ + fn, + chartSettings, + environment, +}: FunctionChartProps) => { let [mouseOverlay, setMouseOverlay] = React.useState(0); - function handleHover(...args) { - setMouseOverlay(args[1]); + function handleHover(_name: string, value: unknown) { + setMouseOverlay(value as number); } function handleOut() { setMouseOverlay(NaN); } const signalListeners = { mousemove: handleHover, mouseout: handleOut }; - let mouseItem = distPlusFn(mouseOverlay); + let mouseItem = runForeign(fn, [mouseOverlay], environment); let showChart = - mouseItem.tag === "Ok" ? ( + mouseItem.tag === "Ok" && mouseItem.value.tag == "distribution" ? ( ) : ( <> ); - let data1 = _rangeByCount(diagramStart, diagramStop, diagramCount); - let valueData = mapFilter(data1, (x) => { - let result = distPlusFn(x); + let data1 = _rangeByCount( + chartSettings.start, + chartSettings.stop, + chartSettings.count + ); + type point = { x: number; value: result }; + let valueData: point[] = data1.map((x) => { + let result = runForeign(fn, [x], environment); if (result.tag === "Ok") { - return { x: x, value: result.value }; + if (result.value.tag == "distribution") { + return { x, value: { tag: "Ok", value: result.value.value } }; + } else { + return { + x, + value: { + tag: "Error", + value: + "Cannot currently render functions that don't return distributions", + }, + }; + } + } else { + return { + x, + value: { tag: "Error", value: errorValueToString(result.value) }, + }; } - }).map(({ x, value }) => { + }); + + let initialPartition: [ + { x: number; value: Distribution }[], + { x: number; value: string }[] + ] = [[], []]; + let [functionImage, errors] = valueData.reduce((acc, current) => { + if (current.value.tag === "Ok") { + acc[0].push({ x: current.x, value: current.value.value }); + } else { + acc[1].push({ x: current.x, value: current.value.value }); + } + return acc; + }, initialPartition); + + let percentiles = functionImage.map(({ x, value }) => { return { x: x, p1: unwrap(value.inv(0.01)), @@ -90,24 +130,25 @@ export const FunctionChart: React.FC<{ }; }); - 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); + let groupedErrors = _.groupBy(errors, (x) => x.value); return ( <> {showChart} - {_.keysIn(error2).map((k) => ( - - {`Values: [${error2[k].map((r) => r.x.toFixed(2)).join(",")}]`} + {_.entries(groupedErrors).map(([errorName, errorPoints]) => ( + + Values:{" "} + {errorPoints + .map((r) => ) + .reduce((a, b) => ( + <> + {a}, {b} + + ))} ))} diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 638dcb34..c833f9c3 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -6,7 +6,7 @@ import { errorValueToString, squiggleExpression, bindings, - samplingParams, + environment, jsImports, defaultImports, defaultBindings, @@ -14,6 +14,7 @@ import { import { NumberShower } from "./NumberShower"; import { DistributionChart } from "./DistributionChart"; import { ErrorBox } from "./ErrorBox"; +import { FunctionChart, FunctionChartSettings } from "./FunctionChart"; const variableBox = { Component: styled.div` @@ -36,7 +37,7 @@ const variableBox = { interface VariableBoxProps { heading: string; children: React.ReactNode; - showTypes?: boolean; + showTypes: boolean; } export const VariableBox: React.FC = ({ @@ -66,9 +67,13 @@ export interface SquiggleItemProps { width?: number; height: number; /** Whether to show type information */ - showTypes?: boolean; + showTypes: boolean; /** Whether to show users graph controls (scale etc) */ - showControls?: boolean; + showControls: boolean; + /** Settings for displaying functions */ + chartSettings: FunctionChartSettings; + /** Environment for further function executions */ + environment: environment; } const SquiggleItem: React.FC = ({ @@ -77,6 +82,8 @@ const SquiggleItem: React.FC = ({ height, showTypes = false, showControls = false, + chartSettings, + environment, }: SquiggleItemProps) => { switch (expression.tag) { case "number": @@ -143,6 +150,8 @@ const SquiggleItem: React.FC = ({ height={50} showTypes={showTypes} showControls={showControls} + chartSettings={chartSettings} + environment={environment} /> ))} @@ -159,6 +168,8 @@ const SquiggleItem: React.FC = ({ height={50} showTypes={showTypes} showControls={showControls} + chartSettings={chartSettings} + environment={environment} /> ))} @@ -172,9 +183,11 @@ const SquiggleItem: React.FC = ({ ); case "lambda": return ( - - There is no viewer currently available for function types. - + ); } }; @@ -185,28 +198,22 @@ export interface SquiggleChartProps { /** If the output requires monte carlo sampling, the amount of samples */ sampleCount?: number; /** The amount of points returned to draw the distribution */ - outputXYPoints?: number; - kernelWidth?: number; - pointDistLength?: number; - /** If the result is a function, where the function starts */ - diagramStart?: number; - /** If the result is a function, where the function ends */ - diagramStop?: number; - /** If the result is a function, how many points along the function it samples */ - diagramCount?: number; + environment: environment; + /** If the result is a function, where the function starts, ends and the amount of stops */ + chartSettings?: FunctionChartSettings; /** When the environment changes */ onChange?(expr: squiggleExpression): void; /** CSS width of the element */ width?: number; height?: number; /** Bindings of previous variables declared */ - bindings?: bindings; + bindings: bindings; /** JS imported parameters */ - jsImports?: jsImports; + jsImports: jsImports; /** Whether to show type information about returns, default false */ - showTypes?: boolean; + showTypes: boolean; /** Whether to show graph controls (scale etc)*/ - showControls?: boolean; + showControls: boolean; } const ChartWrapper = styled.div` @@ -215,10 +222,10 @@ const ChartWrapper = styled.div` "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; `; +let defaultChartSettings = { start: 0, stop: 10, count: 100 }; export const SquiggleChart: React.FC = ({ squiggleString = "", - sampleCount = 1000, - outputXYPoints = 1000, + environment, onChange = () => {}, height = 60, bindings = defaultBindings, @@ -226,17 +233,9 @@ export const SquiggleChart: React.FC = ({ width, showTypes = false, showControls = false, + chartSettings = defaultChartSettings, }: SquiggleChartProps) => { - let samplingInputs: samplingParams = { - sampleCount: sampleCount, - xyPointLength: outputXYPoints, - }; - let expressionResult = run( - squiggleString, - bindings, - samplingInputs, - jsImports - ); + let expressionResult = run(squiggleString, bindings, environment, jsImports); let internal: JSX.Element; if (expressionResult.tag === "Ok") { let expression = expressionResult.value; @@ -248,6 +247,8 @@ export const SquiggleChart: React.FC = ({ height={height} showTypes={showTypes} showControls={showControls} + chartSettings={chartSettings} + environment={environment} /> ); } else { diff --git a/packages/components/src/components/SquiggleEditor.tsx b/packages/components/src/components/SquiggleEditor.tsx index 572dbd76..8e99182d 100644 --- a/packages/components/src/components/SquiggleEditor.tsx +++ b/packages/components/src/components/SquiggleEditor.tsx @@ -5,7 +5,7 @@ import { CodeEditor } from "./CodeEditor"; import styled from "styled-components"; import type { squiggleExpression, - samplingParams, + environment, bindings, jsImports, } from "@quri/squiggle-lang"; @@ -24,8 +24,6 @@ export interface SquiggleEditorProps { sampleCount?: number; /** The amount of points returned to draw the distribution */ outputXYPoints?: number; - kernelWidth?: number; - pointDistLength?: number; /** If the result is a function, where the function starts */ diagramStart?: number; /** If the result is a function, where the function ends */ @@ -55,13 +53,11 @@ const Input = styled.div` export let SquiggleEditor: React.FC = ({ initialSquiggleString = "", width, - sampleCount, - outputXYPoints, - kernelWidth, - pointDistLength, - diagramStart, - diagramStop, - diagramCount, + sampleCount = 1000, + outputXYPoints = 1000, + diagramStart = 0, + diagramStop = 10, + diagramCount = 100, onChange, bindings = defaultBindings, jsImports = defaultImports, @@ -69,6 +65,15 @@ export let SquiggleEditor: React.FC = ({ showControls = false, }: SquiggleEditorProps) => { let [expression, setExpression] = React.useState(initialSquiggleString); + let chartSettings = { + start: diagramStart, + stop: diagramStop, + count: diagramCount, + }; + let env: environment = { + sampleCount: sampleCount, + xyPointLength: outputXYPoints, + }; return (
@@ -82,14 +87,10 @@ export let SquiggleEditor: React.FC = ({ = ({ outputXYPoints = 1000, jsImports = defaultImports, }: SquigglePartialProps) => { - let samplingInputs: samplingParams = { + let samplingInputs: environment = { sampleCount: sampleCount, xyPointLength: outputXYPoints, }; diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index 424cff8d..44fc4803 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -4,6 +4,11 @@ import ReactDOM from "react-dom"; import { SquiggleChart } from "./SquiggleChart"; import CodeEditor from "./CodeEditor"; import styled from "styled-components"; +import { + defaultBindings, + environment, + defaultImports, +} from "@quri/squiggle-lang"; interface FieldFloatProps { label: string; @@ -89,6 +94,15 @@ let SquigglePlayground: FC = ({ let [diagramStart, setDiagramStart] = useState(0); let [diagramStop, setDiagramStop] = useState(10); let [diagramCount, setDiagramCount] = useState(20); + let chartSettings = { + start: diagramStart, + stop: diagramStop, + count: diagramCount, + }; + let env: environment = { + sampleCount: sampleCount, + xyPointLength: outputXYPoints, + }; return ( @@ -105,15 +119,13 @@ let SquigglePlayground: FC = ({ diff --git a/packages/squiggle-lang/src/js/index.ts b/packages/squiggle-lang/src/js/index.ts index 961d4935..306e5a07 100644 --- a/packages/squiggle-lang/src/js/index.ts +++ b/packages/squiggle-lang/src/js/index.ts @@ -1,6 +1,5 @@ import * as _ from "lodash"; import { - samplingParams, environment, defaultEnvironment, evaluatePartialUsingExternalBindings, @@ -8,6 +7,7 @@ import { externalBindings, expressionValue, errorValue, + foreignFunctionInterface, } from "../rescript/TypescriptInterface.gen"; export { makeSampleSetDist, @@ -15,25 +15,30 @@ export { distributionErrorToString, distributionError, } from "../rescript/TypescriptInterface.gen"; -export type { - samplingParams, - errorValue, - externalBindings as bindings, - jsImports, -}; +export type { errorValue, externalBindings as bindings, jsImports }; import { jsValueToBinding, + jsValueToExpressionValue, jsValue, rescriptExport, squiggleExpression, convertRawToTypescript, + lambdaValue, } from "./rescript_interop"; import { result, resultMap, tag, tagged } from "./types"; import { Distribution, shape } from "./distribution"; -export { Distribution, squiggleExpression, result, resultMap, shape }; +export { + Distribution, + squiggleExpression, + result, + resultMap, + shape, + lambdaValue, + environment, +}; -export let defaultSamplingInputs: samplingParams = { +export let defaultSamplingInputs: environment = { sampleCount: 10000, xyPointLength: 10000, }; @@ -72,6 +77,20 @@ export function runPartial( ); } +export function runForeign( + fn: lambdaValue, + args: jsValue[], + environment?: environment +): result { + let e = environment ? environment : defaultEnvironment; + let res: result = foreignFunctionInterface( + fn, + args.map(jsValueToExpressionValue), + e + ); + return resultMap(res, (x) => createTsExport(x, e)); +} + function mergeImportsWithBindings( bindings: externalBindings, imports: jsImports diff --git a/packages/squiggle-lang/src/js/rescript_interop.ts b/packages/squiggle-lang/src/js/rescript_interop.ts index 45f4124b..0781f081 100644 --- a/packages/squiggle-lang/src/js/rescript_interop.ts +++ b/packages/squiggle-lang/src/js/rescript_interop.ts @@ -1,5 +1,6 @@ import * as _ from "lodash"; import { + expressionValue, mixedShape, sampleSetDist, genericDist, @@ -87,6 +88,8 @@ export type squiggleExpression = | tagged<"number", number> | tagged<"record", { [key: string]: squiggleExpression }>; +export { lambdaValue }; + export function convertRawToTypescript( result: rescriptExport, environment: environment @@ -168,3 +171,21 @@ export function jsValueToBinding(value: jsValue): rescriptExport { return { TAG: 7, _0: _.mapValues(value, jsValueToBinding) }; } } + +export function jsValueToExpressionValue(value: jsValue): expressionValue { + if (typeof value === "boolean") { + return { tag: "EvBool", value: value as boolean }; + } else if (typeof value === "string") { + return { tag: "EvString", value: value as string }; + } else if (typeof value === "number") { + return { tag: "EvNumber", value: value as number }; + } else if (Array.isArray(value)) { + return { tag: "EvArray", value: value.map(jsValueToExpressionValue) }; + } else { + // Record + return { + tag: "EvRecord", + value: _.mapValues(value, jsValueToExpressionValue), + }; + } +} diff --git a/packages/squiggle-lang/src/rescript/TypescriptInterface.res b/packages/squiggle-lang/src/rescript/TypescriptInterface.res index 6ebb8377..13763e72 100644 --- a/packages/squiggle-lang/src/rescript/TypescriptInterface.res +++ b/packages/squiggle-lang/src/rescript/TypescriptInterface.res @@ -84,3 +84,6 @@ type environment = ReducerInterface_ExpressionValue.environment @genType let defaultEnvironment = ReducerInterface_ExpressionValue.defaultEnvironment + +@genType +let foreignFunctionInterface = Reducer.foreignFunctionInterface From f7690c33e0226754a91a83ff71539c8a5079bbb7 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 11:56:13 -0400 Subject: [PATCH 061/340] Some cleanup Value: [1e-4 to 1e-2] --- .../Distributions/KlDivergence_test.res | 35 ++++++++++--------- .../Distributions/PointSetDist/Discrete.res | 7 +--- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index 3ed1788b..8eb9974c 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -2,7 +2,7 @@ open Jest open Expect open TestHelpers -describe("kl divergence on continuous distributions", () => { +describe("klDivergence: continuous -> continuous -> float", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) exception KlFailed @@ -60,7 +60,7 @@ describe("kl divergence on continuous distributions", () => { }) }) -describe("kl divergence on discrete distributions", () => { +describe("klDivergence: discrete -> discrete -> float", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) let mixture = a => DistributionTypes.DistributionOperation.Mixture(a) exception KlFailed @@ -71,13 +71,17 @@ describe("kl divergence on discrete distributions", () => { let point1 = mkDelta(float1) let point2 = mkDelta(float2) let point3 = mkDelta(float3) - test("finite kl divergence", () => { - let answer = [(point1, 1e0), (point2, 1e0)]->mixture->run - let prediction = [(point1, 1e0), (point2, 1e0), (point3, 1e0)]->mixture->run - let kl = switch (prediction, answer) { - | (Dist(prediction'), Dist(answer')) => klDivergence(prediction', answer') - | _ => raise(MixtureFailed) - } + let a' = [(point1, 1e0), (point2, 1e0)]->mixture->run + let b' = [(point1, 1e0), (point2, 1e0), (point3, 1e0)]->mixture->run + let (a, b) = switch (a', b') { + | (Dist(a''), Dist(b'')) => (a'', b'') + | _ => raise(MixtureFailed) + } + test("is finite", () => { + let prediction = b + let answer = a + let kl = klDivergence(prediction, answer) + // Sigma_{i \in 1..2} 0.5 * log(0.5 / 0.33333) let analyticalKl = Js.Math.log(3.0 /. 2.0) switch kl { | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKl, ~digits=7) @@ -86,13 +90,10 @@ describe("kl divergence on discrete distributions", () => { raise(KlFailed) } }) - test("infinite kl divergence", () => { - let prediction = [(point1, 1e0), (point2, 1e0)]->mixture->run - let answer = [(point1, 1e0), (point2, 1e0), (point3, 1e0)]->mixture->run - let kl = switch (prediction, answer) { - | (Dist(prediction'), Dist(answer')) => klDivergence(prediction', answer') - | _ => raise(MixtureFailed) - } + test("is infinite", () => { + let prediction = a + let answer = b + let kl = klDivergence(prediction, answer) switch kl { | Ok(kl') => kl'->expect->toEqual(infinity) | Error(err) => @@ -102,7 +103,7 @@ describe("kl divergence on discrete distributions", () => { }) }) -describe("combineAlongSupportOfSecondArgument", () => { +describe("combineAlongSupportOfSecondArgument0", () => { // This tests the version of the function that we're NOT using. Haven't deleted the test in case we use the code later. test("test on two uniforms", _ => { let combineAlongSupportOfSecondArgument = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument0 diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 04265d7c..abb6b793 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -48,12 +48,7 @@ let combinePointwise = ( // TODO: does it ever make sense to pointwise combine the integrals here? // It could be done for pointwise additions, but is that ever needed? - make( - combiner(fn, XYShape.XtoY.discreteInterpolator, t1.xyShape, t2.xyShape)->E.R.toExn( - "Logically unreachable?", - _, - ), - )->Ok + combiner(fn, XYShape.XtoY.discreteInterpolator, t1.xyShape, t2.xyShape)->E.R2.fmap(make) } let reduce = ( From 70ea9c1b145a0e39b626b5a077be5a4e18649356 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Tue, 10 May 2022 16:08:12 +0000 Subject: [PATCH 062/340] Make optional arguments actually optional --- packages/components/src/components/SquiggleChart.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index e1407be5..13fd611a 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -213,15 +213,15 @@ export interface SquiggleChartProps { width?: number; height?: number; /** Bindings of previous variables declared */ - bindings: bindings; + bindings?: bindings; /** JS imported parameters */ jsImports?: jsImports; /** Whether to show a summary of the distirbution */ showSummary?: boolean; /** Whether to show type information about returns, default false */ - showTypes: boolean; + showTypes?: boolean; /** Whether to show graph controls (scale etc)*/ - showControls: boolean; + showControls?: boolean; } const ChartWrapper = styled.div` From 8d391f789d38b6a00fd51ca192800302b157ac54 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Tue, 10 May 2022 16:16:36 +0000 Subject: [PATCH 063/340] Keep props consistent --- .../src/components/SquiggleChart.tsx | 6 ++-- .../src/components/SquiggleEditor.tsx | 29 ++++--------------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 13fd611a..241cd772 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -10,6 +10,7 @@ import { jsImports, defaultImports, defaultBindings, + defaultEnvironment, } from "@quri/squiggle-lang"; import { NumberShower } from "./NumberShower"; import { DistributionChart } from "./DistributionChart"; @@ -204,7 +205,7 @@ export interface SquiggleChartProps { /** If the output requires monte carlo sampling, the amount of samples */ sampleCount?: number; /** The amount of points returned to draw the distribution */ - environment: environment; + environment?: environment; /** If the result is a function, where the function starts, ends and the amount of stops */ chartSettings?: FunctionChartSettings; /** When the environment changes */ @@ -245,6 +246,7 @@ export const SquiggleChart: React.FC = ({ chartSettings = defaultChartSettings, }: SquiggleChartProps) => { let expressionResult = run(squiggleString, bindings, environment, jsImports); + let e = environment ? environment : defaultEnvironment; let internal: JSX.Element; if (expressionResult.tag === "Ok") { let expression = expressionResult.value; @@ -258,7 +260,7 @@ export const SquiggleChart: React.FC = ({ showTypes={showTypes} showControls={showControls} chartSettings={chartSettings} - environment={environment} + environment={e} /> ); } else { diff --git a/packages/components/src/components/SquiggleEditor.tsx b/packages/components/src/components/SquiggleEditor.tsx index 4b17b585..c4ac1876 100644 --- a/packages/components/src/components/SquiggleEditor.tsx +++ b/packages/components/src/components/SquiggleEditor.tsx @@ -21,9 +21,7 @@ export interface SquiggleEditorProps { /** The input string for squiggle */ initialSquiggleString?: string; /** If the output requires monte carlo sampling, the amount of samples */ - sampleCount?: number; - /** The amount of points returned to draw the distribution */ - outputXYPoints?: number; + environment?: environment; /** If the result is a function, where the function starts */ diagramStart?: number; /** If the result is a function, where the function ends */ @@ -55,8 +53,7 @@ const Input = styled.div` export let SquiggleEditor: React.FC = ({ initialSquiggleString = "", width, - sampleCount = 1000, - outputXYPoints = 1000, + environment, diagramStart = 0, diagramStop = 10, diagramCount = 100, @@ -73,10 +70,6 @@ export let SquiggleEditor: React.FC = ({ stop: diagramStop, count: diagramCount, }; - let env: environment = { - sampleCount: sampleCount, - xyPointLength: outputXYPoints, - }; return (
@@ -90,9 +83,8 @@ export let SquiggleEditor: React.FC = ({ = ({ initialSquiggleString = "", onChange, bindings = defaultBindings, - sampleCount = 1000, - outputXYPoints = 1000, + environment, jsImports = defaultImports, }: SquigglePartialProps) => { - let samplingInputs: environment = { - sampleCount: sampleCount, - xyPointLength: outputXYPoints, - }; let [expression, setExpression] = React.useState(initialSquiggleString); let [error, setError] = React.useState(null); @@ -181,7 +164,7 @@ export let SquigglePartial: React.FC = ({ let squiggleResult = runPartial( expression, bindings, - samplingInputs, + environment, jsImports ); if (squiggleResult.tag == "Ok") { From 930340e2f18c1f21c428f5da1628a531ee27f1ab Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Tue, 10 May 2022 16:20:31 +0000 Subject: [PATCH 064/340] Add default environment as export --- packages/squiggle-lang/src/js/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/squiggle-lang/src/js/index.ts b/packages/squiggle-lang/src/js/index.ts index 306e5a07..5549223b 100644 --- a/packages/squiggle-lang/src/js/index.ts +++ b/packages/squiggle-lang/src/js/index.ts @@ -36,6 +36,7 @@ export { shape, lambdaValue, environment, + defaultEnvironment }; export let defaultSamplingInputs: environment = { From ccb6938ad41efc7e4d8877567eb13bc6b38f181c Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Tue, 10 May 2022 16:24:08 +0000 Subject: [PATCH 065/340] Lint fix --- packages/squiggle-lang/src/js/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/squiggle-lang/src/js/index.ts b/packages/squiggle-lang/src/js/index.ts index 5549223b..d3d074fa 100644 --- a/packages/squiggle-lang/src/js/index.ts +++ b/packages/squiggle-lang/src/js/index.ts @@ -36,7 +36,7 @@ export { shape, lambdaValue, environment, - defaultEnvironment + defaultEnvironment, }; export let defaultSamplingInputs: environment = { From 744d5e0ad18f84be4a5b72ba36aa087b9b1e864e Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 13:29:54 -0400 Subject: [PATCH 066/340] CodeQL run only via cron; waste added to gallery Value: [1e-4 to 1e-3] --- .github/workflows/codeql-analysis.yml | 6 ------ README.md | 2 -- packages/website/docs/Discussions/Gallery.md | 1 + packages/website/docs/Features/Distributions.mdx | 7 ++++++- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2aef3ae3..450e2ab7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -12,12 +12,6 @@ name: "CodeQL" on: - push: - branches: - - master - - production - - staging - - develop schedule: - cron: "42 19 * * 0" diff --git a/README.md b/README.md index 137fb1cb..dafdc4cc 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,6 @@ the packages can be found in `packages`. - `packages/website` is the main descriptive website for squiggle, 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 diff --git a/packages/website/docs/Discussions/Gallery.md b/packages/website/docs/Discussions/Gallery.md index fee8f344..defebec2 100644 --- a/packages/website/docs/Discussions/Gallery.md +++ b/packages/website/docs/Discussions/Gallery.md @@ -5,3 +5,4 @@ title: Gallery - [Adjusting probabilities for the passage of time](https://www.lesswrong.com/s/rDe8QE5NvXcZYzgZ3/p/j8o6sgRerE3tqNWdj) by Nuño Sempere - [GiveWell's GiveDirectly cost effectiveness analysis](https://observablehq.com/@hazelfire/givewells-givedirectly-cost-effectiveness-analysis) by Sam Nolan +- [Astronomical Waste](https://observablehq.com/@quinn-dougherty/waste) diff --git a/packages/website/docs/Features/Distributions.mdx b/packages/website/docs/Features/Distributions.mdx index 28e1db01..795d0ea6 100644 --- a/packages/website/docs/Features/Distributions.mdx +++ b/packages/website/docs/Features/Distributions.mdx @@ -70,8 +70,10 @@ If both values are above zero, a `lognormal` distribution is used. If not, a `no ## Mixture -`mixture(...distributions: Distribution[], weights?: number[])` +`mixture(...distributions: Distribution[], weights?: number[])` `mx(...distributions: Distribution[], weights?: number[])` +`mixture(distributions: Distributions[], weights?: number[])` +`mx(distributions: Distributions[], weights?: number[])` The `mixture` mixes combines multiple distributions to create a mixture. You can optionally pass in a list of proportional weights. @@ -85,6 +87,9 @@ The `mixture` mixes combines multiple distributions to create a mixture. You can + + + ### Arguments From 29c1956e884354c9f76845160cfa72831b362b36 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 14:03:42 -0400 Subject: [PATCH 067/340] Response to CR Value: [1e-6 to 1e-4] --- .../Distributions/GenericDist_Fixtures.res | 10 ++++++++++ .../__tests__/Distributions/KlDivergence_test.res | 13 +++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/GenericDist_Fixtures.res b/packages/squiggle-lang/__tests__/Distributions/GenericDist_Fixtures.res index 4d41930f..8e315599 100644 --- a/packages/squiggle-lang/__tests__/Distributions/GenericDist_Fixtures.res +++ b/packages/squiggle-lang/__tests__/Distributions/GenericDist_Fixtures.res @@ -12,3 +12,13 @@ let triangularDist: DistributionTypes.genericDist = Symbolic( let exponentialDist: DistributionTypes.genericDist = Symbolic(#Exponential({rate: 2.0})) let uniformDist: DistributionTypes.genericDist = Symbolic(#Uniform({low: 9.0, high: 10.0})) let floatDist: DistributionTypes.genericDist = Symbolic(#Float(1e1)) + +exception KlFailed +exception MixtureFailed +let float1 = 1.0 +let float2 = 2.0 +let float3 = 3.0 +let {mkDelta} = module(TestHelpers) +let point1 = mkDelta(float1) +let point2 = mkDelta(float2) +let point3 = mkDelta(float3) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index 8eb9974c..96e95899 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -1,6 +1,7 @@ open Jest open Expect open TestHelpers +open GenericDist_Fixtures describe("klDivergence: continuous -> continuous -> float", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) @@ -63,21 +64,13 @@ describe("klDivergence: continuous -> continuous -> float", () => { describe("klDivergence: discrete -> discrete -> float", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) let mixture = a => DistributionTypes.DistributionOperation.Mixture(a) - exception KlFailed - exception MixtureFailed - let float1 = 1.0 - let float2 = 2.0 - let float3 = 3.0 - let point1 = mkDelta(float1) - let point2 = mkDelta(float2) - let point3 = mkDelta(float3) let a' = [(point1, 1e0), (point2, 1e0)]->mixture->run let b' = [(point1, 1e0), (point2, 1e0), (point3, 1e0)]->mixture->run let (a, b) = switch (a', b') { | (Dist(a''), Dist(b'')) => (a'', b'') | _ => raise(MixtureFailed) } - test("is finite", () => { + test("agrees with analytical answer when finite", () => { let prediction = b let answer = a let kl = klDivergence(prediction, answer) @@ -90,7 +83,7 @@ describe("klDivergence: discrete -> discrete -> float", () => { raise(KlFailed) } }) - test("is infinite", () => { + test("returns infinity when infinite", () => { let prediction = a let answer = b let kl = klDivergence(prediction, answer) From 3f30bddfc08c23112cd96a9931d841eb206489c7 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 15:23:04 -0400 Subject: [PATCH 068/340] Sidebar order of pages; adjusted title/subtitle; cleanup Value: [1e-7 to 1e-3] --- packages/website/docs/Discussions/Bugs.mdx | 2 +- packages/website/docs/Discussions/Future-Features.md | 5 ++--- packages/website/docs/Discussions/Gallery.md | 2 +- .../docs/Discussions/Three-Formats-Of-Distributions.md | 2 +- packages/website/docs/Features/Distributions.mdx | 2 +- packages/website/docs/Features/Functions.mdx | 2 +- packages/website/docs/Features/Language.mdx | 7 ++++--- packages/website/docs/Features/Node-Packages.md | 2 +- packages/website/docs/Introduction.md | 10 +++++----- packages/website/docusaurus.config.js | 4 ++-- packages/website/src/pages/index.js | 3 +++ packages/website/src/pages/markdown-page.md | 7 ------- 12 files changed, 22 insertions(+), 26 deletions(-) delete mode 100644 packages/website/src/pages/markdown-page.md diff --git a/packages/website/docs/Discussions/Bugs.mdx b/packages/website/docs/Discussions/Bugs.mdx index 1aff87fe..a39223a9 100644 --- a/packages/website/docs/Discussions/Bugs.mdx +++ b/packages/website/docs/Discussions/Bugs.mdx @@ -1,6 +1,6 @@ --- title: "Known Bugs" -sidebar_position: 6 +sidebar_position: 1 --- import { SquiggleEditor } from "../../src/components/SquiggleEditor"; diff --git a/packages/website/docs/Discussions/Future-Features.md b/packages/website/docs/Discussions/Future-Features.md index fe0b5a48..d1b45583 100644 --- a/packages/website/docs/Discussions/Future-Features.md +++ b/packages/website/docs/Discussions/Future-Features.md @@ -1,9 +1,8 @@ --- -sidebar_position: 4 +title: Future Features +sidebar_position: 3 --- -# Future Features - Squiggle is still very early. The main first goal is to become stable. This means having a clean codebase, having decent test coverage, and having a syntax we are reasonably confident in. Later on, there are many other features that will be interesting to explore. ## Programming Language Features diff --git a/packages/website/docs/Discussions/Gallery.md b/packages/website/docs/Discussions/Gallery.md index defebec2..d0ea8335 100644 --- a/packages/website/docs/Discussions/Gallery.md +++ b/packages/website/docs/Discussions/Gallery.md @@ -1,5 +1,5 @@ --- -sidebar_position: 6 +sidebar_position: 2 title: Gallery --- diff --git a/packages/website/docs/Discussions/Three-Formats-Of-Distributions.md b/packages/website/docs/Discussions/Three-Formats-Of-Distributions.md index 405bc97c..e844f6c6 100644 --- a/packages/website/docs/Discussions/Three-Formats-Of-Distributions.md +++ b/packages/website/docs/Discussions/Three-Formats-Of-Distributions.md @@ -1,5 +1,5 @@ --- -sidebar_position: 5 +sidebar_position: 4 title: Three Formats of Distributions author: Ozzie Gooen date: 02-19-2022 diff --git a/packages/website/docs/Features/Distributions.mdx b/packages/website/docs/Features/Distributions.mdx index 795d0ea6..6cc5967d 100644 --- a/packages/website/docs/Features/Distributions.mdx +++ b/packages/website/docs/Features/Distributions.mdx @@ -1,6 +1,6 @@ --- title: "Distribution Creation" -sidebar_position: 8 +sidebar_position: 2 --- import TOCInline from "@theme/TOCInline"; diff --git a/packages/website/docs/Features/Functions.mdx b/packages/website/docs/Features/Functions.mdx index 46bc4e39..f225252a 100644 --- a/packages/website/docs/Features/Functions.mdx +++ b/packages/website/docs/Features/Functions.mdx @@ -1,6 +1,6 @@ --- title: "Functions Reference" -sidebar_position: 7 +sidebar_position: 3 --- import { SquiggleEditor } from "../../src/components/SquiggleEditor"; diff --git a/packages/website/docs/Features/Language.mdx b/packages/website/docs/Features/Language.mdx index 74c703ae..31ff041d 100644 --- a/packages/website/docs/Features/Language.mdx +++ b/packages/website/docs/Features/Language.mdx @@ -1,5 +1,5 @@ --- -sidebar_position: 2 +sidebar_position: 1 title: Language Basics --- @@ -49,5 +49,6 @@ ozzie_estimate(1) * nuno_estimate(1, 1)`} ## See more -- [Functions reference](https://squiggle-language.com/docs/Features/Functions) -- [Gallery](https://squiggle-language.com/docs/Discussions/Gallery) +- [Distribution creation](./Distributions) +- [Functions reference](./Functions) +- [Gallery](../Discussions/Gallery) diff --git a/packages/website/docs/Features/Node-Packages.md b/packages/website/docs/Features/Node-Packages.md index 381cef1f..d8fdc591 100644 --- a/packages/website/docs/Features/Node-Packages.md +++ b/packages/website/docs/Features/Node-Packages.md @@ -1,5 +1,5 @@ --- -sidebar_position: 3 +sidebar_position: 4 title: Node Packages --- diff --git a/packages/website/docs/Introduction.md b/packages/website/docs/Introduction.md index 91cfd919..e81b0782 100644 --- a/packages/website/docs/Introduction.md +++ b/packages/website/docs/Introduction.md @@ -7,10 +7,10 @@ Squiggle is an _estimation language_, and a syntax for _calculating and expressi ## Get started -- [Gallery](https://www.squiggle-language.com/docs/Discussions/Gallery) -- [Squiggle playground](https://squiggle-language.com/playground) -- [Language basics](https://www.squiggle-language.com/docs/Features/Language) -- [Squiggle functions source of truth](https://www.squiggle-language.com/docs/Features/Functions) -- [Known bugs](https://www.squiggle-language.com/docs/Discussions/Bugs) +- [Gallery](./Discussions/Gallery) +- [Squiggle playground](/playground) +- [Language basics](./Features/Language) +- [Squiggle functions source of truth](./docs/Features/Functions) +- [Known bugs](./Discussions/Bugs) - [Original lesswrong sequence](https://www.lesswrong.com/s/rDe8QE5NvXcZYzgZ3) - [Author your squiggle models as Observable notebooks](https://observablehq.com/@hazelfire/squiggle) diff --git a/packages/website/docusaurus.config.js b/packages/website/docusaurus.config.js index 4971b1b0..68d440c8 100644 --- a/packages/website/docusaurus.config.js +++ b/packages/website/docusaurus.config.js @@ -9,8 +9,8 @@ const path = require("path"); /** @type {import('@docusaurus/types').Config} */ const config = { - title: "Squiggle (alpha)", - tagline: "Estimation language for forecasters", + title: "Squiggle", + tagline: "An estimation language for forecasters", url: "https://squiggle-language.com", baseUrl: "/", onBrokenLinks: "throw", diff --git a/packages/website/src/pages/index.js b/packages/website/src/pages/index.js index 4cbddcac..c156bec0 100644 --- a/packages/website/src/pages/index.js +++ b/packages/website/src/pages/index.js @@ -12,6 +12,9 @@ function HomepageHeader() {

{siteConfig.title}

+

+ Early access +

{siteConfig.tagline}

diff --git a/packages/website/src/pages/markdown-page.md b/packages/website/src/pages/markdown-page.md deleted file mode 100644 index 9756c5b6..00000000 --- a/packages/website/src/pages/markdown-page.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Markdown page example ---- - -# Markdown page example - -You don't need React to write simple standalone pages. From 4ecb420a8ba6fdd38b92eb4a6919bbdcae293fb1 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 15:50:44 -0400 Subject: [PATCH 069/340] Re-added `^`-versioning to mathjs Value: [1e-9 to 1e-5] --- packages/squiggle-lang/package.json | 2 +- yarn.lock | 242 ++++++++++++++-------------- 2 files changed, 122 insertions(+), 122 deletions(-) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 49dad58c..9ca9dc2e 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -38,7 +38,7 @@ "rescript": "^9.1.4", "jstat": "^1.9.5", "pdfast": "^0.2.0", - "mathjs": "10.5.0" + "mathjs": "^10.5.2" }, "devDependencies": { "bisect_ppx": "^2.7.1", diff --git a/yarn.lock b/yarn.lock index a8181cd8..876f1d82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1935,19 +1935,19 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== -"@eslint/eslintrc@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.2.tgz#4989b9e8c0216747ee7cca314ae73791bb281aae" - integrity sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg== +"@eslint/eslintrc@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz#fcaa2bcef39e13d6e9e7f6271f4cc7cae1174886" + integrity sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.3.1" + espree "^9.3.2" globals "^13.9.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" - minimatch "^3.0.4" + minimatch "^3.1.2" strip-json-comments "^3.1.1" "@gar/promisify@^1.0.1": @@ -2278,9 +2278,9 @@ integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== "@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.10" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.10.tgz#db436f0917d655393851bc258918c00226c9b183" - integrity sha512-Q0YbBd6OTsXm8Y21+YUSDXupHnodNC2M4O18jtd3iwJ3+vMZNdKGols0a9G6JOK0dcJ3IdUUHoh908ZI6qhk8Q== + version "0.3.11" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.11.tgz#eb2e124521f27673493030d02dffedf60e56553f" + integrity sha512-RllI476aSMsxzeI9TtlSMoNTgHDxEmnl6GkkHwhr0vdL8W+0WuesyI8Vd3rBOfrwtPXbPxdT9ADJdiOKgzxPQA== dependencies: "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" @@ -2291,9 +2291,9 @@ integrity sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw== "@leichtgewicht/ip-codec@^2.0.1": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.3.tgz#0300943770e04231041a51bd39f0439b5c7ab4f0" - integrity sha512-nkalE/f1RvRGChwBnEIoBfSEYOXnCRdleKuv6+lePbMDrMZXeDQnqak5XDOeBgrPPyPfAdcCu/B5z+v3VhplGg== + version "2.0.4" + resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" + integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== "@mdx-js/loader@^1.6.22": version "1.6.22" @@ -2390,9 +2390,9 @@ rimraf "^3.0.2" "@pmmmwh/react-refresh-webpack-plugin@^0.5.1", "@pmmmwh/react-refresh-webpack-plugin@^0.5.3": - version "0.5.5" - resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.5.tgz#e77aac783bd079f548daa0a7f080ab5b5a9741ca" - integrity sha512-RbG7h6TuP6nFFYKJwbcToA1rjC1FyPg25NR2noAZ0vKI+la01KTSRPkuVPE+U88jXv7javx2JHglUcL1MHcshQ== + version "0.5.6" + resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.6.tgz#9ced74cb23dae31ab385f775e237ce4c50422a1d" + integrity sha512-IIWxofIYt/AbMwoeBgj+O2aAXLrlCQVg+A4a2zfpXFNHgP8o8rvi3v+oe5t787Lj+KXlKOh8BAiUp9bhuELXhg== dependencies: ansi-html-community "^0.0.8" common-path-prefix "^3.0.0" @@ -4371,13 +4371,13 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^5.5.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.22.0.tgz#7b52a0de2e664044f28b36419210aea4ab619e2a" - integrity sha512-YCiy5PUzpAeOPGQ7VSGDEY2NeYUV1B0swde2e0HzokRsHBYjSdF6DZ51OuRZxVPHx0032lXGLvOMls91D8FXlg== + version "5.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.23.0.tgz#bc4cbcf91fbbcc2e47e534774781b82ae25cc3d8" + integrity sha512-hEcSmG4XodSLiAp1uxv/OQSGsDY6QN3TcRU32gANp+19wGE1QQZLRS8/GV58VRUoXhnkuJ3ZxNQ3T6Z6zM59DA== dependencies: - "@typescript-eslint/scope-manager" "5.22.0" - "@typescript-eslint/type-utils" "5.22.0" - "@typescript-eslint/utils" "5.22.0" + "@typescript-eslint/scope-manager" "5.23.0" + "@typescript-eslint/type-utils" "5.23.0" + "@typescript-eslint/utils" "5.23.0" debug "^4.3.2" functional-red-black-tree "^1.0.1" ignore "^5.1.8" @@ -4386,75 +4386,75 @@ tsutils "^3.21.0" "@typescript-eslint/experimental-utils@^5.0.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.22.0.tgz#a2b40eaa52ae1d1e316bc861069c40883a7ccf6e" - integrity sha512-rKxoCUtAHwEH6IcAoVpqipY6Th+YKW7WFspAKu0IFdbdKZpveFBeqxxE9Xn+GWikhq1o03V3VXbxIe+GdhggiQ== + version "5.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.23.0.tgz#ea03860fa612dadf272789988f2ce41f0b7bb2f7" + integrity sha512-I+3YGQztH1DM9kgWzjslpZzJCBMRz0KhYG2WP62IwpooeZ1L6Qt0mNK8zs+uP+R2HOsr+TeDW35Pitc3PfVv8Q== dependencies: - "@typescript-eslint/utils" "5.22.0" + "@typescript-eslint/utils" "5.23.0" "@typescript-eslint/parser@^5.5.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.22.0.tgz#7bedf8784ef0d5d60567c5ba4ce162460e70c178" - integrity sha512-piwC4krUpRDqPaPbFaycN70KCP87+PC5WZmrWs+DlVOxxmF+zI6b6hETv7Quy4s9wbkV16ikMeZgXsvzwI3icQ== + version "5.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.23.0.tgz#443778e1afc9a8ff180f91b5e260ac3bec5e2de1" + integrity sha512-V06cYUkqcGqpFjb8ttVgzNF53tgbB/KoQT/iB++DOIExKmzI9vBJKjZKt/6FuV9c+zrDsvJKbJ2DOCYwX91cbw== dependencies: - "@typescript-eslint/scope-manager" "5.22.0" - "@typescript-eslint/types" "5.22.0" - "@typescript-eslint/typescript-estree" "5.22.0" + "@typescript-eslint/scope-manager" "5.23.0" + "@typescript-eslint/types" "5.23.0" + "@typescript-eslint/typescript-estree" "5.23.0" debug "^4.3.2" -"@typescript-eslint/scope-manager@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.22.0.tgz#590865f244ebe6e46dc3e9cab7976fc2afa8af24" - integrity sha512-yA9G5NJgV5esANJCO0oF15MkBO20mIskbZ8ijfmlKIvQKg0ynVKfHZ15/nhAJN5m8Jn3X5qkwriQCiUntC9AbA== +"@typescript-eslint/scope-manager@5.23.0": + version "5.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz#4305e61c2c8e3cfa3787d30f54e79430cc17ce1b" + integrity sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw== dependencies: - "@typescript-eslint/types" "5.22.0" - "@typescript-eslint/visitor-keys" "5.22.0" + "@typescript-eslint/types" "5.23.0" + "@typescript-eslint/visitor-keys" "5.23.0" -"@typescript-eslint/type-utils@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.22.0.tgz#0c0e93b34210e334fbe1bcb7250c470f4a537c19" - integrity sha512-iqfLZIsZhK2OEJ4cQ01xOq3NaCuG5FQRKyHicA3xhZxMgaxQazLUHbH/B2k9y5i7l3+o+B5ND9Mf1AWETeMISA== +"@typescript-eslint/type-utils@5.23.0": + version "5.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.23.0.tgz#f852252f2fc27620d5bb279d8fed2a13d2e3685e" + integrity sha512-iuI05JsJl/SUnOTXA9f4oI+/4qS/Zcgk+s2ir+lRmXI+80D8GaGwoUqs4p+X+4AxDolPpEpVUdlEH4ADxFy4gw== dependencies: - "@typescript-eslint/utils" "5.22.0" + "@typescript-eslint/utils" "5.23.0" debug "^4.3.2" tsutils "^3.21.0" -"@typescript-eslint/types@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.22.0.tgz#50a4266e457a5d4c4b87ac31903b28b06b2c3ed0" - integrity sha512-T7owcXW4l0v7NTijmjGWwWf/1JqdlWiBzPqzAWhobxft0SiEvMJB56QXmeCQjrPuM8zEfGUKyPQr/L8+cFUBLw== +"@typescript-eslint/types@5.23.0": + version "5.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.23.0.tgz#8733de0f58ae0ed318dbdd8f09868cdbf9f9ad09" + integrity sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw== -"@typescript-eslint/typescript-estree@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.22.0.tgz#e2116fd644c3e2fda7f4395158cddd38c0c6df97" - integrity sha512-EyBEQxvNjg80yinGE2xdhpDYm41so/1kOItl0qrjIiJ1kX/L/L8WWGmJg8ni6eG3DwqmOzDqOhe6763bF92nOw== +"@typescript-eslint/typescript-estree@5.23.0": + version "5.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz#dca5f10a0a85226db0796e8ad86addc9aee52065" + integrity sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg== dependencies: - "@typescript-eslint/types" "5.22.0" - "@typescript-eslint/visitor-keys" "5.22.0" + "@typescript-eslint/types" "5.23.0" + "@typescript-eslint/visitor-keys" "5.23.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.22.0", "@typescript-eslint/utils@^5.13.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.22.0.tgz#1f2c4897e2cf7e44443c848a13c60407861babd8" - integrity sha512-HodsGb037iobrWSUMS7QH6Hl1kppikjA1ELiJlNSTYf/UdMEwzgj0WIp+lBNb6WZ3zTwb0tEz51j0Wee3iJ3wQ== +"@typescript-eslint/utils@5.23.0", "@typescript-eslint/utils@^5.13.0": + version "5.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.23.0.tgz#4691c3d1b414da2c53d8943310df36ab1c50648a" + integrity sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA== dependencies: "@types/json-schema" "^7.0.9" - "@typescript-eslint/scope-manager" "5.22.0" - "@typescript-eslint/types" "5.22.0" - "@typescript-eslint/typescript-estree" "5.22.0" + "@typescript-eslint/scope-manager" "5.23.0" + "@typescript-eslint/types" "5.23.0" + "@typescript-eslint/typescript-estree" "5.23.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.22.0": - version "5.22.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.22.0.tgz#f49c0ce406944ffa331a1cfabeed451ea4d0909c" - integrity sha512-DbgTqn2Dv5RFWluG88tn0pP6Ex0ROF+dpDO1TNNZdRtLjUr6bdznjA6f/qNqJLjd2PgguAES2Zgxh/JzwzETDg== +"@typescript-eslint/visitor-keys@5.23.0": + version "5.23.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz#057c60a7ca64667a39f991473059377a8067c87b" + integrity sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg== dependencies: - "@typescript-eslint/types" "5.22.0" + "@typescript-eslint/types" "5.23.0" eslint-visitor-keys "^3.0.0" "@webassemblyjs/ast@1.11.1": @@ -4786,7 +4786,7 @@ acorn-import-assertions@^1.7.6: resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== -acorn-jsx@^5.3.1: +acorn-jsx@^5.3.1, acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== @@ -4820,7 +4820,7 @@ acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0: +acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1: version "8.7.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== @@ -5023,9 +5023,9 @@ ansi-to-html@^0.6.11: entities "^2.0.0" antd@^4.20.0: - version "4.20.2" - resolved "https://registry.yarnpkg.com/antd/-/antd-4.20.2.tgz#1ed2042a091eecfebd9650c014a1a2e57430ff2b" - integrity sha512-b+Gq1EY8LmcS/ARei/dGI0bWQlJ/j3f3oJ6XjM+ryyT5YWxvf7X3mGc++bTGuLmjn6+/icRL1zItIgcvplcomg== + version "4.20.3" + resolved "https://registry.yarnpkg.com/antd/-/antd-4.20.3.tgz#21f77332d201ea9f1d76685ca9534b4796791c81" + integrity sha512-liZB/OguxPPNnssiR8UH5gjAV3LetsnA8K0G+VBVJkCZsU5QmCDL05d059Nu6iRD7FVg0drSONZQwvWD4pO4nw== dependencies: "@ant-design/colors" "^6.0.0" "@ant-design/icons" "^4.7.0" @@ -6189,9 +6189,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.30001332, caniuse-lite@^1.0.30001335: - version "1.0.30001338" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz#b5dd7a7941a51a16480bdf6ff82bded1628eec0d" - integrity sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ== + version "1.0.30001339" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001339.tgz#f9aece4ea8156071613b27791547ba0b33f176cf" + integrity sha512-Es8PiVqCe+uXdms0Gu5xP5PF2bxLR7OBp3wUzUnuO7OHzhOfCyg3hdiGWVPVxhiuniOzng+hTc1u3fEQ0TlkSQ== capture-exit@^2.0.0: version "2.0.0" @@ -6818,17 +6818,17 @@ copy-webpack-plugin@^10.2.4: serialize-javascript "^6.0.0" core-js-compat@^3.21.0, core-js-compat@^3.22.1, core-js-compat@^3.8.1: - version "3.22.4" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.4.tgz#d700f451e50f1d7672dcad0ac85d910e6691e579" - integrity sha512-dIWcsszDezkFZrfm1cnB4f/J85gyhiCpxbgBdohWCDtSVuAaChTSpPV7ldOQf/Xds2U5xCIJZOK82G4ZPAIswA== + version "3.22.5" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.5.tgz#7fffa1d20cb18405bd22756ca1353c6f1a0e8614" + integrity sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg== dependencies: browserslist "^4.20.3" semver "7.0.0" core-js-pure@^3.20.2, core-js-pure@^3.8.1, core-js-pure@^3.8.2: - version "3.22.4" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.4.tgz#a992210f4cad8b32786b8654563776c56b0e0d0a" - integrity sha512-4iF+QZkpzIz0prAFuepmxwJ2h5t4agvE8WPYqs2mjLJMNNwJOnpch76w2Q7bUfCPEv/V7wpvOfog0w273M+ZSw== + version "3.22.5" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.5.tgz#bdee0ed2f9b78f2862cda4338a07b13a49b6c9a9" + integrity sha512-8xo9R00iYD7TcV7OrC98GwxiUEAabVWO3dix+uyWjnYrx9fyASLlIX+f/3p5dW5qByaP2bcZ8X/T47s55et/tA== core-js@^2.4.0: version "2.6.12" @@ -6836,9 +6836,9 @@ core-js@^2.4.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.0.4, core-js@^3.19.2, core-js@^3.22.3, core-js@^3.6.5, core-js@^3.8.2: - version "3.22.4" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.4.tgz#f4b3f108d45736935aa028444a69397e40d8c531" - integrity sha512-1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w== + version "3.22.5" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.5.tgz#a5f5a58e663d5c0ebb4e680cd7be37536fb2a9cf" + integrity sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA== core-util-is@~1.0.0: version "1.0.3" @@ -7924,9 +7924,9 @@ ejs@^3.1.6: jake "^10.8.5" electron-to-chromium@^1.4.118: - version "1.4.136" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.136.tgz#b6a3595a9c29d6d8f60e092d40ac24f997e4e7ef" - integrity sha512-GnITX8rHnUrIVnTxU9UlsTnSemHUA2iF+6QrRqxFbp/mf0vfuSc/goEyyQhUX3TUUCE3mv/4BNuXOtaJ4ur0eA== + version "1.4.137" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f" + integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA== element-resize-detector@^1.2.2: version "1.2.4" @@ -8311,9 +8311,9 @@ eslint-plugin-react@^7.27.1: string.prototype.matchall "^4.0.6" eslint-plugin-testing-library@^5.0.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.3.1.tgz#7638ee79cc86fd8bb57d671af35a1cbaa77e9548" - integrity sha512-OfF4dlG/q6ck6DL3P8Z0FPdK0dU5K57gsBu7eUcaVbwYKaNzjgejnXiM9CCUevppORkvfek+9D3Uj/9ZZ8Vz8g== + version "5.4.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.4.0.tgz#614767a470bc9ffa4b4308cdbc31d3ec6f6a99ad" + integrity sha512-XjxIf4g33KaZXxRNbR33+0WcRQ/zt8N0R58IY6/kkHnrY6zPsC1gs3u5cTZr5eUmCZN/sjoPak3uF5vHGKg2wg== dependencies: "@typescript-eslint/utils" "^5.13.0" @@ -8370,11 +8370,11 @@ eslint-webpack-plugin@^3.1.1: schema-utils "^3.1.1" eslint@^8.3.0: - version "8.14.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.14.0.tgz#62741f159d9eb4a79695b28ec4989fcdec623239" - integrity sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw== + version "8.15.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.15.0.tgz#fea1d55a7062da48d82600d2e0974c55612a11e9" + integrity sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA== dependencies: - "@eslint/eslintrc" "^1.2.2" + "@eslint/eslintrc" "^1.2.3" "@humanwhocodes/config-array" "^0.9.2" ajv "^6.10.0" chalk "^4.0.0" @@ -8385,7 +8385,7 @@ eslint@^8.3.0: eslint-scope "^7.1.1" eslint-utils "^3.0.0" eslint-visitor-keys "^3.3.0" - espree "^9.3.1" + espree "^9.3.2" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -8401,7 +8401,7 @@ eslint@^8.3.0: json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" lodash.merge "^4.6.2" - minimatch "^3.0.4" + minimatch "^3.1.2" natural-compare "^1.4.0" optionator "^0.9.1" regexpp "^3.2.0" @@ -8410,13 +8410,13 @@ eslint@^8.3.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^9.3.1: - version "9.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd" - integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ== +espree@^9.3.2: + version "9.3.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596" + integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA== dependencies: - acorn "^8.7.0" - acorn-jsx "^5.3.1" + acorn "^8.7.1" + acorn-jsx "^5.3.2" eslint-visitor-keys "^3.3.0" esprima@^4.0.0, esprima@^4.0.1: @@ -9303,9 +9303,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.6.0, globals@^13.9.0: - version "13.13.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b" - integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A== + version "13.14.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.14.0.tgz#daf3ff9b4336527cf56e98330b6f64bea9aff9df" + integrity sha512-ERO68sOYwm5UuLvSJTY7w7NP2c8S4UcXs3X1GBX8cwOr+ShOcDBbCY5mH4zxz0jsYCdJ8ve8Mv9n2YGJMB1aeg== dependencies: type-fest "^0.20.2" @@ -9315,9 +9315,9 @@ globals@^9.18.0: integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== globalthis@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" - integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== + version "1.0.3" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" + integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== dependencies: define-properties "^1.1.3" @@ -10119,9 +10119,9 @@ invariant@^2.2.2, invariant@^2.2.4: loose-envify "^1.0.0" ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + version "1.1.7" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.7.tgz#4f6195d7bdb30435aac35301e7b993c6c8218c0d" + integrity sha512-SLm2ERgmBGag79RfrIknk+40ZOJCgUBpCQTl3WE2YER21VR0W3Vt/OAXXaYLSU0AIcBqWnytoTwk2ZcTbxH0xg== ipaddr.js@1.9.1: version "1.9.1" @@ -11806,10 +11806,10 @@ 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: - version "10.5.0" - resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-10.5.0.tgz#f81d0518fe7b4b2a0b85e1125b8ecfc364fb0292" - integrity sha512-gRnSY9psN9zgiB2QV9F4XbuX5hwjxY5Ou7qoTFWDbn2vZ3UEs+sjfK/SRg2WP30TNfZWpwlGdp8H1knFJnpFdA== +mathjs@^10.5.2: + version "10.5.2" + resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-10.5.2.tgz#bf0618b99b662a3af8a2613b6489ec0422314b08" + integrity sha512-yLl2yA597A+07+xsOgy1+pq/m4ZokQceWQbB9OsIkK2guCpA2Px9k11zul93eJAA0WUFZiMK6VcruY9ZBbSKjA== dependencies: "@babel/runtime" "^7.17.9" complex.js "^2.1.1" @@ -14285,9 +14285,9 @@ rc-pagination@~3.1.9: classnames "^2.2.1" rc-picker@~2.6.4: - version "2.6.8" - resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.6.8.tgz#eff71e13d836953a4c7439c958228b5108f92c22" - integrity sha512-j14N2nxcx4PAw7LviwLKIJG4cEAlCFhcHI/7pz+Ps43Df7UrSIWt/QGJgPAWz38Z6jrjsgMcyVHVccpL09gDDA== + version "2.6.9" + resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.6.9.tgz#2f2f82c5340adbe3b30875a25e015c120eb88c9c" + integrity sha512-yH3UYXCADf7REtOAB5cwe1cyFKtB0p204RCN8JdZGG4uuSOZ1IPTkk/GJS6HOpxspZeJCLGzzajuQMDwck9dsw== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" @@ -14463,9 +14463,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.2.0, rc-util@^5.2.1, rc-util@^5.20.0, rc-util@^5.20.1, rc-util@^5.21.0, 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.21.2" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.21.2.tgz#fa23277ba84e5561af2febdca64de3fc2b3e1528" - integrity sha512-QuuZ2tKMScGtxSx3rLzgPGGDZm/np7phMqA7OcDidSf44abvSk+AdtdD7ZvQPvCEtdC6nCSI5tEVnUaYjjD9/w== + version "5.21.4" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.21.4.tgz#61e24ad297f679ca0796b618a3ef30eca959d904" + integrity sha512-rq11ap3NnOIdywFhcMQ9J7DXRJJ1c1Id1Hvr/1Dphr+5X75ERJBJybuh779DdurP4LJQqAhT6Aie0AjrBc5Vqw== dependencies: "@babel/runtime" "^7.12.5" react-is "^16.12.0" @@ -15412,9 +15412,9 @@ rollup-plugin-terser@^7.0.0: terser "^5.0.0" rollup@^2.43.1: - version "2.72.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.72.0.tgz#f94280b003bcf9f2f1f2594059a9db5abced371e" - integrity sha512-KqtR2YcO35/KKijg4nx4STO3569aqCUeGRkKWnJ6r+AvBBrVY9L4pmf4NHVrQr4mTOq6msbohflxr2kpihhaOA== + version "2.72.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.72.1.tgz#861c94790537b10008f0ca0fbc60e631aabdd045" + integrity sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA== optionalDependencies: fsevents "~2.3.2" From 58a7cd769f90390da56880457ee0aa154e022b4d Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 16:13:49 -0400 Subject: [PATCH 070/340] Replaced `;` with `&&` in coverage reports. Value: [1e-7 to 1e-3] --- .github/workflows/ci.yml | 2 ++ packages/squiggle-lang/package.json | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index acd96119..7124406e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,6 +68,8 @@ jobs: working-directory: packages/squiggle-lang steps: - uses: actions/checkout@v2 + with: + fetch-depth: 2 - name: Install dependencies from monorepo level run: cd ../../ && yarn - name: Build rescript codebase diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 9ca9dc2e..ff786b91 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -9,16 +9,16 @@ "build:typescript": "tsc", "bundle": "webpack", "start": "rescript build -w -with-deps", - "clean": "rescript clean && rm -r dist", + "clean": "rescript clean && rm -rf dist", "test:reducer": "jest __tests__/Reducer*/", "benchmark": "ts-node benchmark/conversion_tests.ts", "test": "jest", "test:ts": "jest __tests__/TS/", "test:rescript": "jest --modulePathIgnorePatterns=__tests__/TS/*", "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": "yarn clean; yarn build; nyc --reporter=lcov yarn test:ts", - "coverage:rescript:ci": "yarn clean; BISECT_ENABLE=yes yarn build; yarn test:rescript; bisect-ppx-report send-to Codecov", + "coverage:rescript": "rm -f *.coverage && yarn clean && BISECT_ENABLE=yes yarn build && yarn test:rescript && bisect-ppx-report html", + "coverage:ts": "yarn clean && yarn build && nyc --reporter=lcov yarn test:ts", + "coverage:rescript:ci": "yarn clean && BISECT_ENABLE=yes yarn build:rescript && yarn test:rescript && bisect-ppx-report send-to Codecov", "coverage:ts:ci": "yarn coverage:ts && codecov", "lint:rescript": "./lint.sh", "lint:prettier": "prettier --check .", From 216ede45b2d6fecff85d16974551504c473966cc Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 16:27:34 -0400 Subject: [PATCH 071/340] Fixed Bisect Value: [1e-5 to 1e-3] --- .../ReducerInterface/ReducerInterface_GenericDistribution.res | 2 +- packages/website/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index fa7be3be..8b7a5cc4 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -120,7 +120,7 @@ module Helpers = { } let mixture = (args: array): DistributionOperation.outputType => { - let error = (err: string): DistributionOperation.outputType => err->ArgumentError->GenDistError + let error = (err: string): DistributionOperation.outputType => err->DistributionTypes.ArgumentError->GenDistError switch args { | [EvArray(distributions)] => switch parseDistributionArray(distributions) { diff --git a/packages/website/package.json b/packages/website/package.json index 9cbc361e..5f4172f6 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -14,7 +14,7 @@ "dependencies": { "@docusaurus/core": "2.0.0-beta.20", "@docusaurus/preset-classic": "2.0.0-beta.20", - "@quri/squiggle-components": "0.2.9", + "@quri/squiggle-components": "^0.2.20", "clsx": "^1.1.1", "prism-react-renderer": "^1.2.1", "react": "^18.1.0", From 465383205aa63dd0ba17bab7226808bc1c194e18 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 16:34:03 -0400 Subject: [PATCH 072/340] Fixed lint Value: [1e-10 to 1e-6] --- .../ReducerInterface/ReducerInterface_GenericDistribution.res | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 8b7a5cc4..8dae2586 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -120,7 +120,8 @@ module Helpers = { } let mixture = (args: array): DistributionOperation.outputType => { - let error = (err: string): DistributionOperation.outputType => err->DistributionTypes.ArgumentError->GenDistError + let error = (err: string): DistributionOperation.outputType => + err->DistributionTypes.ArgumentError->GenDistError switch args { | [EvArray(distributions)] => switch parseDistributionArray(distributions) { From 06d9a4715100ac973d7378ef114feb739b64eb2d Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 16:38:15 -0400 Subject: [PATCH 073/340] cleaned up `yarn.lock`` --- yarn.lock | 548 +----------------------------------------------------- 1 file changed, 5 insertions(+), 543 deletions(-) diff --git a/yarn.lock b/yarn.lock index 876f1d82..351a1e62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -138,40 +138,6 @@ "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" -"@ant-design/colors@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-6.0.0.tgz#9b9366257cffcc47db42b9d0203bb592c13c0298" - integrity sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ== - dependencies: - "@ctrl/tinycolor" "^3.4.0" - -"@ant-design/icons-svg@^4.2.1": - version "4.2.1" - resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz#8630da8eb4471a4aabdaed7d1ff6a97dcb2cf05a" - integrity sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw== - -"@ant-design/icons@^4.7.0": - version "4.7.0" - resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.7.0.tgz#8c3cbe0a556ba92af5dc7d1e70c0b25b5179af0f" - integrity sha512-aoB4Z7JA431rt6d4u+8xcNPPCrdufSRMUOpxa1ab6mz1JCQZOEVolj2WVs/tDFmN62zzK30mNelEsprLYsSF3g== - dependencies: - "@ant-design/colors" "^6.0.0" - "@ant-design/icons-svg" "^4.2.1" - "@babel/runtime" "^7.11.2" - classnames "^2.2.6" - rc-util "^5.9.4" - -"@ant-design/react-slick@~0.28.1": - version "0.28.4" - resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.28.4.tgz#8b296b87ad7c7ae877f2a527b81b7eebd9dd29a9" - integrity sha512-j9eAHTn7GxbXUFNknJoHS2ceAsqrQi2j8XykjZE1IXCD8kJF+t28EvhBLniDpbOsBk/3kjalnhriTfZcjBHNqg== - dependencies: - "@babel/runtime" "^7.10.4" - classnames "^2.2.5" - json2mq "^0.2.0" - lodash "^4.17.21" - resize-observer-polyfill "^1.5.0" - "@apideck/better-ajv-errors@^0.3.1": version "0.3.3" resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.3.tgz#ab0b1e981e1749bf59736cf7ebe25cfc9f949c15" @@ -1272,7 +1238,7 @@ core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.8", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.8", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== @@ -1423,11 +1389,6 @@ resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.0.tgz#f6e0e58376f09e381a49bd553772a97a477da3fd" integrity sha512-T5ZyNSw9G0x0UDFiXV40a7VjKw2b+l4G+S0sctKqxhx8cg9QtMUAGwJBVU9mHPDPoZEmwm0tEoukjl4zb9MU7Q== -"@ctrl/tinycolor@^3.4.0": - 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" resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" @@ -2414,18 +2375,6 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64" integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw== -"@quri/squiggle-components@0.2.9": - version "0.2.9" - resolved "https://registry.yarnpkg.com/@quri/squiggle-components/-/squiggle-components-0.2.9.tgz#9a2c7ce824ad59f980dc73e465676bd2563d409c" - integrity sha512-RpMTCzf7vBY+fatdjD+iFWkleMYOkJQN7kknZlLBriSo8Fy5KjhKghR+DotU+HE/2Yq1jUIveaIDF0XRBg+SVA== - dependencies: - "@react-hook/size" "^2.1.2" - antd "^4.20.0" - react "^18.0.0" - react-ace "10.0.0" - react-dom "^18.0.0" - styled-components "^5.3.5" - "@react-hook/latest@^1.0.2": version "1.0.3" resolved "https://registry.yarnpkg.com/@react-hook/latest/-/latest-1.0.3.tgz#c2d1d0b0af8b69ec6e2b3a2412ba0768ac82db80" @@ -5022,56 +4971,6 @@ ansi-to-html@^0.6.11: dependencies: entities "^2.0.0" -antd@^4.20.0: - version "4.20.3" - resolved "https://registry.yarnpkg.com/antd/-/antd-4.20.3.tgz#21f77332d201ea9f1d76685ca9534b4796791c81" - integrity sha512-liZB/OguxPPNnssiR8UH5gjAV3LetsnA8K0G+VBVJkCZsU5QmCDL05d059Nu6iRD7FVg0drSONZQwvWD4pO4nw== - dependencies: - "@ant-design/colors" "^6.0.0" - "@ant-design/icons" "^4.7.0" - "@ant-design/react-slick" "~0.28.1" - "@babel/runtime" "^7.12.5" - "@ctrl/tinycolor" "^3.4.0" - classnames "^2.2.6" - copy-to-clipboard "^3.2.0" - lodash "^4.17.21" - memoize-one "^6.0.0" - moment "^2.29.2" - rc-cascader "~3.5.0" - rc-checkbox "~2.3.0" - rc-collapse "~3.1.0" - rc-dialog "~8.8.1" - rc-drawer "~4.4.2" - rc-dropdown "~3.5.0" - rc-field-form "~1.26.1" - rc-image "~5.6.0" - rc-input "~0.0.1-alpha.5" - rc-input-number "~7.3.0" - rc-mentions "~1.7.0" - rc-menu "~9.5.5" - rc-motion "^2.5.1" - rc-notification "~4.6.0" - rc-pagination "~3.1.9" - rc-picker "~2.6.4" - rc-progress "~3.2.1" - rc-rate "~2.9.0" - rc-resize-observer "^1.2.0" - rc-segmented "~2.1.0 " - rc-select "~14.1.1" - rc-slider "~10.0.0" - rc-steps "~4.1.0" - rc-switch "~3.2.0" - rc-table "~7.24.0" - rc-tabs "~11.13.0" - rc-textarea "~0.3.0" - rc-tooltip "~5.1.1" - rc-tree "~5.5.0" - rc-tree-select "~5.3.0" - rc-trigger "^5.2.10" - rc-upload "~4.3.0" - rc-util "^5.20.0" - scroll-into-view-if-needed "^2.2.25" - anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -5204,11 +5103,6 @@ array-includes@^3.0.3, array-includes@^3.1.4: get-intrinsic "^1.1.1" is-string "^1.0.7" -array-tree-filter@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz#873ac00fec83749f255ac8dd083814b4f6329190" - integrity sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw== - array-union@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -5317,11 +5211,6 @@ async-each@^1.0.1: resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== -async-validator@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.1.1.tgz#3cd1437faa2de64743f7d56649dd904c946a18fe" - integrity sha512-p4DO/JXwjs8klJyJL8Q2oM4ks5fUTze/h5k10oPPKMiLe1fj3G1QMzPHNmN1Py4ycOk7WlO2DcGXv1qiESJCZA== - async@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" @@ -6414,11 +6303,6 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -classnames@2.x, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" - integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== - clean-css@^4.2.3: version "4.2.4" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178" @@ -6798,7 +6682,7 @@ copy-text-to-clipboard@^3.0.1: resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" integrity sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q== -copy-to-clipboard@^3.2.0, copy-to-clipboard@^3.3.1: +copy-to-clipboard@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae" integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw== @@ -7425,16 +7309,6 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" -date-fns@2.x: - version "2.28.0" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2" - integrity sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw== - -dayjs@1.x: - version "1.11.2" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5" - integrity sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw== - debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -7742,11 +7616,6 @@ dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9: resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz#56082f71b1dc7aac69d83c4285eef39c15d93f56" integrity sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg== -dom-align@^1.7.0: - version "1.12.3" - resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.3.tgz#a36d02531dae0eefa2abb0c4db6595250526f103" - integrity sha512-Gj9hZN3a07cbR6zviMUBOMPdWxYhbMI+x+WS0NAIu2zFZmbK8ys9R79g+iG9qLnlCwpFoaB+fKy8Pdv470GsPA== - dom-converter@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" @@ -11331,13 +11200,6 @@ json-stringify-pretty-compact@^3.0.0, json-stringify-pretty-compact@~3.0.0: resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz#f71ef9d82ef16483a407869556588e91b681d9ab" integrity sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA== -json2mq@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/json2mq/-/json2mq-0.2.0.tgz#b637bd3ba9eabe122c83e9720483aeb10d2c904a" - integrity sha1-tje9O6nqvhIsg+lyBIOusQ0skEo= - dependencies: - string-convert "^0.2.0" - json5@2.x, json5@^2.1.2, json5@^2.1.3, json5@^2.2.0, json5@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" @@ -11903,11 +11765,6 @@ memfs@^3.1.2, memfs@^3.2.2, memfs@^3.4.1: dependencies: fs-monkey "1.0.3" -memoize-one@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045" - integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw== - memoizerific@^1.11.3: version "1.11.3" resolved "https://registry.yarnpkg.com/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a" @@ -12183,11 +12040,6 @@ moduleserve@^0.9.1: send "^0.17.1" serve-static "^1.14.1" -moment@^2.24.0, moment@^2.29.2: - version "2.29.3" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3" - integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw== - move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -14113,373 +13965,6 @@ raw-loader@^4.0.2: loader-utils "^2.0.0" schema-utils "^3.0.0" -rc-align@^4.0.0: - version "4.0.12" - resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-4.0.12.tgz#065b5c68a1cc92a00800c9239320d9fdf5f16207" - integrity sha512-3DuwSJp8iC/dgHzwreOQl52soj40LchlfUHtgACOUtwGuoFIOVh6n/sCpfqCU8kO5+iz6qR0YKvjgB8iPdE3aQ== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "2.x" - dom-align "^1.7.0" - lodash "^4.17.21" - rc-util "^5.3.0" - resize-observer-polyfill "^1.5.1" - -rc-cascader@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.5.0.tgz#a49b632bc2d0c8ef31b212c8ddd0bea346e64877" - integrity sha512-rpXnWCfvk7Frh2dBzMoA0c7i0nn6aJU7L2NZo8R8pNkrT0sKgytQSpdtPWP+Pq8IkvwbEd8BU8Z8OnOljcqgZg== - dependencies: - "@babel/runtime" "^7.12.5" - array-tree-filter "^2.1.0" - classnames "^2.3.1" - rc-select "~14.1.0" - rc-tree "~5.5.0" - rc-util "^5.6.1" - -rc-checkbox@~2.3.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.3.2.tgz#f91b3678c7edb2baa8121c9483c664fa6f0aefc1" - integrity sha512-afVi1FYiGv1U0JlpNH/UaEXdh6WUJjcWokj/nUN2TgG80bfG+MDdbfHKlLcNNba94mbjy2/SXJ1HDgrOkXGAjg== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.1" - -rc-collapse@~3.1.0: - version "3.1.4" - resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.1.4.tgz#063e33fcc427a378e63da757898cd1fba6269679" - integrity sha512-WayrhswKMwuJab9xbqFxXTgV0m6X8uOPEO6zm/GJ5YJiJ/wIh/Dd2VtWeI06HYUEnTFv0HNcYv+zWbB+p6OD2A== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "2.x" - rc-motion "^2.3.4" - rc-util "^5.2.1" - shallowequal "^1.1.0" - -rc-dialog@~8.8.0, rc-dialog@~8.8.1: - version "8.8.1" - resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-8.8.1.tgz#cd8897fbee1de0eab6d237a6abe1e4db8d09dd72" - integrity sha512-7M1WKZCjfIABKEaJVskdYvb80z+RX7I11PeSjPVfLOOaJAmIepvDEd0alBtOZvOL3fZFWlMs4JVZtp9LZgONxA== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.6" - rc-motion "^2.3.0" - rc-util "^5.21.0" - -rc-drawer@~4.4.2: - version "4.4.3" - resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-4.4.3.tgz#2094937a844e55dc9644236a2d9fba79c344e321" - integrity sha512-FYztwRs3uXnFOIf1hLvFxIQP9MiZJA+0w+Os8dfDh/90X7z/HqP/Yg+noLCIeHEbKln1Tqelv8ymCAN24zPcfQ== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.6" - rc-util "^5.7.0" - -rc-dropdown@~3.5.0: - version "3.5.2" - resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-3.5.2.tgz#2f1f4eeb36c07fb67cd599c0cb8e861da3de5527" - integrity sha512-Ty4LsXjkspZuFJSRx3blCLLCDicXM5qds6F1odgEa+jcjC+OJKHQGnvE4FqtoljPaqWm4wG78pbgXH6Ddh2DkA== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.6" - rc-trigger "^5.0.4" - rc-util "^5.17.0" - -rc-field-form@~1.26.1: - version "1.26.4" - resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.26.4.tgz#78553e0f317f0ed7ceea70b1b89d43865dddeb83" - integrity sha512-eCCyiNNaN0NTYTyoziQHD4Fj6mUED21lWkw66vg+kttg0eDw+miD6LsaJbTD5c2bzKjUJTf10AitPG+f5zT4+A== - dependencies: - "@babel/runtime" "^7.8.4" - async-validator "^4.1.0" - rc-util "^5.8.0" - -rc-image@~5.6.0: - version "5.6.2" - resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.6.2.tgz#31892b0b22aa5122fd9b1a067e9a4ba627004214" - integrity sha512-qhKOVvivCZkd6CrzS/4ST2+Auu16mtPSFVqVzwE7sELWfuvzcLGTzGv8UsVvm6qRNIz6SeaueUetqi4Ii16XQA== - dependencies: - "@babel/runtime" "^7.11.2" - classnames "^2.2.6" - rc-dialog "~8.8.0" - rc-util "^5.0.6" - -rc-input-number@~7.3.0: - version "7.3.4" - resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-7.3.4.tgz#674aea98260250287d36e330a7e065b174486e9d" - integrity sha512-W9uqSzuvJUnz8H8vsVY4kx+yK51SsAxNTwr8SNH4G3XqQNocLVmKIibKFRjocnYX1RDHMND9FFbgj2h7E7nvGA== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.5" - rc-util "^5.9.8" - -rc-input@~0.0.1-alpha.5: - version "0.0.1-alpha.7" - resolved "https://registry.yarnpkg.com/rc-input/-/rc-input-0.0.1-alpha.7.tgz#53e3f13871275c21d92b51f80b698f389ad45dd3" - integrity sha512-eozaqpCYWSY5LBMwlHgC01GArkVEP+XlJ84OMvdkwUnJBSv83Yxa15pZpn7vACAj84uDC4xOA2CoFdbLuqB08Q== - dependencies: - "@babel/runtime" "^7.11.1" - classnames "^2.2.1" - rc-util "^5.18.1" - -rc-mentions@~1.7.0: - version "1.7.1" - resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.7.1.tgz#480ad04af4460ee01b6ccd9137fcea23067aa9be" - integrity sha512-JbCS9bTqt6BYN2vfTPythlScLuc42rIlX85n7975RnkfawXlJjskHOlR3o8EpD4asl4KuA2jKTy0dj39DtSVqg== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.6" - rc-menu "~9.5.1" - rc-textarea "^0.3.0" - rc-trigger "^5.0.4" - rc-util "^5.0.1" - -rc-menu@~9.5.1, rc-menu@~9.5.5: - version "9.5.5" - resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.5.5.tgz#aa2f151d4191ed089dc1a8141fe365c9b77d61a9" - integrity sha512-wj2y2BAKwSMyWXO3RBf9sNN5V+DFWxFl45Ma6qQEHA5nwwh7p07bNgc6AAJc+L1+LAz+rWz3AU8PYyT17hMHCw== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "2.x" - rc-motion "^2.4.3" - rc-overflow "^1.2.0" - rc-trigger "^5.1.2" - rc-util "^5.12.0" - shallowequal "^1.1.0" - -rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motion@^2.4.3, rc-motion@^2.4.4, rc-motion@^2.5.1: - version "2.6.0" - resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.6.0.tgz#c60c3e7f15257f55a8cd7794a539f0e2cc751399" - integrity sha512-1MDWA9+i174CZ0SIDenSYm2Wb9YbRkrexjZWR0CUFu7D6f23E8Y0KsTgk9NGOLJsGak5ELZK/Y5lOlf5wQdzbw== - dependencies: - "@babel/runtime" "^7.11.1" - classnames "^2.2.1" - rc-util "^5.21.0" - -rc-notification@~4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.6.0.tgz#4e76fc2d0568f03cc93ac18c9e20763ebe29fa46" - integrity sha512-xF3MKgIoynzjQAO4lqsoraiFo3UXNYlBfpHs0VWvwF+4pimen9/H1DYLN2mfRWhHovW6gRpla73m2nmyIqAMZQ== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "2.x" - rc-motion "^2.2.0" - rc-util "^5.20.1" - -rc-overflow@^1.0.0, rc-overflow@^1.2.0: - version "1.2.5" - resolved "https://registry.yarnpkg.com/rc-overflow/-/rc-overflow-1.2.5.tgz#d0fe3f9fa99edec70f4fe20e38119e8c1c5ae3ca" - integrity sha512-5HJKZ4nPe9e7AFdCkflgpRydvH6lJ4i2iFF06q/T1G9lL/XBeuoPLRrTBU8ao/Vo/yARW6WfEHnC2951lVgX5Q== - dependencies: - "@babel/runtime" "^7.11.1" - classnames "^2.2.1" - rc-resize-observer "^1.0.0" - rc-util "^5.19.2" - -rc-pagination@~3.1.9: - version "3.1.16" - resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.16.tgz#b0082108cf027eded18ed61d818d31897c343e81" - integrity sha512-GFcHXJ7XxeJDf9B+ndP4PRDt46maSSgYhiwofBMiIGKIlBhJ0wfu8DMCEvaWJJLpI2u4Gb6zF1dHpiqPFrosPg== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.1" - -rc-picker@~2.6.4: - version "2.6.9" - resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.6.9.tgz#2f2f82c5340adbe3b30875a25e015c120eb88c9c" - integrity sha512-yH3UYXCADf7REtOAB5cwe1cyFKtB0p204RCN8JdZGG4uuSOZ1IPTkk/GJS6HOpxspZeJCLGzzajuQMDwck9dsw== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.1" - date-fns "2.x" - dayjs "1.x" - moment "^2.24.0" - rc-trigger "^5.0.4" - rc-util "^5.4.0" - shallowequal "^1.1.0" - -rc-progress@~3.2.1: - version "3.2.4" - resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.2.4.tgz#4036acdae2566438545bc4df2203248babaf7549" - integrity sha512-M9WWutRaoVkPUPIrTpRIDpX0SPSrVHzxHdCRCbeoBFrd9UFWTYNWRlHsruJM5FH1AZI+BwB4wOJUNNylg/uFSw== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.6" - rc-util "^5.16.1" - -rc-rate@~2.9.0: - version "2.9.1" - resolved "https://registry.yarnpkg.com/rc-rate/-/rc-rate-2.9.1.tgz#e43cb95c4eb90a2c1e0b16ec6614d8c43530a731" - integrity sha512-MmIU7FT8W4LYRRHJD1sgG366qKtSaKb67D0/vVvJYR0lrCuRrCiVQ5qhfT5ghVO4wuVIORGpZs7ZKaYu+KMUzA== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.5" - rc-util "^5.0.1" - -rc-resize-observer@^1.0.0, rc-resize-observer@^1.1.0, rc-resize-observer@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.2.0.tgz#9f46052f81cdf03498be35144cb7c53fd282c4c7" - integrity sha512-6W+UzT3PyDM0wVCEHfoW3qTHPTvbdSgiA43buiy8PzmeMnfgnDeb9NjdimMXMl3/TcrvvWl5RRVdp+NqcR47pQ== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.1" - rc-util "^5.15.0" - resize-observer-polyfill "^1.5.1" - -"rc-segmented@~2.1.0 ": - version "2.1.0" - resolved "https://registry.yarnpkg.com/rc-segmented/-/rc-segmented-2.1.0.tgz#0e0afe646c1a0e44a0e18785f518c42633ec8efc" - integrity sha512-hUlonro+pYoZcwrH6Vm56B2ftLfQh046hrwif/VwLIw1j3zGt52p5mREBwmeVzXnSwgnagpOpfafspzs1asjGw== - dependencies: - "@babel/runtime" "^7.11.1" - classnames "^2.2.1" - rc-motion "^2.4.4" - rc-util "^5.17.0" - -rc-select@~14.1.0, rc-select@~14.1.1: - version "14.1.2" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.1.2.tgz#59a73726ef82a87b174ed0784cddfccc7e797e4b" - integrity sha512-/QgarL/T/d7MIPcoRmTca2TWHBoHBM1EQIgdaFmvl3qsYRSbrb8NpWcQuJoc9fprXERWxdYSTUThQObHvdEVBQ== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "2.x" - rc-motion "^2.0.1" - rc-overflow "^1.0.0" - rc-trigger "^5.0.4" - rc-util "^5.16.1" - rc-virtual-list "^3.2.0" - -rc-slider@~10.0.0: - 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" - rc-tooltip "^5.0.1" - rc-util "^5.18.1" - shallowequal "^1.1.0" - -rc-steps@~4.1.0: - version "4.1.4" - resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-4.1.4.tgz#0ba82db202d59ca52d0693dc9880dd145b19dc23" - integrity sha512-qoCqKZWSpkh/b03ASGx1WhpKnuZcRWmvuW+ZUu4mvMdfvFzVxblTwUM+9aBd0mlEUFmt6GW8FXhMpHkK3Uzp3w== - dependencies: - "@babel/runtime" "^7.10.2" - classnames "^2.2.3" - rc-util "^5.0.1" - -rc-switch@~3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-3.2.2.tgz#d001f77f12664d52595b4f6fb425dd9e66fba8e8" - integrity sha512-+gUJClsZZzvAHGy1vZfnwySxj+MjLlGRyXKXScrtCTcmiYNPzxDFOxdQ/3pK1Kt/0POvwJ/6ALOR8gwdXGhs+A== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.1" - rc-util "^5.0.1" - -rc-table@~7.24.0: - version "7.24.1" - resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.24.1.tgz#15ecabc9d69f8300b988caa52986e3b215150f2b" - integrity sha512-DRWpv5z5pmOaTmy5GqWoskeV1thaOu5HuD+2f61b/CkbBqlgJR3cygc5R/Qvd2uVW6pHU0lYulhmz0VLVFm+rw== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.5" - rc-resize-observer "^1.1.0" - rc-util "^5.14.0" - shallowequal "^1.1.0" - -rc-tabs@~11.13.0: - version "11.13.0" - resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-11.13.0.tgz#083eed578f8ad02dc0d462d73da487fe32e3a573" - integrity sha512-aUw1Pq0B1a2zGX4o/m3yrQycZcCLgDp6gKwn8IAU07q148RRONsVGxi0oLVVe5SE51kOB+j0bk1RX43ZBdZNgA== - dependencies: - "@babel/runtime" "^7.11.2" - classnames "2.x" - rc-dropdown "~3.5.0" - rc-menu "~9.5.1" - rc-resize-observer "^1.0.0" - rc-util "^5.5.0" - -rc-textarea@^0.3.0, rc-textarea@~0.3.0: - version "0.3.7" - resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.3.7.tgz#987142891efdedb774883c07e2f51b318fde5a11" - integrity sha512-yCdZ6binKmAQB13hc/oehh0E/QRwoPP1pjF21aHBxlgXO3RzPF6dUu4LG2R4FZ1zx/fQd2L1faktulrXOM/2rw== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.1" - rc-resize-observer "^1.0.0" - rc-util "^5.7.0" - shallowequal "^1.1.0" - -rc-tooltip@^5.0.1, rc-tooltip@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-5.1.1.tgz#94178ed162d0252bc4993b725f5dc2ac0fccf154" - integrity sha512-alt8eGMJulio6+4/uDm7nvV+rJq9bsfxFDCI0ljPdbuoygUscbsMYb6EQgwib/uqsXQUvzk+S7A59uYHmEgmDA== - dependencies: - "@babel/runtime" "^7.11.2" - rc-trigger "^5.0.0" - -rc-tree-select@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.3.0.tgz#6edd19d1066ad2bfa212f043c3ff701b93828026" - integrity sha512-UN6CUBulmch+CsihnJ73+DtWijEB1hVTC8sdVxq6E0teVAkHQZUvDj+cwZShtShAKvWwXy73PZ1hIHEUrmVcKw== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "2.x" - rc-select "~14.1.0" - rc-tree "~5.5.0" - rc-util "^5.16.1" - -rc-tree@~5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.5.0.tgz#ba7c8aea2ad29f40a9c7168e490300f7a50c0f22" - integrity sha512-vpKeFsDyj7weik8UPseCTaSNAPt939qn1dQd8goSbRDajbjJEja0v/WFXyRhOiF1HLemNTfqMz4MYc9qlqyNXg== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "2.x" - rc-motion "^2.0.1" - rc-util "^5.16.1" - 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.18" - resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.18.tgz#adab51918e4569b174d4fc5044186200d97a542c" - integrity sha512-hi2yZ7umtbAGLxgSph1az9BR9i4Pb4fiQa4pdvFQuKN7U//3nwwygHQKHfexnM+0APBnzZwVlEHA5I8BpWrygw== - dependencies: - "@babel/runtime" "^7.11.2" - classnames "^2.2.6" - rc-align "^4.0.0" - rc-motion "^2.0.0" - rc-util "^5.19.2" - -rc-upload@~4.3.0: - version "4.3.3" - resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-4.3.3.tgz#e237aa525e5313fa16f4d04d27f53c2f0e157bb8" - integrity sha512-YoJ0phCRenMj1nzwalXzciKZ9/FAaCrFu84dS5pphwucTC8GUWClcDID/WWNGsLFcM97NqIboDqrV82rVRhW/w== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.5" - 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.2.0, rc-util@^5.2.1, rc-util@^5.20.0, rc-util@^5.20.1, rc-util@^5.21.0, 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.21.4" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.21.4.tgz#61e24ad297f679ca0796b618a3ef30eca959d904" - integrity sha512-rq11ap3NnOIdywFhcMQ9J7DXRJJ1c1Id1Hvr/1Dphr+5X75ERJBJybuh779DdurP4LJQqAhT6Aie0AjrBc5Vqw== - dependencies: - "@babel/runtime" "^7.12.5" - react-is "^16.12.0" - shallowequal "^1.1.0" - -rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.2: - version "3.4.7" - resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.7.tgz#ca0ba5ecddff686cd3833562d07c2678d1c9cb2e" - integrity sha512-PhV8a8g/L9sCmWcmXizzwW7QdqsxK4ebHU6fA9OsUIR7isFdx2bTGU2iAUdRV4teiIF1ZHF3gSQh8NtAxrXh6A== - dependencies: - classnames "^2.2.6" - rc-resize-observer "^1.0.0" - rc-util "^5.15.0" - rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -14490,17 +13975,6 @@ rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-ace@10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-10.0.0.tgz#1760e302604cff35ba40963db43eb027513b6572" - integrity sha512-AUoA2OsKOCv8fXLqcFM232dF/Z8w14bwPUZ9z5I2zjBfqfZOZLqxnhXN+qKL6VrQXs1DLUvalGOuM5TABAFOCA== - dependencies: - ace-builds "^1.4.14" - diff-match-patch "^1.0.5" - lodash.get "^4.4.2" - lodash.isequal "^4.5.0" - prop-types "^15.7.2" - react-ace@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-10.1.0.tgz#d348eac2b16475231779070b6cd16768deed565f" @@ -14590,7 +14064,7 @@ react-docgen@^5.0.0: node-dir "^0.1.10" strip-indent "^3.0.0" -react-dom@^18.0.0, react-dom@^18.1.0: +react-dom@^18.1.0: version "18.1.0" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.1.0.tgz#7f6dd84b706408adde05e1df575b3a024d7e8a2f" integrity sha512-fU1Txz7Budmvamp7bshe4Zi32d0ll7ect+ccxNu9FlObT605GOEB8BfO4tmRJ39R5Zj831VCpvQ05QPBW5yb+w== @@ -14650,7 +14124,7 @@ react-is@17.0.2, react-is@^17.0.1, react-is@^17.0.2: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: +react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -15287,7 +14761,7 @@ rescript@^9.1.4: resolved "https://registry.yarnpkg.com/rescript/-/rescript-9.1.4.tgz#1eb126f98d6c16942c0bf0df67c050198e580515" integrity sha512-aXANK4IqecJzdnDpJUsU6pxMViCR5ogAxzuqS0mOr8TloMnzAjJFu63fjD6LCkWrKAhlMkFFzQvVQYaAaVkFXw== -resize-observer-polyfill@^1.5.0, resize-observer-polyfill@^1.5.1: +resize-observer-polyfill@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== @@ -15596,13 +15070,6 @@ screenfull@^5.1.0: resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-5.2.0.tgz#6533d524d30621fc1283b9692146f3f13a93d1ba" integrity sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA== -scroll-into-view-if-needed@^2.2.25: - version "2.2.29" - resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz#551791a84b7e2287706511f8c68161e4990ab885" - integrity sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg== - dependencies: - compute-scroll-into-view "^1.0.17" - section-matter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167" @@ -16242,11 +15709,6 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== -string-convert@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97" - integrity sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c= - string-length@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" From b7e18b4f9dc55df244f5c635031737955c0e83b0 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 16:43:37 -0400 Subject: [PATCH 074/340] Simplified tree in `squiggle-lang/src/rescript/Distributions` Value: [1e-8 to 1e-4] --- packages/squiggle-lang/src/js/distribution.ts | 2 +- .../{DistributionOperation => }/DistributionOperation.res | 0 .../{DistributionOperation => }/DistributionOperation.resi | 0 .../rescript/Distributions/{GenericDist => }/GenericDist.res | 0 .../rescript/Distributions/{GenericDist => }/GenericDist.resi | 0 .../src/rescript/Distributions/{GenericDist => }/README.md | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename packages/squiggle-lang/src/rescript/Distributions/{DistributionOperation => }/DistributionOperation.res (100%) rename packages/squiggle-lang/src/rescript/Distributions/{DistributionOperation => }/DistributionOperation.resi (100%) rename packages/squiggle-lang/src/rescript/Distributions/{GenericDist => }/GenericDist.res (100%) rename packages/squiggle-lang/src/rescript/Distributions/{GenericDist => }/GenericDist.resi (100%) rename packages/squiggle-lang/src/rescript/Distributions/{GenericDist => }/README.md (100%) diff --git a/packages/squiggle-lang/src/js/distribution.ts b/packages/squiggle-lang/src/js/distribution.ts index 44c15882..eaa76c47 100644 --- a/packages/squiggle-lang/src/js/distribution.ts +++ b/packages/squiggle-lang/src/js/distribution.ts @@ -35,7 +35,7 @@ import { Constructors_pointwiseSubtract, Constructors_pointwiseLogarithm, Constructors_pointwisePower, -} from "../rescript/Distributions/DistributionOperation/DistributionOperation.gen"; +} from "../rescript/Distributions/DistributionOperation.gen"; export type point = { x: number; y: number }; diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res similarity index 100% rename from packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.res rename to packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi similarity index 100% rename from packages/squiggle-lang/src/rescript/Distributions/DistributionOperation/DistributionOperation.resi rename to packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res similarity index 100% rename from packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.res rename to packages/squiggle-lang/src/rescript/Distributions/GenericDist.res diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi similarity index 100% rename from packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist.resi rename to packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/README.md b/packages/squiggle-lang/src/rescript/Distributions/README.md similarity index 100% rename from packages/squiggle-lang/src/rescript/Distributions/GenericDist/README.md rename to packages/squiggle-lang/src/rescript/Distributions/README.md From 48fcd526ce8a9bfc6ac633032d65356a360cab3c Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 17:06:44 -0400 Subject: [PATCH 075/340] Made `Node Packages` page in docs just reference github readmes Value: [1e-8 to 1e-4] --- packages/components/README.md | 2 ++ packages/squiggle-lang/README.md | 14 +++++++++++++ .../website/docs/Features/Node-Packages.md | 20 ++++--------------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/packages/components/README.md b/packages/components/README.md index 03eb5750..38e019a1 100644 --- a/packages/components/README.md +++ b/packages/components/README.md @@ -5,6 +5,8 @@ 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/). +The `@quri/squiggle-components` package offers several components and utilities for people who want to embed Squiggle components into websites. + # Usage in a `react` project For example, in a fresh `create-react-app` project diff --git a/packages/squiggle-lang/README.md b/packages/squiggle-lang/README.md index f6735454..8e84a333 100644 --- a/packages/squiggle-lang/README.md +++ b/packages/squiggle-lang/README.md @@ -13,6 +13,10 @@ For instance, in a javascript project, you can yarn add @quri/squiggle-lang ``` +The `@quri/squiggle-lang` package exports a single function, `run`, which given +a string of Squiggle code, will execute the code and return any exports and the +environment created from the squiggle code. + ```js import { run } from "@quri/squiggle-lang"; run( @@ -22,6 +26,16 @@ run( **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`. +`run` has two optional arguments. The first optional argument allows you to set +sampling settings for Squiggle when representing distributions. The second optional +argument allows you to pass an environment previously created by another `run` +call. Passing this environment will mean that all previously declared variables +in the previous environment will be made available. + +The return type of `run` is a bit complicated, and comes from auto generated `js` +code that comes from rescript. We highly recommend using typescript when using +this library to help navigate the return type. + # Build for development We assume that you ran `yarn` at the monorepo level. diff --git a/packages/website/docs/Features/Node-Packages.md b/packages/website/docs/Features/Node-Packages.md index d8fdc591..b405627a 100644 --- a/packages/website/docs/Features/Node-Packages.md +++ b/packages/website/docs/Features/Node-Packages.md @@ -12,25 +12,13 @@ Types are available for both packages. ## Squiggle Language -The `@quri/squiggle-lang` package exports a single function, `run`, which given -a string of Squiggle code, will execute the code and return any exports and the -environment created from the squiggle code. - -`run` has two optional arguments. The first optional argument allows you to set -sampling settings for Squiggle when representing distributions. The second optional -argument allows you to pass an environment previously created by another `run` -call. Passing this environment will mean that all previously declared variables -in the previous environment will be made available. - -The return type of `run` is a bit complicated, and comes from auto generated `js` -code that comes from rescript. We highly recommend using typescript when using -this library to help navigate the return type. +[_See `README.md` in Github_](https://github.com/quantified-uncertainty/squiggle/tree/develop/packages/squiggle-lang#use-the-npm-package) ## Squiggle Components -The `@quri/squiggle-components` package offers several components and utilities -for people who want to embed Squiggle components into websites. This documentation -uses `@quri/squiggle-components` frequently. +[_See `README.md` in Github_](https://github.com/quantified-uncertainty/squiggle/tree/develop/packages/components#usage-in-a-react-project) + +This documentation uses `@quri/squiggle-components` frequently. We host [a storybook](https://squiggle-components.netlify.app/) with details and usage of each of the components made available. From 0b8da034c626a1f3eb0d0bef676004044f9416d4 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Tue, 10 May 2022 19:59:50 -0400 Subject: [PATCH 076/340] `klDivergence` on mixed distributions works for one test case Value: [1e-4 to 5e-2] --- .../Distributions/KlDivergence_test.res | 60 ++++++++++++++++++- .../Distributions/PointSetDist/Mixed.res | 7 +-- .../PointSetDist/PointSetDist.res | 1 + 3 files changed, 63 insertions(+), 5 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index 96e95899..31f03ae2 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -5,7 +5,6 @@ open GenericDist_Fixtures describe("klDivergence: continuous -> continuous -> float", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) - exception KlFailed let testUniform = (lowAnswer, highAnswer, lowPrediction, highPrediction) => { test("of two uniforms is equal to the analytic expression", () => { @@ -59,6 +58,24 @@ describe("klDivergence: continuous -> continuous -> float", () => { } } }) + + test("of a normal and a uniform is equal to the formula", () => { + let prediction = normalDist10 + let answer = uniformDist + let kl = klDivergence(prediction, answer) + let analyticalKl = + -.Js.Math.log((10.0 -. 9.0) /. Js.Math.sqrt(2.0 *. MagicNumbers.Math.pi *. 2.0 ** 2.0)) +. + 1.0 /. + 2.0 ** 2.0 *. + (10.0 ** 2.0 -. (10.0 +. 9.0) *. 10.0 +. (9.0 ** 2.0 +. 10.0 *. 9.0 +. 10.0 ** 2.0) /. 3.0) + switch kl { + | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKl, ~digits=1) + | Error(err) => { + Js.Console.log(DistributionTypes.Error.toString(err)) + raise(KlFailed) + } + } + }) }) describe("klDivergence: discrete -> discrete -> float", () => { @@ -96,6 +113,47 @@ describe("klDivergence: discrete -> discrete -> float", () => { }) }) +describe("klDivergence: mixed -> mixed -> float", () => { + let klDivergence = DistributionOperation.Constructors.klDivergence(~env) + let mixture = a => DistributionTypes.DistributionOperation.Mixture(a) + let a' = [(floatDist, 1e0), (uniformDist, 1e0)]->mixture->run + let b' = [(point3, 1e0), (floatDist, 1e0), (normalDist10, 1e0)]->mixture->run + let (a, b) = switch (a', b') { + | (Dist(a''), Dist(b'')) => (a'', b'') + | _ => raise(MixtureFailed) + } + test("finite klDivergence returns is correct", () => { + let prediction = b + let answer = a + let kl = klDivergence(prediction, answer) + // high = 10; low = 9; mean = 10; stdev = 2 + let analyticalKlContinuousPart = + Js.Math.log(Js.Math.sqrt(2.0 *. MagicNumbers.Math.pi *. 2.0 ** 2.0) /. (10.0 -. 9.0)) +. + 1.0 /. + 2.0 ** 2.0 *. + (10.0 ** 2.0 -. (10.0 +. 9.0) *. 10.0 +. (9.0 ** 2.0 +. 10.0 *. 9.0 +. 10.0 ** 2.0) /. 3.0) + let analyticalKlDiscretePart = -2.0 /. 3.0 *. Js.Math.log(3.0 /. 2.0) + switch kl { + | Ok(kl') => + kl'->expect->toBeSoCloseTo(analyticalKlContinuousPart +. analyticalKlDiscretePart, ~digits=0) + | Error(err) => + Js.Console.log(DistributionTypes.Error.toString(err)) + raise(KlFailed) + } + }) + test("returns infinity when infinite", () => { + let prediction = a + let answer = b + let kl = klDivergence(prediction, answer) + switch kl { + | Ok(kl') => kl'->expect->toEqual(infinity) + | Error(err) => + Js.Console.log(DistributionTypes.Error.toString(err)) + raise(KlFailed) + } + }) +}) + describe("combineAlongSupportOfSecondArgument0", () => { // This tests the version of the function that we're NOT using. Haven't deleted the test in case we use the code later. test("test on two uniforms", _ => { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 05465728..7bbe2065 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -302,10 +302,9 @@ module T = Dist({ } let klDivergence = (prediction: t, answer: t) => { - Error(Operation.NotYetImplemented) - // combinePointwise(PointSetDist_Scoring.KLDivergence.integrand, prediction, answer) |> E.R.fmap( - // integralEndY, - // ) + let klDiscretePart = Discrete.T.klDivergence(prediction.discrete, answer.discrete) + let klContinuousPart = Continuous.T.klDivergence(prediction.continuous, answer.continuous) + E.R.merge(klDiscretePart, klContinuousPart)->E.R2.fmap(t => fst(t) +. snd(t)) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index 1879ebdd..db47d1e1 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -200,6 +200,7 @@ module T = Dist({ switch (t1, t2) { | (Continuous(t1), Continuous(t2)) => Continuous.T.klDivergence(t1, t2) | (Discrete(t1), Discrete(t2)) => Discrete.T.klDivergence(t1, t2) + | (Mixed(t1), Mixed(t2)) => Mixed.T.klDivergence(t1, t2) | _ => Error(NotYetImplemented) } }) From a2b5dbf6c3cf1a962fae3efd995d76af7d20b3ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 14:42:12 +0000 Subject: [PATCH 077/340] :arrow_up: Bump @types/node from 17.0.31 to 17.0.32 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.31 to 17.0.32. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index b5f1ab7c..b269735f 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -31,7 +31,7 @@ "@testing-library/user-event": "^14.1.1", "@types/jest": "^27.5.0", "@types/lodash": "^4.14.182", - "@types/node": "^17.0.31", + "@types/node": "^17.0.32", "@types/react": "^18.0.9", "@types/react-dom": "^18.0.2", "@types/styled-components": "^5.1.24", diff --git a/yarn.lock b/yarn.lock index 351a1e62..99712b31 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4038,10 +4038,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^17.0.31", "@types/node@^17.0.5": - version "17.0.31" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.31.tgz#a5bb84ecfa27eec5e1c802c6bbf8139bdb163a5d" - integrity sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q== +"@types/node@*", "@types/node@^17.0.32", "@types/node@^17.0.5": + version "17.0.32" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.32.tgz#51d59d7a90ef2d0ae961791e0900cad2393a0149" + integrity sha512-eAIcfAvhf/BkHcf4pkLJ7ECpBAhh9kcxRBpip9cTiO+hf+aJrsxYxBeS6OXvOd9WqNAJmavXVpZvY1rBjNsXmw== "@types/node@^14.0.10": version "14.18.16" From 4df4597ed333b5ccaa0dcd89d974253cd6630e6b Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Wed, 11 May 2022 12:23:36 -0400 Subject: [PATCH 078/340] fix: "Enrich" (add more x points) when integrating in order to get more numerical precision. Note: not complete yet. Value: [1e-3 to 3e-1] --- .../Distributions/KlDivergence_test.res | 2 +- .../Distributions/PointSetDist/Continuous.res | 3 +- .../src/rescript/MagicNumbers.res | 1 + .../src/rescript/Utility/XYShape.res | 38 +++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index 31f03ae2..e3efe446 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -69,7 +69,7 @@ describe("klDivergence: continuous -> continuous -> float", () => { 2.0 ** 2.0 *. (10.0 ** 2.0 -. (10.0 +. 9.0) *. 10.0 +. (9.0 ** 2.0 +. 10.0 *. 9.0 +. 10.0 ** 2.0) /. 3.0) switch kl { - | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKl, ~digits=1) + | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKl, ~digits=3) | Error(err) => { Js.Console.log(DistributionTypes.Error.toString(err)) raise(KlFailed) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 3aca0c66..c6bac10b 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -272,10 +272,11 @@ module T = Dist({ XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) let klDivergence = (prediction: t, answer: t) => { + let enrichedAnswer = XYShape.PointwiseCombination.enrichXyShape(answer.xyShape) // answer.xyShape // let newShape = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument( PointSetDist_Scoring.KLDivergence.integrand, prediction.xyShape, - answer.xyShape, + enrichedAnswer, ) let xyShapeToContinuous: XYShape.xyShape => t = xyShape => { xyShape: xyShape, diff --git a/packages/squiggle-lang/src/rescript/MagicNumbers.res b/packages/squiggle-lang/src/rescript/MagicNumbers.res index 13beafe4..cd8cfd2f 100644 --- a/packages/squiggle-lang/src/rescript/MagicNumbers.res +++ b/packages/squiggle-lang/src/rescript/MagicNumbers.res @@ -12,6 +12,7 @@ module Epsilon = { module Environment = { let defaultXYPointLength = 1000 let defaultSampleCount = 10000 + let enrichmentFactor = 10 } module OpCost = { diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 60d0bbde..16ad64ab 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -453,6 +453,44 @@ module PointwiseCombination = { T.filterOkYs(newXs, newYs)->Ok } + let enrichXyShape = (t: T.t): T.t => { + let length = E.A.length(t.xs) + Js.Console.log(length) + let points = switch length < MagicNumbers.Environment.defaultXYPointLength { + | true => + Belt.Int.fromFloat( + Belt.Float.fromInt( + MagicNumbers.Environment.enrichmentFactor * MagicNumbers.Environment.defaultXYPointLength, + ) /. + Belt.Float.fromInt(length), + ) + | false => MagicNumbers.Environment.enrichmentFactor + } + + let getInBetween = (x1: float, x2: float): array => { + let newPointsArray = Belt.Array.makeBy(points - 1, i => i) + // don't repeat the x2 point, it will be gotten in the next iteration. + let result = Js.Array.mapi((pos, i) => + switch i { + | 0 => x1 + | _ => + x1 *. + (Belt.Float.fromInt(points) -. Belt.Float.fromInt(pos)) /. + Belt.Float.fromInt(points) +. x2 *. Belt.Float.fromInt(pos) /. Belt.Float.fromInt(points) + } + , newPointsArray) + result + } + let newXsUnflattened = Js.Array.mapi((x, i) => + switch i < length - 1 { + | true => getInBetween(x, t.xs[i + 1]) + | false => [x] + } + , t.xs) + let newXs = Belt.Array.concatMany(newXsUnflattened) + let newYs = E.A.fmap(x => XtoY.linear(x, t), newXs) //XtoY.linear(newXs) + {xs: newXs, ys: newYs} + } // This function is used for klDivergence let combineAlongSupportOfSecondArgument: ( (float, float) => result, From 599c14b32c1b515a28cc8bc4ab391c70d11fd7d2 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Wed, 11 May 2022 12:39:03 -0400 Subject: [PATCH 079/340] tweak: Pass off to Quinn --- .../src/rescript/Distributions/PointSetDist/Continuous.res | 5 ++++- packages/squiggle-lang/src/rescript/Utility/XYShape.res | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index c6bac10b..e8049688 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -272,7 +272,10 @@ module T = Dist({ XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) let klDivergence = (prediction: t, answer: t) => { - let enrichedAnswer = XYShape.PointwiseCombination.enrichXyShape(answer.xyShape) // answer.xyShape // + let enrich = true + let enrichedAnswer = enrich + ? XYShape.PointwiseCombination.enrichXyShape(answer.xyShape) + : answer.xyShape // let newShape = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument( PointSetDist_Scoring.KLDivergence.integrand, prediction.xyShape, diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 16ad64ab..3daa6c6d 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -482,13 +482,13 @@ module PointwiseCombination = { result } let newXsUnflattened = Js.Array.mapi((x, i) => - switch i < length - 1 { + switch i < length - 2 { | true => getInBetween(x, t.xs[i + 1]) | false => [x] } , t.xs) let newXs = Belt.Array.concatMany(newXsUnflattened) - let newYs = E.A.fmap(x => XtoY.linear(x, t), newXs) //XtoY.linear(newXs) + let newYs = E.A.fmap(x => XtoY.linear(x, t), newXs) {xs: newXs, ys: newYs} } // This function is used for klDivergence From 5c9f57a24a66196cace59b5856c981608cf84712 Mon Sep 17 00:00:00 2001 From: NunoSempere Date: Wed, 11 May 2022 12:56:56 -0400 Subject: [PATCH 080/340] fix: Attain parity with previous implementation This is achieved by not adding more points in between i the points are already pretty close --- .../src/rescript/MagicNumbers.res | 2 +- .../src/rescript/Utility/XYShape.res | 28 +++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/MagicNumbers.res b/packages/squiggle-lang/src/rescript/MagicNumbers.res index cd8cfd2f..57e33e3b 100644 --- a/packages/squiggle-lang/src/rescript/MagicNumbers.res +++ b/packages/squiggle-lang/src/rescript/MagicNumbers.res @@ -11,7 +11,7 @@ module Epsilon = { module Environment = { let defaultXYPointLength = 1000 - let defaultSampleCount = 10000 + let defaultSampleCount = 1000 let enrichmentFactor = 10 } diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 3daa6c6d..01b59670 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -468,18 +468,24 @@ module PointwiseCombination = { } let getInBetween = (x1: float, x2: float): array => { - let newPointsArray = Belt.Array.makeBy(points - 1, i => i) - // don't repeat the x2 point, it will be gotten in the next iteration. - let result = Js.Array.mapi((pos, i) => - switch i { - | 0 => x1 - | _ => - x1 *. - (Belt.Float.fromInt(points) -. Belt.Float.fromInt(pos)) /. - Belt.Float.fromInt(points) +. x2 *. Belt.Float.fromInt(pos) /. Belt.Float.fromInt(points) + switch x1 -. x2 > 2.0 *. MagicNumbers.Epsilon.seven { + | false => [x1] + | true => { + let newPointsArray = Belt.Array.makeBy(points - 1, i => i) + // don't repeat the x2 point, it will be gotten in the next iteration. + let result = Js.Array.mapi((pos, i) => + switch i { + | 0 => x1 + | _ => + x1 *. + (Belt.Float.fromInt(points) -. Belt.Float.fromInt(pos)) /. + Belt.Float.fromInt(points) +. + x2 *. Belt.Float.fromInt(pos) /. Belt.Float.fromInt(points) + } + , newPointsArray) + result } - , newPointsArray) - result + } } let newXsUnflattened = Js.Array.mapi((x, i) => switch i < length - 2 { From b2a972605dc8eb48b4f509ab232dd88b728931f8 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Tue, 10 May 2022 15:52:13 +0000 Subject: [PATCH 081/340] (rebase): Function charting --- .../src/components/FunctionChart.tsx | 121 ++++++++++++------ .../src/components/SquiggleChart.tsx | 65 +++++----- .../src/components/SquiggleEditor.tsx | 35 ++--- .../src/components/SquigglePlayground.tsx | 24 +++- packages/squiggle-lang/src/js/index.ts | 37 ++++-- .../squiggle-lang/src/js/rescript_interop.ts | 21 +++ .../src/rescript/TypescriptInterface.res | 3 + 7 files changed, 202 insertions(+), 104 deletions(-) diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index 86678b27..2ee71721 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -1,18 +1,24 @@ import * as React from "react"; import _ from "lodash"; import type { Spec } from "vega"; -import type { Distribution, errorValue, result } from "@quri/squiggle-lang"; +import { + Distribution, + result, + lambdaValue, + environment, + runForeign, + errorValueToString, +} from "@quri/squiggle-lang"; import { createClassFromSpec } from "react-vega"; import * as percentilesSpec from "../vega-specs/spec-percentiles.json"; import { DistributionChart } from "./DistributionChart"; +import { NumberShower } from "./NumberShower"; import { ErrorBox } from "./ErrorBox"; let SquigglePercentilesChart = createClassFromSpec({ spec: percentilesSpec as Spec, }); -type distPlusFn = (a: number) => result; - const _rangeByCount = (start: number, stop: number, count: number) => { const step = (stop - start) / (count - 1); const items = _.range(start, stop, step); @@ -27,38 +33,36 @@ function unwrap(x: result): a { throw Error("FAILURE TO UNWRAP"); } } +export type FunctionChartSettings = { + start: number; + stop: number; + count: number; +}; -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); +interface FunctionChartProps { + fn: lambdaValue; + chartSettings: FunctionChartSettings; + environment: environment; } -export const FunctionChart: React.FC<{ - distPlusFn: distPlusFn; - diagramStart: number; - diagramStop: number; - diagramCount: number; -}> = ({ distPlusFn, diagramStart, diagramStop, diagramCount }) => { +export const FunctionChart: React.FC = ({ + fn, + chartSettings, + environment, +}: FunctionChartProps) => { let [mouseOverlay, setMouseOverlay] = React.useState(0); - function handleHover(...args) { - setMouseOverlay(args[1]); + function handleHover(_name: string, value: unknown) { + setMouseOverlay(value as number); } function handleOut() { setMouseOverlay(NaN); } const signalListeners = { mousemove: handleHover, mouseout: handleOut }; - let mouseItem = distPlusFn(mouseOverlay); + let mouseItem = runForeign(fn, [mouseOverlay], environment); let showChart = - mouseItem.tag === "Ok" ? ( + mouseItem.tag === "Ok" && mouseItem.value.tag == "distribution" ? ( ); - let data1 = _rangeByCount(diagramStart, diagramStop, diagramCount); - let valueData = mapFilter(data1, (x) => { - let result = distPlusFn(x); + let data1 = _rangeByCount( + chartSettings.start, + chartSettings.stop, + chartSettings.count + ); + type point = { x: number; value: result }; + let valueData: point[] = data1.map((x) => { + let result = runForeign(fn, [x], environment); if (result.tag === "Ok") { - return { x: x, value: result.value }; + if (result.value.tag == "distribution") { + return { x, value: { tag: "Ok", value: result.value.value } }; + } else { + return { + x, + value: { + tag: "Error", + value: + "Cannot currently render functions that don't return distributions", + }, + }; + } + } else { + return { + x, + value: { tag: "Error", value: errorValueToString(result.value) }, + }; } - }).map(({ x, value }) => { + }); + + let initialPartition: [ + { x: number; value: Distribution }[], + { x: number; value: string }[] + ] = [[], []]; + let [functionImage, errors] = valueData.reduce((acc, current) => { + if (current.value.tag === "Ok") { + acc[0].push({ x: current.x, value: current.value.value }); + } else { + acc[1].push({ x: current.x, value: current.value.value }); + } + return acc; + }, initialPartition); + + let percentiles = functionImage.map(({ x, value }) => { return { x: x, p1: unwrap(value.inv(0.01)), @@ -91,24 +131,25 @@ export const FunctionChart: React.FC<{ }; }); - 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); + let groupedErrors = _.groupBy(errors, (x) => x.value); return ( <> {showChart} - {_.keysIn(error2).map((k) => ( - - {`Values: [${error2[k].map((r) => r.x.toFixed(2)).join(",")}]`} + {_.entries(groupedErrors).map(([errorName, errorPoints]) => ( + + Values:{" "} + {errorPoints + .map((r) => ) + .reduce((a, b) => ( + <> + {a}, {b} + + ))} ))} diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 21fa8e14..f6799de4 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -6,7 +6,7 @@ import { errorValueToString, squiggleExpression, bindings, - samplingParams, + environment, jsImports, defaultImports, defaultBindings, @@ -14,6 +14,7 @@ import { import { NumberShower } from "./NumberShower"; import { DistributionChart } from "./DistributionChart"; import { ErrorBox } from "./ErrorBox"; +import { FunctionChart, FunctionChartSettings } from "./FunctionChart"; const variableBox = { Component: styled.div` @@ -36,7 +37,7 @@ const variableBox = { interface VariableBoxProps { heading: string; children: React.ReactNode; - showTypes?: boolean; + showTypes: boolean; } export const VariableBox: React.FC = ({ @@ -68,9 +69,13 @@ export interface SquiggleItemProps { /** Whether to show a summary of statistics for distributions */ showSummary: boolean; /** Whether to show type information */ - showTypes?: boolean; + showTypes: boolean; /** Whether to show users graph controls (scale etc) */ - showControls?: boolean; + showControls: boolean; + /** Settings for displaying functions */ + chartSettings: FunctionChartSettings; + /** Environment for further function executions */ + environment: environment; } const SquiggleItem: React.FC = ({ @@ -80,6 +85,8 @@ const SquiggleItem: React.FC = ({ showSummary, showTypes = false, showControls = false, + chartSettings, + environment, }: SquiggleItemProps) => { switch (expression.tag) { case "number": @@ -147,6 +154,8 @@ const SquiggleItem: React.FC = ({ height={50} showTypes={showTypes} showControls={showControls} + chartSettings={chartSettings} + environment={environment} showSummary={showSummary} /> ))} @@ -165,6 +174,8 @@ const SquiggleItem: React.FC = ({ showTypes={showTypes} showSummary={showSummary} showControls={showControls} + chartSettings={chartSettings} + environment={environment} /> ))} @@ -178,9 +189,11 @@ const SquiggleItem: React.FC = ({ ); case "lambda": return ( - - There is no viewer currently available for function types. - + ); } }; @@ -191,30 +204,24 @@ export interface SquiggleChartProps { /** If the output requires monte carlo sampling, the amount of samples */ sampleCount?: number; /** The amount of points returned to draw the distribution */ - outputXYPoints?: number; - kernelWidth?: number; - pointDistLength?: number; - /** If the result is a function, where the function starts */ - diagramStart?: number; - /** If the result is a function, where the function ends */ - diagramStop?: number; - /** If the result is a function, how many points along the function it samples */ - diagramCount?: number; + environment: environment; + /** If the result is a function, where the function starts, ends and the amount of stops */ + chartSettings?: FunctionChartSettings; /** When the environment changes */ onChange?(expr: squiggleExpression): void; /** CSS width of the element */ width?: number; height?: number; /** Bindings of previous variables declared */ - bindings?: bindings; + bindings: bindings; /** JS imported parameters */ - jsImports?: jsImports; + jsImports: jsImports; /** Whether to show a summary of the distirbution */ showSummary?: boolean; /** Whether to show type information about returns, default false */ - showTypes?: boolean; + showTypes: boolean; /** Whether to show graph controls (scale etc)*/ - showControls?: boolean; + showControls: boolean; } const ChartWrapper = styled.div` @@ -223,10 +230,10 @@ const ChartWrapper = styled.div` "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; `; +let defaultChartSettings = { start: 0, stop: 10, count: 100 }; export const SquiggleChart: React.FC = ({ squiggleString = "", - sampleCount = 1000, - outputXYPoints = 1000, + environment, onChange = () => {}, height = 60, bindings = defaultBindings, @@ -235,17 +242,9 @@ export const SquiggleChart: React.FC = ({ width, showTypes = false, showControls = false, + chartSettings = defaultChartSettings, }: SquiggleChartProps) => { - let samplingInputs: samplingParams = { - sampleCount: sampleCount, - xyPointLength: outputXYPoints, - }; - let expressionResult = run( - squiggleString, - bindings, - samplingInputs, - jsImports - ); + let expressionResult = run(squiggleString, bindings, environment, jsImports); let internal: JSX.Element; if (expressionResult.tag === "Ok") { let expression = expressionResult.value; @@ -258,6 +257,8 @@ export const SquiggleChart: React.FC = ({ showSummary={showSummary} showTypes={showTypes} showControls={showControls} + chartSettings={chartSettings} + environment={environment} /> ); } else { diff --git a/packages/components/src/components/SquiggleEditor.tsx b/packages/components/src/components/SquiggleEditor.tsx index 2601bc21..4b17b585 100644 --- a/packages/components/src/components/SquiggleEditor.tsx +++ b/packages/components/src/components/SquiggleEditor.tsx @@ -5,7 +5,7 @@ import { CodeEditor } from "./CodeEditor"; import styled from "styled-components"; import type { squiggleExpression, - samplingParams, + environment, bindings, jsImports, } from "@quri/squiggle-lang"; @@ -24,8 +24,6 @@ export interface SquiggleEditorProps { sampleCount?: number; /** The amount of points returned to draw the distribution */ outputXYPoints?: number; - kernelWidth?: number; - pointDistLength?: number; /** If the result is a function, where the function starts */ diagramStart?: number; /** If the result is a function, where the function ends */ @@ -57,13 +55,11 @@ const Input = styled.div` export let SquiggleEditor: React.FC = ({ initialSquiggleString = "", width, - sampleCount, - outputXYPoints, - kernelWidth, - pointDistLength, - diagramStart, - diagramStop, - diagramCount, + sampleCount = 1000, + outputXYPoints = 1000, + diagramStart = 0, + diagramStop = 10, + diagramCount = 100, onChange, bindings = defaultBindings, jsImports = defaultImports, @@ -72,6 +68,15 @@ export let SquiggleEditor: React.FC = ({ showSummary = false, }: SquiggleEditorProps) => { let [expression, setExpression] = React.useState(initialSquiggleString); + let chartSettings = { + start: diagramStart, + stop: diagramStop, + count: diagramCount, + }; + let env: environment = { + sampleCount: sampleCount, + xyPointLength: outputXYPoints, + }; return (
@@ -85,14 +90,10 @@ export let SquiggleEditor: React.FC = ({ = ({ outputXYPoints = 1000, jsImports = defaultImports, }: SquigglePartialProps) => { - let samplingInputs: samplingParams = { + let samplingInputs: environment = { sampleCount: sampleCount, xyPointLength: outputXYPoints, }; diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index dd2b8ecf..9f4c9153 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -4,6 +4,11 @@ import ReactDOM from "react-dom"; import { SquiggleChart } from "./SquiggleChart"; import CodeEditor from "./CodeEditor"; import styled from "styled-components"; +import { + defaultBindings, + environment, + defaultImports, +} from "@quri/squiggle-lang"; interface FieldFloatProps { label: string; @@ -96,6 +101,15 @@ let SquigglePlayground: FC = ({ let [diagramStart, setDiagramStart] = useState(0); let [diagramStop, setDiagramStop] = useState(10); let [diagramCount, setDiagramCount] = useState(20); + let chartSettings = { + start: diagramStart, + stop: diagramStop, + count: diagramCount, + }; + let env: environment = { + sampleCount: sampleCount, + xyPointLength: outputXYPoints, + }; return ( @@ -112,16 +126,14 @@ let SquigglePlayground: FC = ({ diff --git a/packages/squiggle-lang/src/js/index.ts b/packages/squiggle-lang/src/js/index.ts index 961d4935..306e5a07 100644 --- a/packages/squiggle-lang/src/js/index.ts +++ b/packages/squiggle-lang/src/js/index.ts @@ -1,6 +1,5 @@ import * as _ from "lodash"; import { - samplingParams, environment, defaultEnvironment, evaluatePartialUsingExternalBindings, @@ -8,6 +7,7 @@ import { externalBindings, expressionValue, errorValue, + foreignFunctionInterface, } from "../rescript/TypescriptInterface.gen"; export { makeSampleSetDist, @@ -15,25 +15,30 @@ export { distributionErrorToString, distributionError, } from "../rescript/TypescriptInterface.gen"; -export type { - samplingParams, - errorValue, - externalBindings as bindings, - jsImports, -}; +export type { errorValue, externalBindings as bindings, jsImports }; import { jsValueToBinding, + jsValueToExpressionValue, jsValue, rescriptExport, squiggleExpression, convertRawToTypescript, + lambdaValue, } from "./rescript_interop"; import { result, resultMap, tag, tagged } from "./types"; import { Distribution, shape } from "./distribution"; -export { Distribution, squiggleExpression, result, resultMap, shape }; +export { + Distribution, + squiggleExpression, + result, + resultMap, + shape, + lambdaValue, + environment, +}; -export let defaultSamplingInputs: samplingParams = { +export let defaultSamplingInputs: environment = { sampleCount: 10000, xyPointLength: 10000, }; @@ -72,6 +77,20 @@ export function runPartial( ); } +export function runForeign( + fn: lambdaValue, + args: jsValue[], + environment?: environment +): result { + let e = environment ? environment : defaultEnvironment; + let res: result = foreignFunctionInterface( + fn, + args.map(jsValueToExpressionValue), + e + ); + return resultMap(res, (x) => createTsExport(x, e)); +} + function mergeImportsWithBindings( bindings: externalBindings, imports: jsImports diff --git a/packages/squiggle-lang/src/js/rescript_interop.ts b/packages/squiggle-lang/src/js/rescript_interop.ts index 45f4124b..0781f081 100644 --- a/packages/squiggle-lang/src/js/rescript_interop.ts +++ b/packages/squiggle-lang/src/js/rescript_interop.ts @@ -1,5 +1,6 @@ import * as _ from "lodash"; import { + expressionValue, mixedShape, sampleSetDist, genericDist, @@ -87,6 +88,8 @@ export type squiggleExpression = | tagged<"number", number> | tagged<"record", { [key: string]: squiggleExpression }>; +export { lambdaValue }; + export function convertRawToTypescript( result: rescriptExport, environment: environment @@ -168,3 +171,21 @@ export function jsValueToBinding(value: jsValue): rescriptExport { return { TAG: 7, _0: _.mapValues(value, jsValueToBinding) }; } } + +export function jsValueToExpressionValue(value: jsValue): expressionValue { + if (typeof value === "boolean") { + return { tag: "EvBool", value: value as boolean }; + } else if (typeof value === "string") { + return { tag: "EvString", value: value as string }; + } else if (typeof value === "number") { + return { tag: "EvNumber", value: value as number }; + } else if (Array.isArray(value)) { + return { tag: "EvArray", value: value.map(jsValueToExpressionValue) }; + } else { + // Record + return { + tag: "EvRecord", + value: _.mapValues(value, jsValueToExpressionValue), + }; + } +} diff --git a/packages/squiggle-lang/src/rescript/TypescriptInterface.res b/packages/squiggle-lang/src/rescript/TypescriptInterface.res index 6ebb8377..13763e72 100644 --- a/packages/squiggle-lang/src/rescript/TypescriptInterface.res +++ b/packages/squiggle-lang/src/rescript/TypescriptInterface.res @@ -84,3 +84,6 @@ type environment = ReducerInterface_ExpressionValue.environment @genType let defaultEnvironment = ReducerInterface_ExpressionValue.defaultEnvironment + +@genType +let foreignFunctionInterface = Reducer.foreignFunctionInterface From b0c84450ffb84c31ae5faad4b12f2bed9eb834e5 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Tue, 10 May 2022 16:08:12 +0000 Subject: [PATCH 082/340] Make optional arguments actually optional --- packages/components/src/components/SquiggleChart.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index f6799de4..ab6fbb9c 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -213,15 +213,15 @@ export interface SquiggleChartProps { width?: number; height?: number; /** Bindings of previous variables declared */ - bindings: bindings; + bindings?: bindings; /** JS imported parameters */ jsImports: jsImports; /** Whether to show a summary of the distirbution */ showSummary?: boolean; /** Whether to show type information about returns, default false */ - showTypes: boolean; + showTypes?: boolean; /** Whether to show graph controls (scale etc)*/ - showControls: boolean; + showControls?: boolean; } const ChartWrapper = styled.div` From 4758fca19b9223319bd91a1c94c04e1386446739 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Tue, 10 May 2022 16:16:36 +0000 Subject: [PATCH 083/340] Keep props consistent --- .../src/components/SquiggleChart.tsx | 6 ++-- .../src/components/SquiggleEditor.tsx | 29 ++++--------------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index ab6fbb9c..15400d3f 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -10,6 +10,7 @@ import { jsImports, defaultImports, defaultBindings, + defaultEnvironment, } from "@quri/squiggle-lang"; import { NumberShower } from "./NumberShower"; import { DistributionChart } from "./DistributionChart"; @@ -204,7 +205,7 @@ export interface SquiggleChartProps { /** If the output requires monte carlo sampling, the amount of samples */ sampleCount?: number; /** The amount of points returned to draw the distribution */ - environment: environment; + environment?: environment; /** If the result is a function, where the function starts, ends and the amount of stops */ chartSettings?: FunctionChartSettings; /** When the environment changes */ @@ -245,6 +246,7 @@ export const SquiggleChart: React.FC = ({ chartSettings = defaultChartSettings, }: SquiggleChartProps) => { let expressionResult = run(squiggleString, bindings, environment, jsImports); + let e = environment ? environment : defaultEnvironment; let internal: JSX.Element; if (expressionResult.tag === "Ok") { let expression = expressionResult.value; @@ -258,7 +260,7 @@ export const SquiggleChart: React.FC = ({ showTypes={showTypes} showControls={showControls} chartSettings={chartSettings} - environment={environment} + environment={e} /> ); } else { diff --git a/packages/components/src/components/SquiggleEditor.tsx b/packages/components/src/components/SquiggleEditor.tsx index 4b17b585..c4ac1876 100644 --- a/packages/components/src/components/SquiggleEditor.tsx +++ b/packages/components/src/components/SquiggleEditor.tsx @@ -21,9 +21,7 @@ export interface SquiggleEditorProps { /** The input string for squiggle */ initialSquiggleString?: string; /** If the output requires monte carlo sampling, the amount of samples */ - sampleCount?: number; - /** The amount of points returned to draw the distribution */ - outputXYPoints?: number; + environment?: environment; /** If the result is a function, where the function starts */ diagramStart?: number; /** If the result is a function, where the function ends */ @@ -55,8 +53,7 @@ const Input = styled.div` export let SquiggleEditor: React.FC = ({ initialSquiggleString = "", width, - sampleCount = 1000, - outputXYPoints = 1000, + environment, diagramStart = 0, diagramStop = 10, diagramCount = 100, @@ -73,10 +70,6 @@ export let SquiggleEditor: React.FC = ({ stop: diagramStop, count: diagramCount, }; - let env: environment = { - sampleCount: sampleCount, - xyPointLength: outputXYPoints, - }; return (
@@ -90,9 +83,8 @@ export let SquiggleEditor: React.FC = ({ = ({ initialSquiggleString = "", onChange, bindings = defaultBindings, - sampleCount = 1000, - outputXYPoints = 1000, + environment, jsImports = defaultImports, }: SquigglePartialProps) => { - let samplingInputs: environment = { - sampleCount: sampleCount, - xyPointLength: outputXYPoints, - }; let [expression, setExpression] = React.useState(initialSquiggleString); let [error, setError] = React.useState(null); @@ -181,7 +164,7 @@ export let SquigglePartial: React.FC = ({ let squiggleResult = runPartial( expression, bindings, - samplingInputs, + environment, jsImports ); if (squiggleResult.tag == "Ok") { From a3402a42a440522861f1172f063ef2a9d883385d Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Tue, 10 May 2022 16:20:31 +0000 Subject: [PATCH 084/340] Add default environment as export --- packages/squiggle-lang/src/js/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/squiggle-lang/src/js/index.ts b/packages/squiggle-lang/src/js/index.ts index 306e5a07..5549223b 100644 --- a/packages/squiggle-lang/src/js/index.ts +++ b/packages/squiggle-lang/src/js/index.ts @@ -36,6 +36,7 @@ export { shape, lambdaValue, environment, + defaultEnvironment }; export let defaultSamplingInputs: environment = { From c13f49a7bca8b9a8a9edd37e7203285e52b7def1 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Tue, 10 May 2022 16:24:08 +0000 Subject: [PATCH 085/340] Lint fix --- packages/squiggle-lang/src/js/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/squiggle-lang/src/js/index.ts b/packages/squiggle-lang/src/js/index.ts index 5549223b..d3d074fa 100644 --- a/packages/squiggle-lang/src/js/index.ts +++ b/packages/squiggle-lang/src/js/index.ts @@ -36,7 +36,7 @@ export { shape, lambdaValue, environment, - defaultEnvironment + defaultEnvironment, }; export let defaultSamplingInputs: environment = { From 95fe117ef00d5a1fdbe413649ee55d21a0b14e7c Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 11 May 2022 14:14:10 -0400 Subject: [PATCH 086/340] Factored continuous part of normal and uniform kldivergence into it's own function Value: [1e-4 to 1e-3] --- .../Distributions/KlDivergence_test.res | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index e3efe446..03652738 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -3,6 +3,12 @@ open Expect open TestHelpers open GenericDist_Fixtures +let klNormalUniform = (mean, stdev, low, high): float => + -.Js.Math.log((high -. low) /. Js.Math.sqrt(2.0 *. MagicNumbers.Math.pi *. stdev ** 2.0)) +. + 1.0 /. + stdev ** 2.0 *. + (mean ** 2.0 -. (high +. low) *. mean +. (low ** 2.0 +. high *. low +. high ** 2.0) /. 3.0) + describe("klDivergence: continuous -> continuous -> float", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) @@ -63,11 +69,7 @@ describe("klDivergence: continuous -> continuous -> float", () => { let prediction = normalDist10 let answer = uniformDist let kl = klDivergence(prediction, answer) - let analyticalKl = - -.Js.Math.log((10.0 -. 9.0) /. Js.Math.sqrt(2.0 *. MagicNumbers.Math.pi *. 2.0 ** 2.0)) +. - 1.0 /. - 2.0 ** 2.0 *. - (10.0 ** 2.0 -. (10.0 +. 9.0) *. 10.0 +. (9.0 ** 2.0 +. 10.0 *. 9.0 +. 10.0 ** 2.0) /. 3.0) + let analyticalKl = klNormalUniform(10.0, 2.0, 9.0, 10.0) switch kl { | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKl, ~digits=3) | Error(err) => { @@ -122,17 +124,13 @@ describe("klDivergence: mixed -> mixed -> float", () => { | (Dist(a''), Dist(b'')) => (a'', b'') | _ => raise(MixtureFailed) } - test("finite klDivergence returns is correct", () => { + test("finite klDivergence return is correct", () => { let prediction = b let answer = a let kl = klDivergence(prediction, answer) // high = 10; low = 9; mean = 10; stdev = 2 - let analyticalKlContinuousPart = - Js.Math.log(Js.Math.sqrt(2.0 *. MagicNumbers.Math.pi *. 2.0 ** 2.0) /. (10.0 -. 9.0)) +. - 1.0 /. - 2.0 ** 2.0 *. - (10.0 ** 2.0 -. (10.0 +. 9.0) *. 10.0 +. (9.0 ** 2.0 +. 10.0 *. 9.0 +. 10.0 ** 2.0) /. 3.0) - let analyticalKlDiscretePart = -2.0 /. 3.0 *. Js.Math.log(3.0 /. 2.0) + let analyticalKlContinuousPart = klNormalUniform(10.0, 2.0, 9.0, 10.0) + let analyticalKlDiscretePart = 2.0 /. 3.0 *. Js.Math.log(2.0 /. 3.0) switch kl { | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKlContinuousPart +. analyticalKlDiscretePart, ~digits=0) From 26afc964954e1d6bb35e75e1bb7187860e91d01a Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 11 May 2022 15:12:36 -0400 Subject: [PATCH 087/340] Tests are as good as I can get them Value: [1e-4 to 1e-2] --- .../src/components/SquigglePlayground.tsx | 2 - .../Distributions/KlDivergence_test.res | 9 +-- .../src/rescript/MagicNumbers.res | 3 +- .../src/rescript/Utility/XYShape.res | 59 ++++++++----------- 4 files changed, 31 insertions(+), 42 deletions(-) diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index 012a5069..f403a4ce 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -134,8 +134,6 @@ let SquigglePlayground: FC = ({ bindings={defaultBindings} jsImports={defaultImports} showSummary={showSummary} - bindings={defaultBindings} - jsImports={defaultImports} /> diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index 03652738..c575accf 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -3,6 +3,7 @@ open Expect open TestHelpers open GenericDist_Fixtures +// integral of from low to high of 1 / (high - low) log(normal(mean, stdev)(x) / (1 / (high - low))) dx let klNormalUniform = (mean, stdev, low, high): float => -.Js.Math.log((high -. low) /. Js.Math.sqrt(2.0 *. MagicNumbers.Math.pi *. stdev ** 2.0)) +. 1.0 /. @@ -71,7 +72,7 @@ describe("klDivergence: continuous -> continuous -> float", () => { let kl = klDivergence(prediction, answer) let analyticalKl = klNormalUniform(10.0, 2.0, 9.0, 10.0) switch kl { - | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKl, ~digits=3) + | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKl, ~digits=1) | Error(err) => { Js.Console.log(DistributionTypes.Error.toString(err)) raise(KlFailed) @@ -118,8 +119,8 @@ describe("klDivergence: discrete -> discrete -> float", () => { describe("klDivergence: mixed -> mixed -> float", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) let mixture = a => DistributionTypes.DistributionOperation.Mixture(a) - let a' = [(floatDist, 1e0), (uniformDist, 1e0)]->mixture->run - let b' = [(point3, 1e0), (floatDist, 1e0), (normalDist10, 1e0)]->mixture->run + let a' = [(point1, 1e0), (uniformDist, 1e0)]->mixture->run + let b' = [(point1, 1e0), (floatDist, 1e0), (normalDist10, 1e0)]->mixture->run let (a, b) = switch (a', b') { | (Dist(a''), Dist(b'')) => (a'', b'') | _ => raise(MixtureFailed) @@ -130,7 +131,7 @@ describe("klDivergence: mixed -> mixed -> float", () => { let kl = klDivergence(prediction, answer) // high = 10; low = 9; mean = 10; stdev = 2 let analyticalKlContinuousPart = klNormalUniform(10.0, 2.0, 9.0, 10.0) - let analyticalKlDiscretePart = 2.0 /. 3.0 *. Js.Math.log(2.0 /. 3.0) + let analyticalKlDiscretePart = Js.Math.log(2.0 /. 3.0) /. 2.0 switch kl { | Ok(kl') => kl'->expect->toBeSoCloseTo(analyticalKlContinuousPart +. analyticalKlDiscretePart, ~digits=0) diff --git a/packages/squiggle-lang/src/rescript/MagicNumbers.res b/packages/squiggle-lang/src/rescript/MagicNumbers.res index 57e33e3b..13beafe4 100644 --- a/packages/squiggle-lang/src/rescript/MagicNumbers.res +++ b/packages/squiggle-lang/src/rescript/MagicNumbers.res @@ -11,8 +11,7 @@ module Epsilon = { module Environment = { let defaultXYPointLength = 1000 - let defaultSampleCount = 1000 - let enrichmentFactor = 10 + let defaultSampleCount = 10000 } module OpCost = { diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 01b59670..e3bd9016 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -453,46 +453,37 @@ module PointwiseCombination = { T.filterOkYs(newXs, newYs)->Ok } + // Nuño wrote this function to try to increase precision, but it didn't work. let enrichXyShape = (t: T.t): T.t => { + let enrichmentFactor = 10 let length = E.A.length(t.xs) - Js.Console.log(length) - let points = switch length < MagicNumbers.Environment.defaultXYPointLength { - | true => - Belt.Int.fromFloat( - Belt.Float.fromInt( - MagicNumbers.Environment.enrichmentFactor * MagicNumbers.Environment.defaultXYPointLength, - ) /. - Belt.Float.fromInt(length), - ) - | false => MagicNumbers.Environment.enrichmentFactor - } + let points = + length < MagicNumbers.Environment.defaultXYPointLength + ? enrichmentFactor * MagicNumbers.Environment.defaultXYPointLength / length + : enrichmentFactor let getInBetween = (x1: float, x2: float): array => { - switch x1 -. x2 > 2.0 *. MagicNumbers.Epsilon.seven { - | false => [x1] - | true => { - let newPointsArray = Belt.Array.makeBy(points - 1, i => i) - // don't repeat the x2 point, it will be gotten in the next iteration. - let result = Js.Array.mapi((pos, i) => - switch i { - | 0 => x1 - | _ => - x1 *. - (Belt.Float.fromInt(points) -. Belt.Float.fromInt(pos)) /. - Belt.Float.fromInt(points) +. - x2 *. Belt.Float.fromInt(pos) /. Belt.Float.fromInt(points) - } - , newPointsArray) - result - } + if abs_float(x1 -. x2) < 2.0 *. MagicNumbers.Epsilon.seven { + [x1] + } else { + let newPointsArray = Belt.Array.makeBy(points - 1, i => i) + // don't repeat the x2 point, it will be gotten in the next iteration. + let result = Js.Array.mapi((pos, i) => + if i == 0 { + x1 + } else { + let points' = Belt.Float.fromInt(points) + let pos' = Belt.Float.fromInt(pos) + x1 *. (points' -. pos') /. points' +. x2 *. pos' /. points' + } + , newPointsArray) + result } } - let newXsUnflattened = Js.Array.mapi((x, i) => - switch i < length - 2 { - | true => getInBetween(x, t.xs[i + 1]) - | false => [x] - } - , t.xs) + let newXsUnflattened = Js.Array.mapi( + (x, i) => i < length - 2 ? getInBetween(x, t.xs[i + 1]) : [x], + t.xs, + ) let newXs = Belt.Array.concatMany(newXsUnflattened) let newYs = E.A.fmap(x => XtoY.linear(x, t), newXs) {xs: newXs, ys: newYs} From e1e5e3305da1f1a4d5ab417d31eefa7f919879b1 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 11 May 2022 15:46:57 -0400 Subject: [PATCH 088/340] Gained precision Value: [1e-3 to 2e-2] --- .../Distributions/GenericDist_Fixtures.res | 1 + .../Distributions/KlDivergence_test.res | 29 +++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/GenericDist_Fixtures.res b/packages/squiggle-lang/__tests__/Distributions/GenericDist_Fixtures.res index 8e315599..d184b61b 100644 --- a/packages/squiggle-lang/__tests__/Distributions/GenericDist_Fixtures.res +++ b/packages/squiggle-lang/__tests__/Distributions/GenericDist_Fixtures.res @@ -11,6 +11,7 @@ let triangularDist: DistributionTypes.genericDist = Symbolic( ) let exponentialDist: DistributionTypes.genericDist = Symbolic(#Exponential({rate: 2.0})) let uniformDist: DistributionTypes.genericDist = Symbolic(#Uniform({low: 9.0, high: 10.0})) +let uniformDist2: DistributionTypes.genericDist = Symbolic(#Uniform({low: 8.0, high: 11.0})) let floatDist: DistributionTypes.genericDist = Symbolic(#Float(1e1)) exception KlFailed diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index c575accf..5355f14d 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -121,8 +121,13 @@ describe("klDivergence: mixed -> mixed -> float", () => { let mixture = a => DistributionTypes.DistributionOperation.Mixture(a) let a' = [(point1, 1e0), (uniformDist, 1e0)]->mixture->run let b' = [(point1, 1e0), (floatDist, 1e0), (normalDist10, 1e0)]->mixture->run - let (a, b) = switch (a', b') { - | (Dist(a''), Dist(b'')) => (a'', b'') + let c' = [(point1, 1e0), (point2, 1e0), (point3, 1e0), (uniformDist, 1e0)]->mixture->run + let d' = + [(point1, 1e0), (point2, 1e0), (point3, 1e0), (floatDist, 1e0), (uniformDist2, 1e0)] + ->mixture + ->run + let (a, b, c, d) = switch (a', b', c', d') { + | (Dist(a''), Dist(b''), Dist(c''), Dist(d'')) => (a'', b'', c'', d'') | _ => raise(MixtureFailed) } test("finite klDivergence return is correct", () => { @@ -130,11 +135,11 @@ describe("klDivergence: mixed -> mixed -> float", () => { let answer = a let kl = klDivergence(prediction, answer) // high = 10; low = 9; mean = 10; stdev = 2 - let analyticalKlContinuousPart = klNormalUniform(10.0, 2.0, 9.0, 10.0) - let analyticalKlDiscretePart = Js.Math.log(2.0 /. 3.0) /. 2.0 + let analyticalKlContinuousPart = klNormalUniform(10.0, 2.0, 9.0, 10.0) /. 2.0 + let analyticalKlDiscretePart = 1.0 /. 2.0 *. Js.Math.log(2.0 /. 1.0) switch kl { | Ok(kl') => - kl'->expect->toBeSoCloseTo(analyticalKlContinuousPart +. analyticalKlDiscretePart, ~digits=0) + kl'->expect->toBeSoCloseTo(analyticalKlContinuousPart +. analyticalKlDiscretePart, ~digits=1) | Error(err) => Js.Console.log(DistributionTypes.Error.toString(err)) raise(KlFailed) @@ -151,6 +156,20 @@ describe("klDivergence: mixed -> mixed -> float", () => { raise(KlFailed) } }) + test("finite klDivergence return is correct", () => { + let prediction = d + let answer = c + let kl = klDivergence(prediction, answer) + let analyticalKlContinuousPart = Js.Math.log((11.0 -. 8.0) /. (10.0 -. 9.0)) /. 4.0 // 4 = length of c' array + let analyticalKlDiscretePart = 3.0 /. 4.0 *. Js.Math.log(4.0 /. 3.0) + switch kl { + | Ok(kl') => + kl'->expect->toBeSoCloseTo(analyticalKlContinuousPart +. analyticalKlDiscretePart, ~digits=1) + | Error(err) => + Js.Console.log(DistributionTypes.Error.toString(err)) + raise(KlFailed) + } + }) }) describe("combineAlongSupportOfSecondArgument0", () => { From b90a0e7a1a73d1f2a0ab9f577c771831ad61fcbd Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Wed, 11 May 2022 15:48:50 -0400 Subject: [PATCH 089/340] re-added `?`, artefact from MC resolve mistake Value: [1e-7 to 1e-4] --- packages/components/src/components/SquiggleChart.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 15400d3f..241cd772 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -216,7 +216,7 @@ export interface SquiggleChartProps { /** Bindings of previous variables declared */ bindings?: bindings; /** JS imported parameters */ - jsImports: jsImports; + jsImports?: jsImports; /** Whether to show a summary of the distirbution */ showSummary?: boolean; /** Whether to show type information about returns, default false */ From f5e3701a79875e2a43aeaa4b4fd83bf14e4017a7 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Thu, 12 May 2022 09:51:20 -0400 Subject: [PATCH 090/340] Clean up for CR Value: [1e-7 to 43-4] --- .../__tests__/Distributions/KlDivergence_test.res | 12 ++++++------ .../Distributions/PointSetDist/Continuous.res | 6 +----- .../squiggle-lang/src/rescript/Utility/XYShape.res | 9 +++++---- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index 5355f14d..6fb73366 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -119,18 +119,18 @@ describe("klDivergence: discrete -> discrete -> float", () => { describe("klDivergence: mixed -> mixed -> float", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) let mixture = a => DistributionTypes.DistributionOperation.Mixture(a) - let a' = [(point1, 1e0), (uniformDist, 1e0)]->mixture->run - let b' = [(point1, 1e0), (floatDist, 1e0), (normalDist10, 1e0)]->mixture->run - let c' = [(point1, 1e0), (point2, 1e0), (point3, 1e0), (uniformDist, 1e0)]->mixture->run + let a' = [(point1, 1.0), (uniformDist, 1.0)]->mixture->run + let b' = [(point1, 1.0), (floatDist, 1.0), (normalDist10, 1.0)]->mixture->run + let c' = [(point1, 1.0), (point2, 1.0), (point3, 1.0), (uniformDist, 1.0)]->mixture->run let d' = - [(point1, 1e0), (point2, 1e0), (point3, 1e0), (floatDist, 1e0), (uniformDist2, 1e0)] + [(point1, 1.0), (point2, 1.0), (point3, 1.0), (floatDist, 1.0), (uniformDist2, 1.0)] ->mixture ->run let (a, b, c, d) = switch (a', b', c', d') { | (Dist(a''), Dist(b''), Dist(c''), Dist(d'')) => (a'', b'', c'', d'') | _ => raise(MixtureFailed) } - test("finite klDivergence return is correct", () => { + test("finite klDivergence produces correct answer", () => { let prediction = b let answer = a let kl = klDivergence(prediction, answer) @@ -156,7 +156,7 @@ describe("klDivergence: mixed -> mixed -> float", () => { raise(KlFailed) } }) - test("finite klDivergence return is correct", () => { + test("finite klDivergence produces correct answer", () => { let prediction = d let answer = c let kl = klDivergence(prediction, answer) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index e8049688..3aca0c66 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -272,14 +272,10 @@ module T = Dist({ XYShape.Analysis.getVarianceDangerously(t, mean, Analysis.getMeanOfSquares) let klDivergence = (prediction: t, answer: t) => { - let enrich = true - let enrichedAnswer = enrich - ? XYShape.PointwiseCombination.enrichXyShape(answer.xyShape) - : answer.xyShape // let newShape = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument( PointSetDist_Scoring.KLDivergence.integrand, prediction.xyShape, - enrichedAnswer, + answer.xyShape, ) let xyShapeToContinuous: XYShape.xyShape => t = xyShape => { xyShape: xyShape, diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index e3bd9016..5c3055f5 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -453,14 +453,15 @@ module PointwiseCombination = { T.filterOkYs(newXs, newYs)->Ok } - // Nuño wrote this function to try to increase precision, but it didn't work. + // *Dead code*: Nuño wrote this function to try to increase precision, but it didn't work. + // If another traveler comes through with a similar idea, we hope this implementation will help them. let enrichXyShape = (t: T.t): T.t => { - let enrichmentFactor = 10 + let defaultEnrichmentFactor = 10 let length = E.A.length(t.xs) let points = length < MagicNumbers.Environment.defaultXYPointLength - ? enrichmentFactor * MagicNumbers.Environment.defaultXYPointLength / length - : enrichmentFactor + ? defaultEnrichmentFactor * MagicNumbers.Environment.defaultXYPointLength / length + : defaultEnrichmentFactor let getInBetween = (x1: float, x2: float): array => { if abs_float(x1 -. x2) < 2.0 *. MagicNumbers.Epsilon.seven { From 239f6b0f81657fbe8259e3ca6e7d9bc536c1a728 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 14:40:06 +0000 Subject: [PATCH 091/340] :arrow_up: Bump @testing-library/user-event from 14.1.1 to 14.2.0 Bumps [@testing-library/user-event](https://github.com/testing-library/user-event) from 14.1.1 to 14.2.0. - [Release notes](https://github.com/testing-library/user-event/releases) - [Changelog](https://github.com/testing-library/user-event/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/user-event/compare/v14.1.1...v14.2) --- updated-dependencies: - dependency-name: "@testing-library/user-event" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index b269735f..e8513982 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -28,7 +28,7 @@ "@storybook/react": "^6.4.22", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", - "@testing-library/user-event": "^14.1.1", + "@testing-library/user-event": "^14.2.0", "@types/jest": "^27.5.0", "@types/lodash": "^4.14.182", "@types/node": "^17.0.32", diff --git a/yarn.lock b/yarn.lock index 99712b31..81c8c21f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3726,10 +3726,10 @@ "@testing-library/dom" "^8.5.0" "@types/react-dom" "^18.0.0" -"@testing-library/user-event@^14.1.1": - version "14.1.1" - resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.1.1.tgz#e1ff6118896e4b22af31e5ea2f9da956adde23d8" - integrity sha512-XrjH/iEUqNl9lF2HX9YhPNV7Amntkcnpw0Bo1KkRzowNDcgSN9i0nm4Q8Oi5wupgdfPaJNMAWa61A+voD6Kmwg== +"@testing-library/user-event@^14.2.0": + version "14.2.0" + resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.2.0.tgz#8293560f8f80a00383d6c755ec3e0b918acb1683" + integrity sha512-+hIlG4nJS6ivZrKnOP7OGsDu9Fxmryj9vCl8x0ZINtTJcCHs2zLsYif5GzuRiBF2ck5GZG2aQr7Msg+EHlnYVQ== "@tootallnate/once@1": version "1.1.2" From 12c0959f38d0cec4904fc34aa0af14983f7ea6d9 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Thu, 12 May 2022 11:14:59 -0400 Subject: [PATCH 092/340] factored mixture construction into function Value: [1e-6 to 1e-4] --- .../Distributions/KlDivergence_test.res | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res index 6fb73366..fc528e08 100644 --- a/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res +++ b/packages/squiggle-lang/__tests__/Distributions/KlDivergence_test.res @@ -3,7 +3,7 @@ open Expect open TestHelpers open GenericDist_Fixtures -// integral of from low to high of 1 / (high - low) log(normal(mean, stdev)(x) / (1 / (high - low))) dx +// integral from low to high of 1 / (high - low) log(normal(mean, stdev)(x) / (1 / (high - low))) dx let klNormalUniform = (mean, stdev, low, high): float => -.Js.Math.log((high -. low) /. Js.Math.sqrt(2.0 *. MagicNumbers.Math.pi *. stdev ** 2.0)) +. 1.0 /. @@ -118,18 +118,20 @@ describe("klDivergence: discrete -> discrete -> float", () => { describe("klDivergence: mixed -> mixed -> float", () => { let klDivergence = DistributionOperation.Constructors.klDivergence(~env) - let mixture = a => DistributionTypes.DistributionOperation.Mixture(a) - let a' = [(point1, 1.0), (uniformDist, 1.0)]->mixture->run - let b' = [(point1, 1.0), (floatDist, 1.0), (normalDist10, 1.0)]->mixture->run - let c' = [(point1, 1.0), (point2, 1.0), (point3, 1.0), (uniformDist, 1.0)]->mixture->run - let d' = - [(point1, 1.0), (point2, 1.0), (point3, 1.0), (floatDist, 1.0), (uniformDist2, 1.0)] - ->mixture - ->run - let (a, b, c, d) = switch (a', b', c', d') { - | (Dist(a''), Dist(b''), Dist(c''), Dist(d'')) => (a'', b'', c'', d'') - | _ => raise(MixtureFailed) + let mixture' = a => DistributionTypes.DistributionOperation.Mixture(a) + let mixture = a => { + let dist' = a->mixture'->run + switch dist' { + | Dist(dist) => dist + | _ => raise(MixtureFailed) + } } + let a = [(point1, 1.0), (uniformDist, 1.0)]->mixture + let b = [(point1, 1.0), (floatDist, 1.0), (normalDist10, 1.0)]->mixture + let c = [(point1, 1.0), (point2, 1.0), (point3, 1.0), (uniformDist, 1.0)]->mixture + let d = + [(point1, 1.0), (point2, 1.0), (point3, 1.0), (floatDist, 1.0), (uniformDist2, 1.0)]->mixture + test("finite klDivergence produces correct answer", () => { let prediction = b let answer = a From eee9a46c3742fa2f526447b5ed047b0927f9eb63 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Thu, 12 May 2022 11:16:51 -0400 Subject: [PATCH 093/340] Improved comment for `enrich` Value: [1e-9 to 1e-6] --- packages/squiggle-lang/src/rescript/Utility/XYShape.res | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index 5c3055f5..b4758dfd 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -453,8 +453,10 @@ module PointwiseCombination = { T.filterOkYs(newXs, newYs)->Ok } - // *Dead code*: Nuño wrote this function to try to increase precision, but it didn't work. - // If another traveler comes through with a similar idea, we hope this implementation will help them. + /* *Dead code*: Nuño wrote this function to try to increase precision, but it didn't work. + If another traveler comes through with a similar idea, we hope this implementation will help them. + By "enrich" we mean to increase granularity. + */ let enrichXyShape = (t: T.t): T.t => { let defaultEnrichmentFactor = 10 let length = E.A.length(t.xs) From 978e149913886207b222f7c9efdb0ad65114ca7b Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Thu, 12 May 2022 13:11:51 -0400 Subject: [PATCH 094/340] Initialized `logScore` and `logScoreAgainstImproperPrior` Value: [1e-5 to 6e-3] --- .../Distributions/PointSetDist/Continuous.res | 20 ++++++++++++------- .../Distributions/PointSetDist/Discrete.res | 6 ++++++ .../PointSetDist/Distributions.res | 4 ++++ .../Distributions/PointSetDist/Mixed.res | 6 ++++++ .../PointSetDist/PointSetDist.res | 17 ++++++++++++---- .../PointSetDist/PointSetDist_Scoring.res | 17 ++++++++++++++++ 6 files changed, 59 insertions(+), 11 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 3aca0c66..4151254f 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -277,13 +277,19 @@ module T = Dist({ prediction.xyShape, answer.xyShape, ) - let xyShapeToContinuous: XYShape.xyShape => t = xyShape => { - xyShape: xyShape, - interpolation: #Linear, - integralSumCache: None, - integralCache: None, - } - newShape->E.R2.fmap(x => x->xyShapeToContinuous->integralEndY) + newShape->E.R2.fmap(x => x->make->integralEndY) + } + let logScore = (prior: t, prediction: t, answer: float) => { + let newShape = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument( + PointSetDist_Scoring.LogScore.integrand(~answer), + prior.xyShape, + prediction.xyShape, + ) + newShape->E.R2.fmap(x => x->make->integralEndY) + } + let logScoreAgainstImproperPrior = (prediction: t, answer: float) => { + let prior = make({xs: prediction.xyShape.xs, ys: E.A.fmap(_ => 1.0, prediction.xyShape.xs)}) + logScore(prior, prediction, answer) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index abb6b793..9bc274e7 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -229,4 +229,10 @@ module T = Dist({ answer, )->E.R2.fmap(integralEndY) } + let logScore = (prior: t, prediction: t, answer: float) => { + Error(Operation.NotYetImplemented) + } + let logScoreAgainstImproperPrior = (prediction: t, answer: float) => { + Error(Operation.NotYetImplemented) + } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res index 85ffe4b1..9fb7e689 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res @@ -34,6 +34,8 @@ module type dist = { let mean: t => float let variance: t => float let klDivergence: (t, t) => result + let logScore: (t, t, float) => result + let logScoreAgainstImproperPrior: (t, float) => result } module Dist = (T: dist) => { @@ -57,6 +59,8 @@ module Dist = (T: dist) => { let variance = T.variance let integralEndY = T.integralEndY let klDivergence = T.klDivergence + let logScore = T.logScore + let logScoreAgainstImproperPrior = T.logScoreAgainstImproperPrior let updateIntegralCache = T.updateIntegralCache diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 7bbe2065..50e8a419 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -306,6 +306,12 @@ module T = Dist({ let klContinuousPart = Continuous.T.klDivergence(prediction.continuous, answer.continuous) E.R.merge(klDiscretePart, klContinuousPart)->E.R2.fmap(t => fst(t) +. snd(t)) } + let logScore = (prior: t, prediction: t, answer: float) => { + Error(Operation.NotYetImplemented) + } + let logScoreAgainstImproperPrior = (prediction: t, answer: float) => { + Error(Operation.NotYetImplemented) + } }) let combineAlgebraically = (op: Operation.convolutionOperation, t1: t, t2: t): t => { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index db47d1e1..05e79830 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -196,13 +196,22 @@ module T = Dist({ | Continuous(m) => Continuous.T.variance(m) } - let klDivergence = (t1: t, t2: t) => - switch (t1, t2) { + let klDivergence = (prediction: t, answer: t) => + switch (prediction, answer) { | (Continuous(t1), Continuous(t2)) => Continuous.T.klDivergence(t1, t2) | (Discrete(t1), Discrete(t2)) => Discrete.T.klDivergence(t1, t2) - | (Mixed(t1), Mixed(t2)) => Mixed.T.klDivergence(t1, t2) - | _ => Error(NotYetImplemented) + | (m1, m2) => Mixed.T.klDivergence(m1->toMixed, m2->toMixed) } + + let logScore = (prior: t, prediction: t, answer: float) => { + switch (prior, prediction) { + | (Continuous(t1), Continuous(t2)) => Continuous.T.logScore(t1, t2, answer) + | _ => Error(Operation.NotYetImplemented) + } + } + let logScoreAgainstImproperPrior = (prediction: t, answer: float) => { + Error(Operation.NotYetImplemented) + } }) let pdf = (f: float, t: t) => { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index b22883df..8daf260c 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -14,3 +14,20 @@ module KLDivergence = { quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(-.answerElement *. logFn(quot)) } } + +/* + +*/ +module LogScore = { + let logFn = Js.Math.log + let integrand = (priorElement: float, predictionElement: float, ~answer: float) => { + if answer == 0.0 { + Ok(0.0) + } else if predictionElement == 0.0 { + Ok(infinity) + } else { + let quot = predictionElement /. priorElement + quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(-.answer *. logFn(quot /. answer)) + } + } +} From 51310819a12a510fc0b539a599d013bc9863e3b5 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Thu, 12 May 2022 14:16:52 -0400 Subject: [PATCH 095/340] `logScore` now in interface. Value: [1e-4 to 1e-1] --- .../Distributions/DistributionOperation.res | 8 ++++- .../Distributions/DistributionOperation.resi | 2 ++ .../Distributions/DistributionTypes.res | 7 +++- .../rescript/Distributions/GenericDist.res | 19 ++++++++--- .../rescript/Distributions/GenericDist.resi | 5 ++- .../Distributions/PointSetDist/Continuous.res | 4 --- .../Distributions/PointSetDist/Discrete.res | 3 -- .../PointSetDist/Distributions.res | 2 -- .../Distributions/PointSetDist/Mixed.res | 3 -- .../src/rescript/MagicNumbers.res | 1 + .../ReducerInterface_GenericDistribution.res | 32 ++++++++++++++++++- 11 files changed, 65 insertions(+), 21 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res index 80a53eb8..97085133 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res @@ -145,7 +145,11 @@ let rec run = (~env, functionCallInfo: functionCallInfo): outputType => { } | ToDist(Normalize) => dist->GenericDist.normalize->Dist | ToScore(KLDivergence(t2)) => - GenericDist.klDivergence(dist, t2, ~toPointSetFn) + GenericDist.Score.klDivergence(dist, t2, ~toPointSetFn) + ->E.R2.fmap(r => Float(r)) + ->OutputLocal.fromResult + | ToScore(LogScore(prediction, answer)) => + GenericDist.Score.logScore(dist, prediction, answer, ~toPointSetFn) ->E.R2.fmap(r => Float(r)) ->OutputLocal.fromResult | ToBool(IsNormalized) => dist->GenericDist.isNormalized->Bool @@ -262,6 +266,8 @@ module Constructors = { let normalize = (~env, dist) => C.normalize(dist)->run(~env)->toDistR let isNormalized = (~env, dist) => C.isNormalized(dist)->run(~env)->toBoolR let klDivergence = (~env, dist1, dist2) => C.klDivergence(dist1, dist2)->run(~env)->toFloatR + let logScore = (~env, prior, prediction, answer) => + C.logScore(prior, prediction, answer)->run(~env)->toFloatR let toPointSet = (~env, dist) => C.toPointSet(dist)->run(~env)->toDistR let toSampleSet = (~env, dist, n) => C.toSampleSet(dist, n)->run(~env)->toDistR let fromSamples = (~env, xs) => C.fromSamples(xs)->run(~env)->toDistR diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi index 200be7d7..c3d14014 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi @@ -62,6 +62,8 @@ module Constructors: { @genType let klDivergence: (~env: env, genericDist, genericDist) => result @genType + let logScore: (~env: env, genericDist, genericDist, float) => result + @genType let toPointSet: (~env: env, genericDist) => result @genType let toSampleSet: (~env: env, genericDist, int) => result diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res index a9f7dfbe..35e1b1a7 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res @@ -91,7 +91,7 @@ module DistributionOperation = { | ToString | ToSparkline(int) - type toScore = KLDivergence(genericDist) + type toScore = KLDivergence(genericDist) | LogScore(genericDist, float) type fromDist = | ToFloat(toFloat) @@ -120,6 +120,7 @@ module DistributionOperation = { | ToFloat(#Sample) => `sample` | ToFloat(#IntegralSum) => `integralSum` | ToScore(KLDivergence(_)) => `klDivergence` + | ToScore(LogScore(_, x)) => `logScore against ${E.Float.toFixed(x)}` | ToDist(Normalize) => `normalize` | ToDist(ToPointSet) => `toPointSet` | ToDist(ToSampleSet(r)) => `toSampleSet(${E.I.toString(r)})` @@ -161,6 +162,10 @@ module Constructors = { let truncate = (dist, left, right): t => FromDist(ToDist(Truncate(left, right)), dist) let inspect = (dist): t => FromDist(ToDist(Inspect), dist) let klDivergence = (dist1, dist2): t => FromDist(ToScore(KLDivergence(dist2)), dist1) + let logScore = (prior, prediction, answer): t => FromDist( + ToScore(LogScore(prediction, answer)), + prior, + ) let scalePower = (dist, n): t => FromDist(ToDist(Scale(#Power, n)), dist) let scaleLogarithm = (dist, n): t => FromDist(ToDist(Scale(#Logarithm, n)), dist) let scaleLogarithmWithThreshold = (dist, n, eps): t => FromDist( diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res index 2085d72c..1995ef34 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res @@ -59,11 +59,20 @@ let integralEndY = (t: t): float => let isNormalized = (t: t): bool => Js.Math.abs_float(integralEndY(t) -. 1.0) < 1e-7 -let klDivergence = (t1, t2, ~toPointSetFn: toPointSetFn): result => { - let pointSets = E.R.merge(toPointSetFn(t1), toPointSetFn(t2)) - pointSets |> E.R2.bind(((a, b)) => - PointSetDist.T.klDivergence(a, b)->E.R2.errMap(x => DistributionTypes.OperationError(x)) - ) +module Score = { + let klDivergence = (t1, t2, ~toPointSetFn: toPointSetFn): result => { + let pointSets = E.R.merge(toPointSetFn(t1), toPointSetFn(t2)) + pointSets |> E.R2.bind(((a, b)) => + PointSetDist.T.klDivergence(a, b)->E.R2.errMap(x => DistributionTypes.OperationError(x)) + ) + } + + let logScore = (prior, prediction, answer, ~toPointSetFn: toPointSetFn): result => { + let pointSets = E.R.merge(toPointSetFn(prior), toPointSetFn(prediction)) + pointSets |> E.R2.bind(((a, b)) => + PointSetDist.T.logScore(a, b, answer)->E.R2.errMap(x => DistributionTypes.OperationError(x)) + ) + } } let toFloatOperation = ( diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi index 03bc5fe8..45f1e8f8 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi @@ -23,7 +23,10 @@ let toFloatOperation: ( ~distToFloatOperation: DistributionTypes.DistributionOperation.toFloat, ) => result -let klDivergence: (t, t, ~toPointSetFn: toPointSetFn) => result +module Score: { + let klDivergence: (t, t, ~toPointSetFn: toPointSetFn) => result + let logScore: (t, t, float, ~toPointSetFn: toPointSetFn) => result +} @genType let toPointSet: ( diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 4151254f..7bf9c874 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -287,10 +287,6 @@ module T = Dist({ ) newShape->E.R2.fmap(x => x->make->integralEndY) } - let logScoreAgainstImproperPrior = (prediction: t, answer: float) => { - let prior = make({xs: prediction.xyShape.xs, ys: E.A.fmap(_ => 1.0, prediction.xyShape.xs)}) - logScore(prior, prediction, answer) - } }) let isNormalized = (t: t): bool => { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 9bc274e7..e10ed981 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -232,7 +232,4 @@ module T = Dist({ let logScore = (prior: t, prediction: t, answer: float) => { Error(Operation.NotYetImplemented) } - let logScoreAgainstImproperPrior = (prediction: t, answer: float) => { - Error(Operation.NotYetImplemented) - } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res index 9fb7e689..aa44da10 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res @@ -35,7 +35,6 @@ module type dist = { let variance: t => float let klDivergence: (t, t) => result let logScore: (t, t, float) => result - let logScoreAgainstImproperPrior: (t, float) => result } module Dist = (T: dist) => { @@ -60,7 +59,6 @@ module Dist = (T: dist) => { let integralEndY = T.integralEndY let klDivergence = T.klDivergence let logScore = T.logScore - let logScoreAgainstImproperPrior = T.logScoreAgainstImproperPrior let updateIntegralCache = T.updateIntegralCache diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 50e8a419..2fd046ee 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -309,9 +309,6 @@ module T = Dist({ let logScore = (prior: t, prediction: t, answer: float) => { Error(Operation.NotYetImplemented) } - let logScoreAgainstImproperPrior = (prediction: t, answer: float) => { - Error(Operation.NotYetImplemented) - } }) let combineAlgebraically = (op: Operation.convolutionOperation, t1: t, t2: t): t => { diff --git a/packages/squiggle-lang/src/rescript/MagicNumbers.res b/packages/squiggle-lang/src/rescript/MagicNumbers.res index 13beafe4..b859421c 100644 --- a/packages/squiggle-lang/src/rescript/MagicNumbers.res +++ b/packages/squiggle-lang/src/rescript/MagicNumbers.res @@ -12,6 +12,7 @@ module Epsilon = { module Environment = { let defaultXYPointLength = 1000 let defaultSampleCount = 10000 + let sparklineLength = 20 } module OpCost = { diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 8dae2586..7e5709bd 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -157,6 +157,20 @@ module Helpers = { } } } + let constructNonNormalizedPointSet = ( + ~supportOf: DistributionTypes.genericDist, + fn: float => float, + ): option => { + switch supportOf { + | PointSet(Continuous(dist)) => + {xs: dist.xyShape.xs, ys: E.A.fmap(fn, dist.xyShape.xs)} + ->Continuous.make + ->Continuous + ->PointSet + ->Some + | _ => None + } + } } module SymbolicConstructors = { @@ -219,7 +233,8 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) | ("mean", [EvDistribution(dist)]) => Helpers.toFloatFn(#Mean, dist) | ("integralSum", [EvDistribution(dist)]) => Helpers.toFloatFn(#IntegralSum, dist) | ("toString", [EvDistribution(dist)]) => Helpers.toStringFn(ToString, dist) - | ("toSparkline", [EvDistribution(dist)]) => Helpers.toStringFn(ToSparkline(20), dist) + | ("toSparkline", [EvDistribution(dist)]) => + Helpers.toStringFn(ToSparkline(MagicNumbers.Environment.sparklineLength), dist) | ("toSparkline", [EvDistribution(dist), EvNumber(n)]) => Helpers.toStringFn(ToSparkline(Belt.Float.toInt(n)), dist) | ("exp", [EvDistribution(a)]) => @@ -233,6 +248,21 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) | ("normalize", [EvDistribution(dist)]) => Helpers.toDistFn(Normalize, dist) | ("klDivergence", [EvDistribution(a), EvDistribution(b)]) => Some(runGenericOperation(FromDist(ToScore(KLDivergence(b)), a))) + | ("logScore", [EvDistribution(prior), EvDistribution(prediction), EvNumber(answer)]) + | ( + "logScore", + [EvDistribution(prior), EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))], + ) => + Some(runGenericOperation(FromDist(ToScore(LogScore(prediction, answer)), prior))) + | ("logScoreAgainstImproperPrior", [EvDistribution(prediction), EvNumber(answer)]) + | ( + "logScoreAgainstImproperPrior", + [EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))], + ) => + E.O.fmap( + d => runGenericOperation(FromDist(ToScore(LogScore(prediction, answer)), d)), + Helpers.constructNonNormalizedPointSet(~supportOf=prediction, _ => 1.0), + ) | ("isNormalized", [EvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist) | ("toPointSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToPointSet, dist) | ("scaleLog", [EvDistribution(dist)]) => From 65751e590a7c240680617e3a1e8d82c4a1aec8d3 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Thu, 12 May 2022 15:26:51 -0400 Subject: [PATCH 096/340] Fixed `logScoreAgainstImproperPrior` by finding how it was `None` Value: [1e-4 to 8e-2] --- .../ReducerInterface_GenericDistribution.res | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 7e5709bd..b7f5f824 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -160,16 +160,16 @@ module Helpers = { let constructNonNormalizedPointSet = ( ~supportOf: DistributionTypes.genericDist, fn: float => float, - ): option => { - switch supportOf { - | PointSet(Continuous(dist)) => - {xs: dist.xyShape.xs, ys: E.A.fmap(fn, dist.xyShape.xs)} - ->Continuous.make - ->Continuous - ->PointSet - ->Some - | _ => None + ): DistributionTypes.genericDist => { + let cdf = x => toFloatFn(#Cdf(x), supportOf) + let leftEndpoint = cdf(MagicNumbers.Epsilon.ten) + let rightEndpoint = cdf(1.0 -. MagicNumbers.Epsilon.ten) + let xs = switch (leftEndpoint, rightEndpoint) { + | (Some(Float(a)), Some(Float(b))) => + E.A.Floats.range(a, b, MagicNumbers.Environment.defaultXYPointLength) + | _ => [] } + {xs: xs, ys: E.A.fmap(fn, xs)}->Continuous.make->Continuous->DistributionTypes.PointSet } } @@ -253,16 +253,18 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) "logScore", [EvDistribution(prior), EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))], ) => - Some(runGenericOperation(FromDist(ToScore(LogScore(prediction, answer)), prior))) + runGenericOperation(FromDist(ToScore(LogScore(prediction, answer)), prior))->Some | ("logScoreAgainstImproperPrior", [EvDistribution(prediction), EvNumber(answer)]) | ( "logScoreAgainstImproperPrior", [EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))], ) => - E.O.fmap( - d => runGenericOperation(FromDist(ToScore(LogScore(prediction, answer)), d)), - Helpers.constructNonNormalizedPointSet(~supportOf=prediction, _ => 1.0), - ) + runGenericOperation( + FromDist( + ToScore(LogScore(prediction, answer)), + Helpers.constructNonNormalizedPointSet(~supportOf=prediction, _ => 1.0), + ), + )->Some | ("isNormalized", [EvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist) | ("toPointSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToPointSet, dist) | ("scaleLog", [EvDistribution(dist)]) => From 2ab395b4e5ff727f08826b3c470b024b51ef3104 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Thu, 12 May 2022 16:03:29 -0400 Subject: [PATCH 097/340] Some minor CR Value: [1e-10 to 1e-4] --- .../src/rescript/Distributions/GenericDist.res | 8 ++++---- .../rescript/Distributions/PointSetDist/PointSetDist.res | 3 --- .../ReducerInterface_GenericDistribution.res | 5 ++++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res index 1995ef34..3e067c51 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res @@ -60,10 +60,10 @@ let integralEndY = (t: t): float => let isNormalized = (t: t): bool => Js.Math.abs_float(integralEndY(t) -. 1.0) < 1e-7 module Score = { - let klDivergence = (t1, t2, ~toPointSetFn: toPointSetFn): result => { - let pointSets = E.R.merge(toPointSetFn(t1), toPointSetFn(t2)) - pointSets |> E.R2.bind(((a, b)) => - PointSetDist.T.klDivergence(a, b)->E.R2.errMap(x => DistributionTypes.OperationError(x)) + let klDivergence = (prediction, answer, ~toPointSetFn: toPointSetFn): result => { + let pointSets = E.R.merge(toPointSetFn(prediction), toPointSetFn(answer)) + pointSets |> E.R2.bind(((predi, ans)) => + PointSetDist.T.klDivergence(predi, ans)->E.R2.errMap(x => DistributionTypes.OperationError(x)) ) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index 05e79830..2f8ebee3 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -209,9 +209,6 @@ module T = Dist({ | _ => Error(Operation.NotYetImplemented) } } - let logScoreAgainstImproperPrior = (prediction: t, answer: float) => { - Error(Operation.NotYetImplemented) - } }) let pdf = (f: float, t: t) => { diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index b7f5f824..fb26189f 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -169,7 +169,10 @@ module Helpers = { E.A.Floats.range(a, b, MagicNumbers.Environment.defaultXYPointLength) | _ => [] } - {xs: xs, ys: E.A.fmap(fn, xs)}->Continuous.make->Continuous->DistributionTypes.PointSet + {xs: xs, ys: E.A.fmap(fn, xs)} + ->Continuous.make + ->PointSetTypes.Continuous + ->DistributionTypes.PointSet } } From ae2ee485119dff66584b6d6d9634c78fb8a5452e Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Fri, 13 May 2022 15:19:16 +0000 Subject: [PATCH 098/340] Memo the sampling of functions --- .../src/components/FunctionChart.tsx | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index 2ee71721..c5068d9a 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -76,28 +76,32 @@ export const FunctionChart: React.FC = ({ chartSettings.count ); type point = { x: number; value: result }; - let valueData: point[] = data1.map((x) => { - let result = runForeign(fn, [x], environment); - if (result.tag === "Ok") { - if (result.value.tag == "distribution") { - return { x, value: { tag: "Ok", value: result.value.value } }; - } else { - return { - x, - value: { - tag: "Error", - value: - "Cannot currently render functions that don't return distributions", - }, - }; - } - } else { - return { - x, - value: { tag: "Error", value: errorValueToString(result.value) }, - }; - } - }); + let valueData: point[] = React.useMemo( + () => + data1.map((x) => { + let result = runForeign(fn, [x], environment); + if (result.tag === "Ok") { + if (result.value.tag == "distribution") { + return { x, value: { tag: "Ok", value: result.value.value } }; + } else { + return { + x, + value: { + tag: "Error", + value: + "Cannot currently render functions that don't return distributions", + }, + }; + } + } else { + return { + x, + value: { tag: "Error", value: errorValueToString(result.value) }, + }; + } + }), + [environment, fn] + ); let initialPartition: [ { x: number; value: Distribution }[], From 006204f1ac25aba8370d9a09abc93ef3a44081d2 Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Fri, 13 May 2022 15:40:52 +0000 Subject: [PATCH 099/340] Add react keys to remove warnings --- packages/components/src/components/FunctionChart.tsx | 4 ++-- packages/components/src/components/SquiggleChart.tsx | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index 2ee71721..8038a36c 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -141,10 +141,10 @@ export const FunctionChart: React.FC = ({ /> {showChart} {_.entries(groupedErrors).map(([errorName, errorPoints]) => ( - + Values:{" "} {errorPoints - .map((r) => ) + .map((r, i) => ) .reduce((a, b) => ( <> {a}, {b} diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 241cd772..a54ac64d 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -148,8 +148,9 @@ const SquiggleItem: React.FC = ({ case "array": return ( - {expression.value.map((r) => ( + {expression.value.map((r, i) => ( = ({ return ( {Object.entries(expression.value).map(([key, r]) => ( - <> +
{key} = ({ chartSettings={chartSettings} environment={environment} /> - +
))} ); case "arraystring": return ( - {expression.value.map((r) => `"${r}"`)} + {expression.value.map((r) => `"${r}"`).join(", ")} ); case "lambda": From 3eef57f8556aebc519cb4d895ca456135a1aa0d5 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 13 May 2022 13:18:52 -0400 Subject: [PATCH 100/340] proof of concept for records as arguments Value: [1e-3 to 8e-1] --- .../ReducerInterface_GenericDistribution.res | 18 ++++++++++++++++-- .../squiggle-lang/src/rescript/Utility/E.res | 11 +++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index fb26189f..b2bf8a32 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -1,5 +1,5 @@ module ExpressionValue = ReducerInterface_ExpressionValue -type expressionValue = ReducerInterface_ExpressionValue.expressionValue +type expressionValue = ExpressionValue.expressionValue let defaultEnv: DistributionOperation.env = { sampleCount: MagicNumbers.Environment.defaultSampleCount, @@ -210,7 +210,7 @@ module SymbolicConstructors = { } } -let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment): option< +let rec dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment): option< DistributionOperation.outputType, > => { let (fnName, args) = call @@ -257,6 +257,10 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) [EvDistribution(prior), EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))], ) => runGenericOperation(FromDist(ToScore(LogScore(prediction, answer)), prior))->Some + | ("logScore", [EvRecord(r)]) => + recurRecordArgs("logScore", ["prior", "prediction", "answer"], r, _environment) + | ("increment", [EvNumber(x)]) => (x +. 1.0)->DistributionOperation.Float->Some + | ("increment", [EvRecord(r)]) => recurRecordArgs("increment", ["incrementee"], r, _environment) | ("logScoreAgainstImproperPrior", [EvDistribution(prediction), EvNumber(answer)]) | ( "logScoreAgainstImproperPrior", @@ -340,6 +344,16 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) | _ => None } } +and recurRecordArgs = ( + fnName: string, + argNames: array, + args: ExpressionValue.record, + _environment: 'a, +): option => + // argNames -> E.A2.fmap(x => Js.Dict.get(args, x)) -> E.A.O.arrSomeToSomeArr -> E.O.bind(a => dispatchToGenericOutput((fnName, a), _environment)) + argNames + ->E.A2.fmap(x => Js.Dict.unsafeGet(args, x)) + ->(a => dispatchToGenericOutput((fnName, a), _environment)) let genericOutputToReducerValue = (o: DistributionOperation.outputType): result< expressionValue, diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 15678e1a..63999ce6 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -620,6 +620,17 @@ module A = { | Some(o) => o | None => [] } + let rec arrSomeToSomeArr = (optionals: array>): option> => { + let optionals' = optionals->Belt.List.fromArray + switch optionals' { + | list{} => []->Some + | list{x, ...xs} => + switch x { + | Some(_) => xs->Belt.List.toArray->arrSomeToSomeArr + | None => None + } + } + } } module R = { From fbb79b261dfeb7b8253443392f1f0fa98b309412 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 13 May 2022 13:40:59 -0400 Subject: [PATCH 101/340] hotfix: increment package version --- packages/squiggle-lang/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index ff786b91..d21f2eb6 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -1,6 +1,6 @@ { "name": "@quri/squiggle-lang", - "version": "0.2.8", + "version": "0.2.9", "homepage": "https://squiggle-language.com", "license": "MIT", "scripts": { From b4a1137019731994dc1a915f28740158d4299228 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 13 May 2022 15:43:59 -0400 Subject: [PATCH 102/340] Implemented correct math underlying `logScoreWithPointResolution` Value: [1e-2 to 7e-1] Realized that I need to switch argument order, put `prior` last maybe. --- .../Distributions/DistributionOperation.res | 4 +-- .../Distributions/DistributionTypes.res | 2 +- .../rescript/Distributions/GenericDist.res | 31 +++++++++++++++--- .../rescript/Distributions/GenericDist.resi | 7 +++- .../Distributions/PointSetDist/Continuous.res | 11 +++---- .../Distributions/PointSetDist/Discrete.res | 2 +- .../PointSetDist/Distributions.res | 4 +-- .../Distributions/PointSetDist/Mixed.res | 2 +- .../PointSetDist/PointSetDist.res | 6 ++-- .../PointSetDist/PointSetDist_Scoring.res | 32 ++++++++++++++----- 10 files changed, 71 insertions(+), 30 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res index 97085133..4c4291eb 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res @@ -149,7 +149,7 @@ let rec run = (~env, functionCallInfo: functionCallInfo): outputType => { ->E.R2.fmap(r => Float(r)) ->OutputLocal.fromResult | ToScore(LogScore(prediction, answer)) => - GenericDist.Score.logScore(dist, prediction, answer, ~toPointSetFn) + GenericDist.Score.logScoreWithPointResolution(Some(dist), prediction, answer, ~toPointSetFn) ->E.R2.fmap(r => Float(r)) ->OutputLocal.fromResult | ToBool(IsNormalized) => dist->GenericDist.isNormalized->Bool @@ -267,7 +267,7 @@ module Constructors = { let isNormalized = (~env, dist) => C.isNormalized(dist)->run(~env)->toBoolR let klDivergence = (~env, dist1, dist2) => C.klDivergence(dist1, dist2)->run(~env)->toFloatR let logScore = (~env, prior, prediction, answer) => - C.logScore(prior, prediction, answer)->run(~env)->toFloatR + C.logScoreWithPointResolution(prior, prediction, answer)->run(~env)->toFloatR let toPointSet = (~env, dist) => C.toPointSet(dist)->run(~env)->toDistR let toSampleSet = (~env, dist, n) => C.toSampleSet(dist, n)->run(~env)->toDistR let fromSamples = (~env, xs) => C.fromSamples(xs)->run(~env)->toDistR diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res index 35e1b1a7..480775bf 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res @@ -162,7 +162,7 @@ module Constructors = { let truncate = (dist, left, right): t => FromDist(ToDist(Truncate(left, right)), dist) let inspect = (dist): t => FromDist(ToDist(Inspect), dist) let klDivergence = (dist1, dist2): t => FromDist(ToScore(KLDivergence(dist2)), dist1) - let logScore = (prior, prediction, answer): t => FromDist( + let logScoreWithPointResolution = (prior, prediction, answer): t => FromDist( ToScore(LogScore(prediction, answer)), prior, ) diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res index 3e067c51..3357556f 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res @@ -67,11 +67,32 @@ module Score = { ) } - let logScore = (prior, prediction, answer, ~toPointSetFn: toPointSetFn): result => { - let pointSets = E.R.merge(toPointSetFn(prior), toPointSetFn(prediction)) - pointSets |> E.R2.bind(((a, b)) => - PointSetDist.T.logScore(a, b, answer)->E.R2.errMap(x => DistributionTypes.OperationError(x)) - ) + let logScoreWithPointResolution = ( + prior, + prediction, + answer, + ~toPointSetFn: toPointSetFn, + ): result => { + switch prior { + | Some(prior') => + E.R.merge(toPointSetFn(prior'), toPointSetFn(prediction))->E.R.bind(((a, b)) => + PointSetDist.T.logScoreWithPointResolution( + a->Some, + b, + answer, + )->E.R2.errMap(x => DistributionTypes.OperationError(x)) + ) + | None => + prediction + ->toPointSetFn + ->E.R.bind(x => + PointSetDist.T.logScoreWithPointResolution( + None, + x, + answer, + )->E.R2.errMap(x => DistributionTypes.OperationError(x)) + ) + } } } diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi index 45f1e8f8..712e38b9 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi @@ -25,7 +25,12 @@ let toFloatOperation: ( module Score: { let klDivergence: (t, t, ~toPointSetFn: toPointSetFn) => result - let logScore: (t, t, float, ~toPointSetFn: toPointSetFn) => result + let logScoreWithPointResolution: ( + option, + t, + float, + ~toPointSetFn: toPointSetFn, + ) => result } @genType diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 7bf9c874..22aaaf3b 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -279,13 +279,10 @@ module T = Dist({ ) newShape->E.R2.fmap(x => x->make->integralEndY) } - let logScore = (prior: t, prediction: t, answer: float) => { - let newShape = XYShape.PointwiseCombination.combineAlongSupportOfSecondArgument( - PointSetDist_Scoring.LogScore.integrand(~answer), - prior.xyShape, - prediction.xyShape, - ) - newShape->E.R2.fmap(x => x->make->integralEndY) + let logScoreWithPointResolution = (prior: option, prediction: t, answer: float) => { + let priorPdf = prior->E.O2.fmap((shape, x) => XYShape.XtoY.linear(x, shape.xyShape)) + let predictionPdf = x => XYShape.XtoY.linear(x, prediction.xyShape) + PointSetDist_Scoring.LogScoreWithPointResolution.score(~priorPdf, ~predictionPdf, ~answer) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index e10ed981..26e15f6e 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -229,7 +229,7 @@ module T = Dist({ answer, )->E.R2.fmap(integralEndY) } - let logScore = (prior: t, prediction: t, answer: float) => { + let logScoreWithPointResolution = (prior: option, prediction: t, answer: float) => { Error(Operation.NotYetImplemented) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res index aa44da10..014c0668 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res @@ -34,7 +34,7 @@ module type dist = { let mean: t => float let variance: t => float let klDivergence: (t, t) => result - let logScore: (t, t, float) => result + let logScoreWithPointResolution: (option, t, float) => result } module Dist = (T: dist) => { @@ -58,7 +58,7 @@ module Dist = (T: dist) => { let variance = T.variance let integralEndY = T.integralEndY let klDivergence = T.klDivergence - let logScore = T.logScore + let logScoreWithPointResolution = T.logScoreWithPointResolution let updateIntegralCache = T.updateIntegralCache diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 2fd046ee..4f864856 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -306,7 +306,7 @@ module T = Dist({ let klContinuousPart = Continuous.T.klDivergence(prediction.continuous, answer.continuous) E.R.merge(klDiscretePart, klContinuousPart)->E.R2.fmap(t => fst(t) +. snd(t)) } - let logScore = (prior: t, prediction: t, answer: float) => { + let logScoreWithPointResolution = (prior: option, prediction: t, answer: float) => { Error(Operation.NotYetImplemented) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index 2f8ebee3..7f87fd01 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -203,9 +203,11 @@ module T = Dist({ | (m1, m2) => Mixed.T.klDivergence(m1->toMixed, m2->toMixed) } - let logScore = (prior: t, prediction: t, answer: float) => { + let logScoreWithPointResolution = (prior: option, prediction: t, answer: float) => { switch (prior, prediction) { - | (Continuous(t1), Continuous(t2)) => Continuous.T.logScore(t1, t2, answer) + | (Some(Continuous(t1)), Continuous(t2)) => + Continuous.T.logScoreWithPointResolution(t1->Some, t2, answer) + | (None, Continuous(t2)) => Continuous.T.logScoreWithPointResolution(None, t2, answer) | _ => Error(Operation.NotYetImplemented) } } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index 8daf260c..ddf5207d 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -18,16 +18,32 @@ module KLDivergence = { /* */ -module LogScore = { +module LogScoreWithPointResolution = { let logFn = Js.Math.log - let integrand = (priorElement: float, predictionElement: float, ~answer: float) => { - if answer == 0.0 { - Ok(0.0) - } else if predictionElement == 0.0 { - Ok(infinity) + let score = ( + ~priorPdf: option float>, + ~predictionPdf: float => float, + ~answer: float, + ): result => { + let numer = answer->predictionPdf + if numer < 0.0 { + Operation.ComplexNumberError->Error + } else if numer == 0.0 { + infinity->Ok } else { - let quot = predictionElement /. priorElement - quot < 0.0 ? Error(Operation.ComplexNumberError) : Ok(-.answer *. logFn(quot /. answer)) + -.( + switch priorPdf { + | None => numer->logFn + | Some(f) => { + let priorDensityOfAnswer = f(answer) + if priorDensityOfAnswer == 0.0 { + neg_infinity + } else { + (numer /. priorDensityOfAnswer)->logFn + } + } + } + )->Ok } } } From bdbb86aa9ed4423cd988efbaf29cb807060c634c Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Fri, 13 May 2022 16:15:04 -0400 Subject: [PATCH 103/340] `logScore` on records now interprets almost every which way we're interested in Value: [1e-3 to 9e-1] --- .../Distributions/DistributionOperation.res | 8 ++-- .../Distributions/DistributionOperation.resi | 7 +++- .../Distributions/DistributionTypes.res | 4 +- .../rescript/Distributions/GenericDist.res | 6 +-- .../rescript/Distributions/GenericDist.resi | 2 +- .../Distributions/PointSetDist/Continuous.res | 2 +- .../Distributions/PointSetDist/Discrete.res | 2 +- .../PointSetDist/Distributions.res | 2 +- .../Distributions/PointSetDist/Mixed.res | 2 +- .../PointSetDist/PointSetDist.res | 6 +-- .../ReducerInterface_GenericDistribution.res | 37 +++++++++++-------- .../squiggle-lang/src/rescript/Utility/E.res | 11 ++++++ 12 files changed, 56 insertions(+), 33 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res index 4c4291eb..1e2ff872 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res @@ -148,8 +148,8 @@ let rec run = (~env, functionCallInfo: functionCallInfo): outputType => { GenericDist.Score.klDivergence(dist, t2, ~toPointSetFn) ->E.R2.fmap(r => Float(r)) ->OutputLocal.fromResult - | ToScore(LogScore(prediction, answer)) => - GenericDist.Score.logScoreWithPointResolution(Some(dist), prediction, answer, ~toPointSetFn) + | ToScore(LogScore(answer, prior)) => + GenericDist.Score.logScoreWithPointResolution(dist, answer, prior, ~toPointSetFn) ->E.R2.fmap(r => Float(r)) ->OutputLocal.fromResult | ToBool(IsNormalized) => dist->GenericDist.isNormalized->Bool @@ -266,8 +266,8 @@ module Constructors = { let normalize = (~env, dist) => C.normalize(dist)->run(~env)->toDistR let isNormalized = (~env, dist) => C.isNormalized(dist)->run(~env)->toBoolR let klDivergence = (~env, dist1, dist2) => C.klDivergence(dist1, dist2)->run(~env)->toFloatR - let logScore = (~env, prior, prediction, answer) => - C.logScoreWithPointResolution(prior, prediction, answer)->run(~env)->toFloatR + let logScoreWithPointResolution = (~env, prediction, answer, prior) => + C.logScoreWithPointResolution(prediction, answer, prior)->run(~env)->toFloatR let toPointSet = (~env, dist) => C.toPointSet(dist)->run(~env)->toDistR let toSampleSet = (~env, dist, n) => C.toSampleSet(dist, n)->run(~env)->toDistR let fromSamples = (~env, xs) => C.fromSamples(xs)->run(~env)->toDistR diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi index c3d14014..fffd011b 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi @@ -62,7 +62,12 @@ module Constructors: { @genType let klDivergence: (~env: env, genericDist, genericDist) => result @genType - let logScore: (~env: env, genericDist, genericDist, float) => result + let logScoreWithPointResolution: ( + ~env: env, + genericDist, + float, + option, + ) => result @genType let toPointSet: (~env: env, genericDist) => result @genType diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res index 480775bf..f377a616 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res @@ -91,7 +91,7 @@ module DistributionOperation = { | ToString | ToSparkline(int) - type toScore = KLDivergence(genericDist) | LogScore(genericDist, float) + type toScore = KLDivergence(genericDist) | LogScore(float, option) type fromDist = | ToFloat(toFloat) @@ -120,7 +120,7 @@ module DistributionOperation = { | ToFloat(#Sample) => `sample` | ToFloat(#IntegralSum) => `integralSum` | ToScore(KLDivergence(_)) => `klDivergence` - | ToScore(LogScore(_, x)) => `logScore against ${E.Float.toFixed(x)}` + | ToScore(LogScore(x, _)) => `logScore against ${E.Float.toFixed(x)}` | ToDist(Normalize) => `normalize` | ToDist(ToPointSet) => `toPointSet` | ToDist(ToSampleSet(r)) => `toSampleSet(${E.I.toString(r)})` diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res index 3357556f..c2b03474 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res @@ -68,18 +68,18 @@ module Score = { } let logScoreWithPointResolution = ( - prior, prediction, answer, + prior, ~toPointSetFn: toPointSetFn, ): result => { switch prior { | Some(prior') => E.R.merge(toPointSetFn(prior'), toPointSetFn(prediction))->E.R.bind(((a, b)) => PointSetDist.T.logScoreWithPointResolution( - a->Some, b, answer, + a->Some, )->E.R2.errMap(x => DistributionTypes.OperationError(x)) ) | None => @@ -87,9 +87,9 @@ module Score = { ->toPointSetFn ->E.R.bind(x => PointSetDist.T.logScoreWithPointResolution( - None, x, answer, + None, )->E.R2.errMap(x => DistributionTypes.OperationError(x)) ) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi index 712e38b9..ea9a4110 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi @@ -26,9 +26,9 @@ let toFloatOperation: ( module Score: { let klDivergence: (t, t, ~toPointSetFn: toPointSetFn) => result let logScoreWithPointResolution: ( - option, t, float, + option, ~toPointSetFn: toPointSetFn, ) => result } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index 22aaaf3b..c1d87946 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -279,7 +279,7 @@ module T = Dist({ ) newShape->E.R2.fmap(x => x->make->integralEndY) } - let logScoreWithPointResolution = (prior: option, prediction: t, answer: float) => { + let logScoreWithPointResolution = (prediction: t, answer: float, prior: option) => { let priorPdf = prior->E.O2.fmap((shape, x) => XYShape.XtoY.linear(x, shape.xyShape)) let predictionPdf = x => XYShape.XtoY.linear(x, prediction.xyShape) PointSetDist_Scoring.LogScoreWithPointResolution.score(~priorPdf, ~predictionPdf, ~answer) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index 26e15f6e..c0e3f3a8 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -229,7 +229,7 @@ module T = Dist({ answer, )->E.R2.fmap(integralEndY) } - let logScoreWithPointResolution = (prior: option, prediction: t, answer: float) => { + let logScoreWithPointResolution = (prediction: t, answer: float, prior: option) => { Error(Operation.NotYetImplemented) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res index 014c0668..f28b6369 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res @@ -34,7 +34,7 @@ module type dist = { let mean: t => float let variance: t => float let klDivergence: (t, t) => result - let logScoreWithPointResolution: (option, t, float) => result + let logScoreWithPointResolution: (t, float, option) => result } module Dist = (T: dist) => { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index 4f864856..d3f09798 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -306,7 +306,7 @@ module T = Dist({ let klContinuousPart = Continuous.T.klDivergence(prediction.continuous, answer.continuous) E.R.merge(klDiscretePart, klContinuousPart)->E.R2.fmap(t => fst(t) +. snd(t)) } - let logScoreWithPointResolution = (prior: option, prediction: t, answer: float) => { + let logScoreWithPointResolution = (prediction: t, answer: float, prior: option) => { Error(Operation.NotYetImplemented) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index 7f87fd01..cdeaef5a 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -203,11 +203,11 @@ module T = Dist({ | (m1, m2) => Mixed.T.klDivergence(m1->toMixed, m2->toMixed) } - let logScoreWithPointResolution = (prior: option, prediction: t, answer: float) => { + let logScoreWithPointResolution = (prediction: t, answer: float, prior: option) => { switch (prior, prediction) { | (Some(Continuous(t1)), Continuous(t2)) => - Continuous.T.logScoreWithPointResolution(t1->Some, t2, answer) - | (None, Continuous(t2)) => Continuous.T.logScoreWithPointResolution(None, t2, answer) + Continuous.T.logScoreWithPointResolution(t2, answer, t1->Some) + | (None, Continuous(t2)) => Continuous.T.logScoreWithPointResolution(t2, answer, None) | _ => Error(Operation.NotYetImplemented) } } diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index b2bf8a32..bee0e3fe 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -251,27 +251,34 @@ let rec dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environm | ("normalize", [EvDistribution(dist)]) => Helpers.toDistFn(Normalize, dist) | ("klDivergence", [EvDistribution(a), EvDistribution(b)]) => Some(runGenericOperation(FromDist(ToScore(KLDivergence(b)), a))) - | ("logScore", [EvDistribution(prior), EvDistribution(prediction), EvNumber(answer)]) | ( - "logScore", - [EvDistribution(prior), EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))], + "logScoreWithPointResolution", + [EvDistribution(prediction), EvNumber(answer), EvDistribution(prior)], + ) + | ( + "logScoreWithPointResolution", + [EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer))), EvDistribution(prior)], ) => - runGenericOperation(FromDist(ToScore(LogScore(prediction, answer)), prior))->Some - | ("logScore", [EvRecord(r)]) => - recurRecordArgs("logScore", ["prior", "prediction", "answer"], r, _environment) - | ("increment", [EvNumber(x)]) => (x +. 1.0)->DistributionOperation.Float->Some - | ("increment", [EvRecord(r)]) => recurRecordArgs("increment", ["incrementee"], r, _environment) - | ("logScoreAgainstImproperPrior", [EvDistribution(prediction), EvNumber(answer)]) + runGenericOperation(FromDist(ToScore(LogScore(answer, prior->Some)), prediction))->Some + | ("logScoreWithPointResolution", [EvDistribution(prediction), EvNumber(answer)]) | ( - "logScoreAgainstImproperPrior", + "logScoreWithPointResolution", [EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))], ) => - runGenericOperation( - FromDist( - ToScore(LogScore(prediction, answer)), - Helpers.constructNonNormalizedPointSet(~supportOf=prediction, _ => 1.0), + runGenericOperation(FromDist(ToScore(LogScore(answer, None)), prediction))->Some + | ("logScore", [EvRecord(r)]) => + [ + recurRecordArgs( + "logScoreWithPointResolution", + ["estimate", "answer", "prior"], + r, + _environment, ), - )->Some + recurRecordArgs("klDivergence", ["estimate", "answer"], r, _environment), + recurRecordArgs("logScoreWithPointResolution", ["estimate", "answer"], r, _environment), + ]->E.A.O.firstSome + | ("increment", [EvNumber(x)]) => (x +. 1.0)->DistributionOperation.Float->Some // this tests recurRecordArgs function + | ("increment", [EvRecord(r)]) => recurRecordArgs("increment", ["incrementee"], r, _environment) | ("isNormalized", [EvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist) | ("toPointSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToPointSet, dist) | ("scaleLog", [EvDistribution(dist)]) => diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 63999ce6..35439230 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -631,6 +631,17 @@ module A = { } } } + let rec firstSome = (optionals: array>): option<'a> => { + let optionals' = optionals->Belt.List.fromArray + switch optionals' { + | list{} => None + | list{x, ...xs} => + switch x { + | Some(_) => x + | None => xs->Belt.List.toArray->firstSome + } + } + } } module R = { From 80e05ea5bea27865e8127f3aaa4b0a9cfd8145ce Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Fri, 13 May 2022 20:16:52 +0000 Subject: [PATCH 104/340] Pass environment down to GenericDist --- .../ReducerInterface_GenericDistribution.res | 126 +++++++++++------- 1 file changed, 76 insertions(+), 50 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 8dae2586..a50fbede 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -6,8 +6,6 @@ let defaultEnv: DistributionOperation.env = { xyPointLength: MagicNumbers.Environment.defaultXYPointLength, } -let runGenericOperation = DistributionOperation.run(~env=defaultEnv) - module Helpers = { let arithmeticMap = r => switch r { @@ -39,37 +37,44 @@ module Helpers = { let toFloatFn = ( fnCall: DistributionTypes.DistributionOperation.toFloat, dist: DistributionTypes.genericDist, + ~env: DistributionOperation.env, ) => { FromDist(DistributionTypes.DistributionOperation.ToFloat(fnCall), dist) - ->runGenericOperation + ->DistributionOperation.run(~env) ->Some } let toStringFn = ( fnCall: DistributionTypes.DistributionOperation.toString, dist: DistributionTypes.genericDist, + ~env: DistributionOperation.env, ) => { FromDist(DistributionTypes.DistributionOperation.ToString(fnCall), dist) - ->runGenericOperation + ->DistributionOperation.run(~env) ->Some } let toBoolFn = ( fnCall: DistributionTypes.DistributionOperation.toBool, dist: DistributionTypes.genericDist, + ~env: DistributionOperation.env, ) => { FromDist(DistributionTypes.DistributionOperation.ToBool(fnCall), dist) - ->runGenericOperation + ->DistributionOperation.run(~env) ->Some } - let toDistFn = (fnCall: DistributionTypes.DistributionOperation.toDist, dist) => { + let toDistFn = ( + fnCall: DistributionTypes.DistributionOperation.toDist, + dist, + ~env: DistributionOperation.env, + ) => { FromDist(DistributionTypes.DistributionOperation.ToDist(fnCall), dist) - ->runGenericOperation + ->DistributionOperation.run(~env) ->Some } - let twoDiststoDistFn = (direction, arithmetic, dist1, dist2) => { + let twoDiststoDistFn = (direction, arithmetic, dist1, dist2, ~env: DistributionOperation.env) => { FromDist( DistributionTypes.DistributionOperation.ToDistCombination( direction, @@ -77,7 +82,7 @@ module Helpers = { #Dist(dist2), ), dist1, - )->runGenericOperation + )->DistributionOperation.run(~env) } let parseNumber = (args: expressionValue): Belt.Result.t => @@ -104,33 +109,38 @@ module Helpers = { let mixtureWithGivenWeights = ( distributions: array, weights: array, + ~env: DistributionOperation.env, ): DistributionOperation.outputType => E.A.length(distributions) == E.A.length(weights) - ? Mixture(Belt.Array.zip(distributions, weights))->runGenericOperation + ? Mixture(Belt.Array.zip(distributions, weights))->DistributionOperation.run(~env) : GenDistError( ArgumentError("Error, mixture call has different number of distributions and weights"), ) let mixtureWithDefaultWeights = ( distributions: array, + ~env: DistributionOperation.env, ): DistributionOperation.outputType => { let length = E.A.length(distributions) let weights = Belt.Array.make(length, 1.0 /. Belt.Int.toFloat(length)) - mixtureWithGivenWeights(distributions, weights) + mixtureWithGivenWeights(distributions, weights, ~env) } - let mixture = (args: array): DistributionOperation.outputType => { + let mixture = ( + args: array, + ~env: DistributionOperation.env, + ): DistributionOperation.outputType => { let error = (err: string): DistributionOperation.outputType => err->DistributionTypes.ArgumentError->GenDistError switch args { | [EvArray(distributions)] => switch parseDistributionArray(distributions) { - | Ok(distrs) => mixtureWithDefaultWeights(distrs) + | Ok(distrs) => mixtureWithDefaultWeights(distrs, ~env) | Error(err) => error(err) } | [EvArray(distributions), EvArray(weights)] => switch (parseDistributionArray(distributions), parseNumberArray(weights)) { - | (Ok(distrs), Ok(wghts)) => mixtureWithGivenWeights(distrs, wghts) + | (Ok(distrs), Ok(wghts)) => mixtureWithGivenWeights(distrs, wghts, ~env) | (Error(err), Ok(_)) => error(err) | (Ok(_), Error(err)) => error(err) | (Error(err1), Error(err2)) => error(`${err1}|${err2}`) @@ -143,14 +153,14 @@ module Helpers = { Belt.Array.slice(args, ~offset=0, ~len=E.A.length(args) - 1), ) switch E.R.merge(distributions, weights) { - | Ok(d, w) => mixtureWithGivenWeights(d, w) + | Ok(d, w) => mixtureWithGivenWeights(d, w, ~env) | Error(err) => error(err) } } | Some(EvNumber(_)) | Some(EvDistribution(_)) => switch parseDistributionArray(args) { - | Ok(distributions) => mixtureWithDefaultWeights(distributions) + | Ok(distributions) => mixtureWithDefaultWeights(distributions, ~env) | Error(err) => error(err) } | _ => error("Last argument of mx must be array or distribution") @@ -193,9 +203,10 @@ module SymbolicConstructors = { } } -let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment): option< - DistributionOperation.outputType, -> => { +let dispatchToGenericOutput = ( + call: ExpressionValue.functionCall, + env: DistributionOperation.env, +): option => { let (fnName, args) = call switch (fnName, args) { | ("exponential" as fnName, [EvNumber(f)]) => @@ -215,13 +226,13 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) SymbolicConstructors.threeFloat(fnName) ->E.R.bind(r => r(f1, f2, f3)) ->SymbolicConstructors.symbolicResultToOutput - | ("sample", [EvDistribution(dist)]) => Helpers.toFloatFn(#Sample, dist) - | ("mean", [EvDistribution(dist)]) => Helpers.toFloatFn(#Mean, dist) - | ("integralSum", [EvDistribution(dist)]) => Helpers.toFloatFn(#IntegralSum, dist) - | ("toString", [EvDistribution(dist)]) => Helpers.toStringFn(ToString, dist) - | ("toSparkline", [EvDistribution(dist)]) => Helpers.toStringFn(ToSparkline(20), dist) + | ("sample", [EvDistribution(dist)]) => Helpers.toFloatFn(#Sample, dist, ~env) + | ("mean", [EvDistribution(dist)]) => Helpers.toFloatFn(#Mean, dist, ~env) + | ("integralSum", [EvDistribution(dist)]) => Helpers.toFloatFn(#IntegralSum, dist, ~env) + | ("toString", [EvDistribution(dist)]) => Helpers.toStringFn(ToString, dist, ~env) + | ("toSparkline", [EvDistribution(dist)]) => Helpers.toStringFn(ToSparkline(20), dist, ~env) | ("toSparkline", [EvDistribution(dist), EvNumber(n)]) => - Helpers.toStringFn(ToSparkline(Belt.Float.toInt(n)), dist) + Helpers.toStringFn(ToSparkline(Belt.Float.toInt(n)), dist, ~env) | ("exp", [EvDistribution(a)]) => // https://mathjs.org/docs/reference/functions/exp.html Helpers.twoDiststoDistFn( @@ -229,60 +240,74 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) "pow", GenericDist.fromFloat(MagicNumbers.Math.e), a, + ~env, )->Some - | ("normalize", [EvDistribution(dist)]) => Helpers.toDistFn(Normalize, dist) + | ("normalize", [EvDistribution(dist)]) => Helpers.toDistFn(Normalize, dist, ~env) | ("klDivergence", [EvDistribution(a), EvDistribution(b)]) => - Some(runGenericOperation(FromDist(ToScore(KLDivergence(b)), a))) - | ("isNormalized", [EvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist) - | ("toPointSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToPointSet, dist) + Some(DistributionOperation.run(FromDist(ToScore(KLDivergence(b)), a), ~env)) + | ("isNormalized", [EvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist, ~env) + | ("toPointSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToPointSet, dist, ~env) | ("scaleLog", [EvDistribution(dist)]) => - Helpers.toDistFn(Scale(#Logarithm, MagicNumbers.Math.e), dist) - | ("scaleLog10", [EvDistribution(dist)]) => Helpers.toDistFn(Scale(#Logarithm, 10.0), dist) + Helpers.toDistFn(Scale(#Logarithm, MagicNumbers.Math.e), dist, ~env) + | ("scaleLog10", [EvDistribution(dist)]) => Helpers.toDistFn(Scale(#Logarithm, 10.0), dist, ~env) | ("scaleLog", [EvDistribution(dist), EvNumber(float)]) => - Helpers.toDistFn(Scale(#Logarithm, float), dist) + Helpers.toDistFn(Scale(#Logarithm, float), dist, ~env) | ("scaleLogWithThreshold", [EvDistribution(dist), EvNumber(base), EvNumber(eps)]) => - Helpers.toDistFn(Scale(#LogarithmWithThreshold(eps), base), dist) + Helpers.toDistFn(Scale(#LogarithmWithThreshold(eps), base), dist, ~env) | ("scalePow", [EvDistribution(dist), EvNumber(float)]) => - Helpers.toDistFn(Scale(#Power, float), dist) + Helpers.toDistFn(Scale(#Power, float), dist, ~env) | ("scaleExp", [EvDistribution(dist)]) => - Helpers.toDistFn(Scale(#Power, MagicNumbers.Math.e), dist) - | ("cdf", [EvDistribution(dist), EvNumber(float)]) => Helpers.toFloatFn(#Cdf(float), dist) - | ("pdf", [EvDistribution(dist), EvNumber(float)]) => Helpers.toFloatFn(#Pdf(float), dist) - | ("inv", [EvDistribution(dist), EvNumber(float)]) => Helpers.toFloatFn(#Inv(float), dist) + Helpers.toDistFn(Scale(#Power, MagicNumbers.Math.e), dist, ~env) + | ("cdf", [EvDistribution(dist), EvNumber(float)]) => Helpers.toFloatFn(#Cdf(float), dist, ~env) + | ("pdf", [EvDistribution(dist), EvNumber(float)]) => Helpers.toFloatFn(#Pdf(float), dist, ~env) + | ("inv", [EvDistribution(dist), EvNumber(float)]) => Helpers.toFloatFn(#Inv(float), dist, ~env) | ("toSampleSet", [EvDistribution(dist), EvNumber(float)]) => - Helpers.toDistFn(ToSampleSet(Belt.Int.fromFloat(float)), dist) + Helpers.toDistFn(ToSampleSet(Belt.Int.fromFloat(float)), dist, ~env) | ("toSampleSet", [EvDistribution(dist)]) => - Helpers.toDistFn(ToSampleSet(MagicNumbers.Environment.defaultSampleCount), dist) + Helpers.toDistFn(ToSampleSet(env.sampleCount), dist, ~env) | ("fromSamples", [EvArray(inputArray)]) => { let _wrapInputErrors = x => SampleSetDist.NonNumericInput(x) let parsedArray = Helpers.parseNumberArray(inputArray)->E.R2.errMap(_wrapInputErrors) switch parsedArray { - | Ok(array) => runGenericOperation(FromSamples(array)) + | Ok(array) => DistributionOperation.run(FromSamples(array), ~env) | Error(e) => GenDistError(SampleSetError(e)) }->Some } - | ("inspect", [EvDistribution(dist)]) => Helpers.toDistFn(Inspect, dist) + | ("inspect", [EvDistribution(dist)]) => Helpers.toDistFn(Inspect, dist, ~env) | ("truncateLeft", [EvDistribution(dist), EvNumber(float)]) => - Helpers.toDistFn(Truncate(Some(float), None), dist) + Helpers.toDistFn(Truncate(Some(float), None), dist, ~env) | ("truncateRight", [EvDistribution(dist), EvNumber(float)]) => - Helpers.toDistFn(Truncate(None, Some(float)), dist) + Helpers.toDistFn(Truncate(None, Some(float)), dist, ~env) | ("truncate", [EvDistribution(dist), EvNumber(float1), EvNumber(float2)]) => - Helpers.toDistFn(Truncate(Some(float1), Some(float2)), dist) - | ("mx" | "mixture", args) => Helpers.mixture(args)->Some + Helpers.toDistFn(Truncate(Some(float1), Some(float2)), dist, ~env) + | ("mx" | "mixture", args) => Helpers.mixture(args, ~env)->Some | ("log", [EvDistribution(a)]) => Helpers.twoDiststoDistFn( Algebraic(AsDefault), "log", a, GenericDist.fromFloat(MagicNumbers.Math.e), + ~env, )->Some | ("log10", [EvDistribution(a)]) => - Helpers.twoDiststoDistFn(Algebraic(AsDefault), "log", a, GenericDist.fromFloat(10.0))->Some + Helpers.twoDiststoDistFn( + Algebraic(AsDefault), + "log", + a, + GenericDist.fromFloat(10.0), + ~env, + )->Some | ("unaryMinus", [EvDistribution(a)]) => - Helpers.twoDiststoDistFn(Algebraic(AsDefault), "multiply", a, GenericDist.fromFloat(-1.0))->Some + Helpers.twoDiststoDistFn( + Algebraic(AsDefault), + "multiply", + a, + GenericDist.fromFloat(-1.0), + ~env, + )->Some | (("add" | "multiply" | "subtract" | "divide" | "pow" | "log") as arithmetic, [_, _] as args) => Helpers.catchAndConvertTwoArgsToDists(args)->E.O2.fmap(((fst, snd)) => - Helpers.twoDiststoDistFn(Algebraic(AsDefault), arithmetic, fst, snd) + Helpers.twoDiststoDistFn(Algebraic(AsDefault), arithmetic, fst, snd, ~env) ) | ( ("dotAdd" @@ -293,7 +318,7 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) [_, _] as args, ) => Helpers.catchAndConvertTwoArgsToDists(args)->E.O2.fmap(((fst, snd)) => - Helpers.twoDiststoDistFn(Pointwise, arithmetic, fst, snd) + Helpers.twoDiststoDistFn(Pointwise, arithmetic, fst, snd, ~env) ) | ("dotExp", [EvDistribution(a)]) => Helpers.twoDiststoDistFn( @@ -301,6 +326,7 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) "dotPow", GenericDist.fromFloat(MagicNumbers.Math.e), a, + ~env, )->Some | _ => None } From 95d0212ffc32c70ee643afd2f2443a75fe0c484b Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Fri, 13 May 2022 20:23:41 +0000 Subject: [PATCH 105/340] Remove redundant defaultEnv --- .../ReducerInterface_GenericDistribution.res | 5 ----- .../ReducerInterface_GenericDistribution.resi | 1 - packages/squiggle-lang/src/rescript/TypescriptInterface.res | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index a50fbede..73614aee 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -1,11 +1,6 @@ module ExpressionValue = ReducerInterface_ExpressionValue type expressionValue = ReducerInterface_ExpressionValue.expressionValue -let defaultEnv: DistributionOperation.env = { - sampleCount: MagicNumbers.Environment.defaultSampleCount, - xyPointLength: MagicNumbers.Environment.defaultXYPointLength, -} - module Helpers = { let arithmeticMap = r => switch r { diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.resi b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.resi index 038f4479..7f26a610 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.resi +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.resi @@ -1,4 +1,3 @@ -let defaultEnv: DistributionOperation.env let dispatch: ( ReducerInterface_ExpressionValue.functionCall, ReducerInterface_ExpressionValue.environment, diff --git a/packages/squiggle-lang/src/rescript/TypescriptInterface.res b/packages/squiggle-lang/src/rescript/TypescriptInterface.res index 13763e72..93af9832 100644 --- a/packages/squiggle-lang/src/rescript/TypescriptInterface.res +++ b/packages/squiggle-lang/src/rescript/TypescriptInterface.res @@ -77,7 +77,7 @@ let distributionErrorToString = DistributionTypes.Error.toString type lambdaValue = ReducerInterface_ExpressionValue.lambdaValue @genType -let defaultSamplingEnv = ReducerInterface_GenericDistribution.defaultEnv +let defaultSamplingEnv = DistributionOperation.defaultEnv @genType type environment = ReducerInterface_ExpressionValue.environment From b2b51c8f462d2b2a2407ac9aadc9e4055afdac1b Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 10:52:35 -0400 Subject: [PATCH 106/340] Added sampleN to interface --- .../src/rescript/Distributions/DistributionOperation.res | 1 + .../src/rescript/Distributions/DistributionOperation.resi | 1 + .../ReducerInterface/ReducerInterface_GenericDistribution.res | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res index 80a53eb8..da4c010a 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res @@ -18,6 +18,7 @@ type outputType = | Dist(genericDist) | Float(float) | String(string) + | FloatArray(array) | Bool(bool) | GenDistError(error) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi index 200be7d7..a8d61a9a 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi @@ -14,6 +14,7 @@ type outputType = | Dist(genericDist) | Float(float) | String(string) + | FloatArray(array) | Bool(bool) | GenDistError(error) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 8dae2586..37bffeef 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -216,6 +216,9 @@ let dispatchToGenericOutput = (call: ExpressionValue.functionCall, _environment) ->E.R.bind(r => r(f1, f2, f3)) ->SymbolicConstructors.symbolicResultToOutput | ("sample", [EvDistribution(dist)]) => Helpers.toFloatFn(#Sample, dist) + | ("sampleN", [EvDistribution(dist), EvNumber(n)]) => Some( + FloatArray(GenericDist.sampleN(dist, Belt.Int.fromFloat(n))), + ) | ("mean", [EvDistribution(dist)]) => Helpers.toFloatFn(#Mean, dist) | ("integralSum", [EvDistribution(dist)]) => Helpers.toFloatFn(#IntegralSum, dist) | ("toString", [EvDistribution(dist)]) => Helpers.toStringFn(ToString, dist) @@ -315,6 +318,7 @@ let genericOutputToReducerValue = (o: DistributionOperation.outputType): result< | Float(d) => Ok(EvNumber(d)) | String(d) => Ok(EvString(d)) | Bool(d) => Ok(EvBool(d)) + | FloatArray(d) => Ok(EvArray(d |> E.A.fmap(r =>ReducerInterface_ExpressionValue.EvNumber(r)))) | GenDistError(err) => Error(REDistributionError(err)) } From 4676026aa0e26670ef23860f7cef977591de9bb7 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 10:58:29 -0400 Subject: [PATCH 107/340] Ran formatter --- packages/squiggle-lang/package.json | 1 - .../ReducerInterface_GenericDistribution.res | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index d21f2eb6..c1705471 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -33,7 +33,6 @@ "Rescript" ], "author": "Quantified Uncertainty Research Institute", - "license": "MIT", "dependencies": { "rescript": "^9.1.4", "jstat": "^1.9.5", diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 448d7f1b..f36c21bf 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -222,9 +222,8 @@ let dispatchToGenericOutput = ( ->E.R.bind(r => r(f1, f2, f3)) ->SymbolicConstructors.symbolicResultToOutput | ("sample", [EvDistribution(dist)]) => Helpers.toFloatFn(#Sample, dist, ~env) - | ("sampleN", [EvDistribution(dist), EvNumber(n)]) => Some( - FloatArray(GenericDist.sampleN(dist, Belt.Int.fromFloat(n))), - ) + | ("sampleN", [EvDistribution(dist), EvNumber(n)]) => + Some(FloatArray(GenericDist.sampleN(dist, Belt.Int.fromFloat(n)))) | ("mean", [EvDistribution(dist)]) => Helpers.toFloatFn(#Mean, dist, ~env) | ("integralSum", [EvDistribution(dist)]) => Helpers.toFloatFn(#IntegralSum, dist, ~env) | ("toString", [EvDistribution(dist)]) => Helpers.toStringFn(ToString, dist, ~env) @@ -339,7 +338,7 @@ let genericOutputToReducerValue = (o: DistributionOperation.outputType): result< | Float(d) => Ok(EvNumber(d)) | String(d) => Ok(EvString(d)) | Bool(d) => Ok(EvBool(d)) - | FloatArray(d) => Ok(EvArray(d |> E.A.fmap(r =>ReducerInterface_ExpressionValue.EvNumber(r)))) + | FloatArray(d) => Ok(EvArray(d |> E.A.fmap(r => ReducerInterface_ExpressionValue.EvNumber(r)))) | GenDistError(err) => Error(REDistributionError(err)) } From b015c20fa4b36aa557d97ffa184762d45fd4cb14 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 14:39:50 -0400 Subject: [PATCH 108/340] Cached FunctionChart percentiles calculation --- .../src/components/FunctionChart.tsx | 142 ++++++++++-------- .../src/components/SquiggleChart.tsx | 6 +- .../src/components/SquiggleEditor.tsx | 2 +- .../src/stories/SquiggleChart.stories.mdx | 13 ++ 4 files changed, 93 insertions(+), 70 deletions(-) diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index 2fd4587d..26a13c78 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -7,6 +7,8 @@ import { lambdaValue, environment, runForeign, + squiggleExpression, + errorValue, errorValueToString, } from "@quri/squiggle-lang"; import { createClassFromSpec } from "react-vega"; @@ -45,6 +47,23 @@ interface FunctionChartProps { environment: environment; } +type percentiles = { + x: number; + p1: number; + p5: number; + p10: number; + p20: number; + p30: number; + p40: number; + p50: number; + p60: number; + p70: number; + p80: number; + p90: number; + p95: number; + p99: number; +}[]; + export const FunctionChart: React.FC = ({ fn, chartSettings, @@ -58,7 +77,9 @@ export const FunctionChart: React.FC = ({ setMouseOverlay(NaN); } const signalListeners = { mousemove: handleHover, mouseout: handleOut }; - let mouseItem = runForeign(fn, [mouseOverlay], environment); + let mouseItem: result = !!mouseOverlay + ? runForeign(fn, [mouseOverlay], { sampleCount: 10000, xyPointLength: 1000 }) + : { tag: "Error", value: { tag: "REExpectedType", value: "Expected float, got NaN" } }; let showChart = mouseItem.tag === "Ok" && mouseItem.value.tag == "distribution" ? ( = ({ chartSettings.count ); type point = { x: number; value: result }; - let valueData: point[] = React.useMemo( - () => - data1.map((x) => { - let result = runForeign(fn, [x], environment); - if (result.tag === "Ok") { - if (result.value.tag == "distribution") { - return { x, value: { tag: "Ok", value: result.value.value } }; - } else { - return { - x, - value: { - tag: "Error", - value: - "Cannot currently render functions that don't return distributions", - }, - }; - } + + let getPercentiles: () => percentiles = () => { + let valueData:any = data1.map((x) => { + let result = runForeign(fn, [x], environment); + if (result.tag === "Ok") { + if (result.value.tag == "distribution") { + return { x, value: { tag: "Ok", value: result.value.value } }; } else { return { x, - value: { tag: "Error", value: errorValueToString(result.value) }, + value: { + tag: "Error", + value: + "Cannot currently render functions that don't return distributions", + }, }; } - }), - [environment, fn] - ); + } else { + return { + x, + value: { tag: "Error", value: errorValueToString(result.value) }, + }; + } + }); + let initialPartition: [ + { x: number; value: Distribution }[], + { x: number; value: string }[] + ] = [[], []]; + let [functionImage, errors] = valueData.reduce((acc, current) => { + if (current.value.tag === "Ok") { + acc[0].push({ x: current.x, value: current.value.value }); + } else { + acc[1].push({ x: current.x, value: current.value.value }); + } + return acc; + }, initialPartition); - let initialPartition: [ - { x: number; value: Distribution }[], - { x: number; value: string }[] - ] = [[], []]; - let [functionImage, errors] = valueData.reduce((acc, current) => { - if (current.value.tag === "Ok") { - acc[0].push({ x: current.x, value: current.value.value }); - } else { - acc[1].push({ x: current.x, value: current.value.value }); - } - return acc; - }, initialPartition); + let percentiles:percentiles = functionImage.map(({ x, value }) => { + let toPointSet: Distribution = unwrap(value.toPointSet()); + return { + x: x, + p1: unwrap(toPointSet.inv(0.01)), + p5: unwrap(toPointSet.inv(0.05)), + p10: unwrap(toPointSet.inv(0.12)), + p20: unwrap(toPointSet.inv(0.2)), + p30: unwrap(toPointSet.inv(0.3)), + p40: unwrap(toPointSet.inv(0.4)), + p50: unwrap(toPointSet.inv(0.5)), + p60: unwrap(toPointSet.inv(0.6)), + p70: unwrap(toPointSet.inv(0.7)), + p80: unwrap(toPointSet.inv(0.8)), + p90: unwrap(toPointSet.inv(0.9)), + p95: unwrap(toPointSet.inv(0.95)), + p99: unwrap(toPointSet.inv(0.99)), + }; + }); + return percentiles; + }; - let percentiles = functionImage.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 _getPercentiles = React.useMemo(getPercentiles, [environment, fn]) - let groupedErrors = _.groupBy(errors, (x) => x.value); return ( <> {showChart} - {_.entries(groupedErrors).map(([errorName, errorPoints]) => ( - - Values:{" "} - {errorPoints - .map((r, i) => ) - .reduce((a, b) => ( - <> - {a}, {b} - - ))} - - ))} ); }; diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index a54ac64d..b3b71e68 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -194,7 +194,7 @@ const SquiggleItem: React.FC = ({ ); } @@ -232,7 +232,7 @@ const ChartWrapper = styled.div` "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; `; -let defaultChartSettings = { start: 0, stop: 10, count: 100 }; +let defaultChartSettings = { start: 0, stop: 10, count: 20 }; export const SquiggleChart: React.FC = ({ squiggleString = "", environment, @@ -247,7 +247,7 @@ export const SquiggleChart: React.FC = ({ chartSettings = defaultChartSettings, }: SquiggleChartProps) => { let expressionResult = run(squiggleString, bindings, environment, jsImports); - let e = environment ? environment : defaultEnvironment; + let e = environment ? environment : { sampleCount: 100000, xyPointLength: 1000 }; let internal: JSX.Element; if (expressionResult.tag === "Ok") { let expression = expressionResult.value; diff --git a/packages/components/src/components/SquiggleEditor.tsx b/packages/components/src/components/SquiggleEditor.tsx index c4ac1876..a69f6ce2 100644 --- a/packages/components/src/components/SquiggleEditor.tsx +++ b/packages/components/src/components/SquiggleEditor.tsx @@ -56,7 +56,7 @@ export let SquiggleEditor: React.FC = ({ environment, diagramStart = 0, diagramStop = 10, - diagramCount = 100, + diagramCount = 20, onChange, bindings = defaultBindings, jsImports = defaultImports, diff --git a/packages/components/src/stories/SquiggleChart.stories.mdx b/packages/components/src/stories/SquiggleChart.stories.mdx index 54ed634d..9b4d3c83 100644 --- a/packages/components/src/stories/SquiggleChart.stories.mdx +++ b/packages/components/src/stories/SquiggleChart.stories.mdx @@ -153,6 +153,19 @@ to allow large and small numbers being printed cleanly. +## Functions + + + {Template.bind({})} + + + ## Records From 91ccd333e0fe19ef7ae933a5754bc5ccd9f0f469 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 15:21:00 -0400 Subject: [PATCH 109/340] Minor refactors --- .../src/components/FunctionChart.tsx | 128 ++++++++++++++++-- .../src/components/SquiggleChart.tsx | 7 +- 2 files changed, 117 insertions(+), 18 deletions(-) diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index 26a13c78..32919d67 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -64,6 +64,81 @@ type percentiles = { p99: number; }[]; +type errors = _.Dictionary< + { + x: number; + value: string; + }[] +>; + +type point = { x: number; value: result }; + +let getPercentiles = ({ chartSettings, fn, environment }) => { + let data1 = _rangeByCount( + chartSettings.start, + chartSettings.stop, + chartSettings.count + ); + let valueData: point[] = data1.map((x) => { + let result = runForeign(fn, [x], environment); + if (result.tag === "Ok") { + if (result.value.tag == "distribution") { + return { x, value: { tag: "Ok", value: result.value.value } }; + } else { + return { + x, + value: { + tag: "Error", + value: + "Cannot currently render functions that don't return distributions", + }, + }; + } + } else { + return { + x, + value: { tag: "Error", value: errorValueToString(result.value) }, + }; + } + }); + let initialPartition: [ + { x: number; value: Distribution }[], + { x: number; value: string }[] + ] = [[], []]; + let [functionImage, errors] = valueData.reduce((acc, current) => { + if (current.value.tag === "Ok") { + acc[0].push({ x: current.x, value: current.value.value }); + } else { + acc[1].push({ x: current.x, value: current.value.value }); + } + return acc; + }, initialPartition); + let groupedErrors: errors = _.groupBy(errors, (x) => x.value); + let percentiles: percentiles = functionImage.map(({ x, value }) => { + // We convert it to to a pointSet distribution first, so that in case its a sample set + // distribution, it doesn't internally convert it to a pointSet distribution for every + // single inv() call. + let toPointSet: Distribution = unwrap(value.toPointSet()); + return { + x: x, + p1: unwrap(toPointSet.inv(0.01)), + p5: unwrap(toPointSet.inv(0.05)), + p10: unwrap(toPointSet.inv(0.12)), + p20: unwrap(toPointSet.inv(0.2)), + p30: unwrap(toPointSet.inv(0.3)), + p40: unwrap(toPointSet.inv(0.4)), + p50: unwrap(toPointSet.inv(0.5)), + p60: unwrap(toPointSet.inv(0.6)), + p70: unwrap(toPointSet.inv(0.7)), + p80: unwrap(toPointSet.inv(0.8)), + p90: unwrap(toPointSet.inv(0.9)), + p95: unwrap(toPointSet.inv(0.95)), + p99: unwrap(toPointSet.inv(0.99)), + }; + }); + return { percentiles, errors: groupedErrors }; +}; + export const FunctionChart: React.FC = ({ fn, chartSettings, @@ -78,8 +153,14 @@ export const FunctionChart: React.FC = ({ } const signalListeners = { mousemove: handleHover, mouseout: handleOut }; let mouseItem: result = !!mouseOverlay - ? runForeign(fn, [mouseOverlay], { sampleCount: 10000, xyPointLength: 1000 }) - : { tag: "Error", value: { tag: "REExpectedType", value: "Expected float, got NaN" } }; + ? runForeign(fn, [mouseOverlay], { + sampleCount: 10000, + xyPointLength: 1000, + }) + : { + tag: "Error", + value: { tag: "REExpectedType", value: "Expected float, got NaN" }, + }; let showChart = mouseItem.tag === "Ok" && mouseItem.value.tag == "distribution" ? ( = ({ ) : ( <> ); - let data1 = _rangeByCount( - chartSettings.start, - chartSettings.stop, - chartSettings.count - ); - type point = { x: number; value: result }; - let getPercentiles: () => percentiles = () => { - let valueData:any = data1.map((x) => { + let getPercentiles2: () => { + percentiles: percentiles; + errors: errors; + } = () => { + let data1 = _rangeByCount( + chartSettings.start, + chartSettings.stop, + chartSettings.count + ); + let valueData: point[] = data1.map((x) => { let result = runForeign(fn, [x], environment); if (result.tag === "Ok") { if (result.value.tag == "distribution") { @@ -133,8 +216,11 @@ export const FunctionChart: React.FC = ({ } return acc; }, initialPartition); - - let percentiles:percentiles = functionImage.map(({ x, value }) => { + let groupedErrors: errors = _.groupBy(errors, (x) => x.value); + let percentiles: percentiles = functionImage.map(({ x, value }) => { + // We convert it to to a pointSet distribution first, so that in case its a sample set + // distribution, it doesn't internally convert it to a pointSet distribution for every + // single inv() call. let toPointSet: Distribution = unwrap(value.toPointSet()); return { x: x, @@ -153,19 +239,31 @@ export const FunctionChart: React.FC = ({ p99: unwrap(toPointSet.inv(0.99)), }; }); - return percentiles; + return { percentiles, errors: groupedErrors }; }; - let _getPercentiles = React.useMemo(getPercentiles, [environment, fn]) + let _getPercentiles = React.useMemo(getPercentiles2, [environment, fn]); return ( <> {showChart} + {_.entries(_getPercentiles.errors).map(([errorName, errorPoints]) => ( + + Values:{" "} + {errorPoints + .map((r, i) => ) + .reduce((a, b) => ( + <> + {a}, {b} + + ))} + + ))} ); }; diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index b3b71e68..f3f1d9c6 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -10,7 +10,6 @@ import { jsImports, defaultImports, defaultBindings, - defaultEnvironment, } from "@quri/squiggle-lang"; import { NumberShower } from "./NumberShower"; import { DistributionChart } from "./DistributionChart"; @@ -194,7 +193,7 @@ const SquiggleItem: React.FC = ({ ); } @@ -233,6 +232,8 @@ const ChartWrapper = styled.div` `; let defaultChartSettings = { start: 0, stop: 10, count: 20 }; +let defaultEnvironment = { sampleCount: 10000, xyPointLength: 1000 }; + export const SquiggleChart: React.FC = ({ squiggleString = "", environment, @@ -247,7 +248,7 @@ export const SquiggleChart: React.FC = ({ chartSettings = defaultChartSettings, }: SquiggleChartProps) => { let expressionResult = run(squiggleString, bindings, environment, jsImports); - let e = environment ? environment : { sampleCount: 100000, xyPointLength: 1000 }; + let e = environment ? environment : defaultEnvironment; let internal: JSX.Element; if (expressionResult.tag === "Ok") { let expression = expressionResult.value; From 56728c7ea5bc8aed9fc25482b19764676cdffade Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 15:23:58 -0400 Subject: [PATCH 110/340] Removed unneeded code --- .../src/components/FunctionChart.tsx | 74 +------------------ 1 file changed, 4 insertions(+), 70 deletions(-) diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index 32919d67..10f97b7d 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -173,76 +173,10 @@ export const FunctionChart: React.FC = ({ <> ); - let getPercentiles2: () => { - percentiles: percentiles; - errors: errors; - } = () => { - let data1 = _rangeByCount( - chartSettings.start, - chartSettings.stop, - chartSettings.count - ); - let valueData: point[] = data1.map((x) => { - let result = runForeign(fn, [x], environment); - if (result.tag === "Ok") { - if (result.value.tag == "distribution") { - return { x, value: { tag: "Ok", value: result.value.value } }; - } else { - return { - x, - value: { - tag: "Error", - value: - "Cannot currently render functions that don't return distributions", - }, - }; - } - } else { - return { - x, - value: { tag: "Error", value: errorValueToString(result.value) }, - }; - } - }); - let initialPartition: [ - { x: number; value: Distribution }[], - { x: number; value: string }[] - ] = [[], []]; - let [functionImage, errors] = valueData.reduce((acc, current) => { - if (current.value.tag === "Ok") { - acc[0].push({ x: current.x, value: current.value.value }); - } else { - acc[1].push({ x: current.x, value: current.value.value }); - } - return acc; - }, initialPartition); - let groupedErrors: errors = _.groupBy(errors, (x) => x.value); - let percentiles: percentiles = functionImage.map(({ x, value }) => { - // We convert it to to a pointSet distribution first, so that in case its a sample set - // distribution, it doesn't internally convert it to a pointSet distribution for every - // single inv() call. - let toPointSet: Distribution = unwrap(value.toPointSet()); - return { - x: x, - p1: unwrap(toPointSet.inv(0.01)), - p5: unwrap(toPointSet.inv(0.05)), - p10: unwrap(toPointSet.inv(0.12)), - p20: unwrap(toPointSet.inv(0.2)), - p30: unwrap(toPointSet.inv(0.3)), - p40: unwrap(toPointSet.inv(0.4)), - p50: unwrap(toPointSet.inv(0.5)), - p60: unwrap(toPointSet.inv(0.6)), - p70: unwrap(toPointSet.inv(0.7)), - p80: unwrap(toPointSet.inv(0.8)), - p90: unwrap(toPointSet.inv(0.9)), - p95: unwrap(toPointSet.inv(0.95)), - p99: unwrap(toPointSet.inv(0.99)), - }; - }); - return { percentiles, errors: groupedErrors }; - }; - - let _getPercentiles = React.useMemo(getPercentiles2, [environment, fn]); + let _getPercentiles = React.useMemo( + () => getPercentiles({ chartSettings, fn, environment }), + [environment, fn] + ); return ( <> From b63136080be2ebf0e8097b8bad19eb28e7d15153 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 15:29:54 -0400 Subject: [PATCH 111/340] Formatting --- packages/components/src/components/SquiggleChart.tsx | 5 ++++- packages/components/src/stories/SquiggleChart.stories.mdx | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index f3f1d9c6..eb6214e2 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -193,7 +193,10 @@ const SquiggleItem: React.FC = ({ ); } diff --git a/packages/components/src/stories/SquiggleChart.stories.mdx b/packages/components/src/stories/SquiggleChart.stories.mdx index 9b4d3c83..9ad98ef0 100644 --- a/packages/components/src/stories/SquiggleChart.stories.mdx +++ b/packages/components/src/stories/SquiggleChart.stories.mdx @@ -154,6 +154,7 @@ to allow large and small numbers being printed cleanly. ## Functions + Date: Sun, 15 May 2022 15:58:37 -0400 Subject: [PATCH 112/340] Responded to CR --- .../src/components/FunctionChart.tsx | 54 +++++++++++-------- .../src/components/SquiggleChart.tsx | 2 +- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index 10f97b7d..242bf719 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -74,12 +74,13 @@ type errors = _.Dictionary< type point = { x: number; value: result }; let getPercentiles = ({ chartSettings, fn, environment }) => { - let data1 = _rangeByCount( + let chartPointsToRender = _rangeByCount( chartSettings.start, chartSettings.stop, chartSettings.count ); - let valueData: point[] = data1.map((x) => { + + let chartPointsData: point[] = chartPointsToRender.map((x) => { let result = runForeign(fn, [x], environment); if (result.tag === "Ok") { if (result.value.tag == "distribution") { @@ -101,11 +102,13 @@ let getPercentiles = ({ chartSettings, fn, environment }) => { }; } }); + let initialPartition: [ { x: number; value: Distribution }[], { x: number; value: string }[] ] = [[], []]; - let [functionImage, errors] = valueData.reduce((acc, current) => { + + let [functionImage, errors] = chartPointsData.reduce((acc, current) => { if (current.value.tag === "Ok") { acc[0].push({ x: current.x, value: current.value.value }); } else { @@ -113,7 +116,9 @@ let getPercentiles = ({ chartSettings, fn, environment }) => { } return acc; }, initialPartition); + let groupedErrors: errors = _.groupBy(errors, (x) => x.value); + let percentiles: percentiles = functionImage.map(({ x, value }) => { // We convert it to to a pointSet distribution first, so that in case its a sample set // distribution, it doesn't internally convert it to a pointSet distribution for every @@ -123,7 +128,7 @@ let getPercentiles = ({ chartSettings, fn, environment }) => { x: x, p1: unwrap(toPointSet.inv(0.01)), p5: unwrap(toPointSet.inv(0.05)), - p10: unwrap(toPointSet.inv(0.12)), + p10: unwrap(toPointSet.inv(0.1)), p20: unwrap(toPointSet.inv(0.2)), p30: unwrap(toPointSet.inv(0.3)), p40: unwrap(toPointSet.inv(0.4)), @@ -136,6 +141,7 @@ let getPercentiles = ({ chartSettings, fn, environment }) => { p99: unwrap(toPointSet.inv(0.99)), }; }); + return { percentiles, errors: groupedErrors }; }; @@ -153,13 +159,13 @@ export const FunctionChart: React.FC = ({ } const signalListeners = { mousemove: handleHover, mouseout: handleOut }; let mouseItem: result = !!mouseOverlay - ? runForeign(fn, [mouseOverlay], { - sampleCount: 10000, - xyPointLength: 1000, - }) + ? runForeign(fn, [mouseOverlay], environment) : { tag: "Error", - value: { tag: "REExpectedType", value: "Expected float, got NaN" }, + value: { + tag: "REExpectedType", + value: "Hover x-coordinate returned NaN. Expected a number.", + }, }; let showChart = mouseItem.tag === "Ok" && mouseItem.value.tag == "distribution" ? ( @@ -173,7 +179,7 @@ export const FunctionChart: React.FC = ({ <> ); - let _getPercentiles = React.useMemo( + let getPercentilesMemoized = React.useMemo( () => getPercentiles({ chartSettings, fn, environment }), [environment, fn] ); @@ -181,23 +187,25 @@ export const FunctionChart: React.FC = ({ return ( <> {showChart} - {_.entries(_getPercentiles.errors).map(([errorName, errorPoints]) => ( - - Values:{" "} - {errorPoints - .map((r, i) => ) - .reduce((a, b) => ( - <> - {a}, {b} - - ))} - - ))} + {_.entries(getPercentilesMemoized.errors).map( + ([errorName, errorPoints]) => ( + + Values:{" "} + {errorPoints + .map((r, i) => ) + .reduce((a, b) => ( + <> + {a}, {b} + + ))} + + ) + )} ); }; diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index eb6214e2..ce562368 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -10,6 +10,7 @@ import { jsImports, defaultImports, defaultBindings, + defaultEnvironment, } from "@quri/squiggle-lang"; import { NumberShower } from "./NumberShower"; import { DistributionChart } from "./DistributionChart"; @@ -235,7 +236,6 @@ const ChartWrapper = styled.div` `; let defaultChartSettings = { start: 0, stop: 10, count: 20 }; -let defaultEnvironment = { sampleCount: 10000, xyPointLength: 1000 }; export const SquiggleChart: React.FC = ({ squiggleString = "", From 15965b0b054bcd58182f08cd74401a7433a420b4 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 17:24:54 -0400 Subject: [PATCH 113/340] First simple version of samplesMap --- .../Distributions/SampleSetDist/SampleSetDist.res | 11 +++++++++++ .../Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res | 15 +++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res index 55b334c5..5426fd5e 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res @@ -83,6 +83,17 @@ let sampleN = (t: t, n) => { } } +let samplesMap = (~fn: (float) => result, t: t): result< + t, + Operation.Error.t, +> => { + let samples = T.get(t)->E.A2.fmap(fn) + + E.A.R.firstErrorOrOpen(samples)->E.R2.fmap(x => + E.R.toExn("Input of samples should be larger than 5", make(x)) + ) +} + //TODO: Figure out what to do if distributions are different lengths. ``zip`` is kind of inelegant for this. let map2 = (~fn: (float, float) => result, ~t1: t, ~t2: t): result< t, diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res index d1a77040..b1deac6d 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res @@ -99,6 +99,19 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce rMappedList->Result.map(mappedList => mappedList->Belt.List.toArray->EvArray) } + let doMapSampleSetDist = (sampleSetDist: SampleSetDist.t, aLambdaValue) => { + let fn = r => + switch Lambda.doLambdaCall(aLambdaValue, list{EvNumber(r)}, environment, reducer) { + | Ok(EvNumber(f)) => Ok(f) + | _ => Error(Operation.NotYetImplemented) + } + let newDist = SampleSetDist.samplesMap(~fn, sampleSetDist) + switch newDist { + | Ok(r) => Ok(EvDistribution(SampleSet(r))) + | Error(r) => Error(RETodo("")) + } + } + let doReduceArray = (aValueArray, initialValue, aLambdaValue) => { aValueArray->Belt.Array.reduce(Ok(initialValue), (rAcc, elem) => rAcc->Result.flatMap(acc => @@ -128,6 +141,8 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce | ("keep", [EvArray(aValueArray), EvLambda(aLambdaValue)]) => doKeepArray(aValueArray, aLambdaValue) | ("map", [EvArray(aValueArray), EvLambda(aLambdaValue)]) => doMapArray(aValueArray, aLambdaValue) + | ("mapSamples", [EvDistribution(SampleSet(dist)), EvLambda(aLambdaValue)]) => + doMapSampleSetDist(dist, aLambdaValue) | ("reduce", [EvArray(aValueArray), initialValue, EvLambda(aLambdaValue)]) => doReduceArray(aValueArray, initialValue, aLambdaValue) | ("reduceReverse", [EvArray(aValueArray), initialValue, EvLambda(aLambdaValue)]) => From 7216f8079f5a0154f2a29a387b254a1612409495 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 18:27:25 -0400 Subject: [PATCH 114/340] First attempt at adding bernoulli --- packages/squiggle-lang/package.json | 11 +- .../SymbolicDist/SymbolicDist.res | 29 ++ .../SymbolicDist/SymbolicDistTypes.res | 3 + .../ReducerInterface_GenericDistribution.res | 3 +- .../src/rescript/Utility/Stdlib.res | 14 + .../src/rescript/Utility/stdlib.ts | 4 + yarn.lock | 335 +++++++++++++++++- 7 files changed, 390 insertions(+), 9 deletions(-) create mode 100644 packages/squiggle-lang/src/rescript/Utility/Stdlib.res create mode 100644 packages/squiggle-lang/src/rescript/Utility/stdlib.ts diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index c1705471..579a5f31 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -34,27 +34,28 @@ ], "author": "Quantified Uncertainty Research Institute", "dependencies": { - "rescript": "^9.1.4", + "@stdlib/stats": "^0.0.13", "jstat": "^1.9.5", + "mathjs": "^10.5.2", "pdfast": "^0.2.0", - "mathjs": "^10.5.2" + "rescript": "^9.1.4" }, "devDependencies": { - "bisect_ppx": "^2.7.1", - "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.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": "^2.25.0", "gentype": "^4.3.0", "jest": "^27.5.1", + "lodash": "^4.17.21", "moduleserve": "^0.9.1", "nyc": "^15.1.0", "reanalyze": "^2.19.0", + "rescript-fast-check": "^1.1.1", "ts-jest": "^27.1.4", "ts-loader": "^9.3.0", "ts-node": "^10.7.0", diff --git a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res index c925e39e..6c57430c 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res @@ -216,6 +216,25 @@ module Uniform = { } } +module Bernoulli = { + type t = bernoulli + let make = p => + p >= 0.0 && p <= 1.0 + ? Ok(#Bernoulli({p: p})) + : Error("Beta distribution parameters must be positive") + let pmf = (x, t: t) => Stdlib.Bernoulli.pmf(x, t.p) + let pdf = (x, t: t) => Stdlib.Bernoulli.pmf(x, t.p) + let cdf = (x, t: t) => Stdlib.Bernoulli.cdf(x, t.p) + let inv = (p, t: t) => Stdlib.Bernoulli.quantile(p, t.p) + let mean = (t: t) => Ok(Stdlib.Bernoulli.mean(t.p)) + let sample = (t: t) => { + let s = Uniform.sample(({low: 0.0, high: 1.0})); + inv(s,t) + } + let toString = ({p}: t) => j`Bernoulli($p)` +} + + module Gamma = { type t = gamma let make = (shape: float, scale: float) => { @@ -278,6 +297,7 @@ module T = { | #Uniform(n) => Uniform.pdf(x, n) | #Beta(n) => Beta.pdf(x, n) | #Float(n) => Float.pdf(x, n) + | #Bernoulli(n) => Bernoulli.pdf(x, n) } let cdf = (x, dist) => @@ -291,6 +311,7 @@ module T = { | #Uniform(n) => Uniform.cdf(x, n) | #Beta(n) => Beta.cdf(x, n) | #Float(n) => Float.cdf(x, n) + | #Bernoulli(n) => Bernoulli.cdf(x, n) } let inv = (x, dist) => @@ -304,6 +325,7 @@ module T = { | #Uniform(n) => Uniform.inv(x, n) | #Beta(n) => Beta.inv(x, n) | #Float(n) => Float.inv(x, n) + | #Bernoulli(n) => Bernoulli.inv(x, n) } let sample: symbolicDist => float = x => @@ -317,6 +339,7 @@ module T = { | #Uniform(n) => Uniform.sample(n) | #Beta(n) => Beta.sample(n) | #Float(n) => Float.sample(n) + | #Bernoulli(n) => Bernoulli.sample(n) } let doN = (n, fn) => { @@ -340,6 +363,7 @@ module T = { | #Uniform(n) => Uniform.toString(n) | #Beta(n) => Beta.toString(n) | #Float(n) => Float.toString(n) + | #Bernoulli(n) => Bernoulli.toString(n) } let min: symbolicDist => float = x => @@ -351,6 +375,7 @@ module T = { | #Lognormal(n) => Lognormal.inv(minCdfValue, n) | #Gamma(n) => Gamma.inv(minCdfValue, n) | #Uniform({low}) => low + | #Bernoulli(n) => 0.0 | #Beta(n) => Beta.inv(minCdfValue, n) | #Float(n) => n } @@ -364,6 +389,7 @@ module T = { | #Gamma(n) => Gamma.inv(maxCdfValue, n) | #Lognormal(n) => Lognormal.inv(maxCdfValue, n) | #Beta(n) => Beta.inv(maxCdfValue, n) + | #Bernoulli(n) => 1.0 | #Uniform({high}) => high | #Float(n) => n } @@ -379,6 +405,7 @@ module T = { | #Uniform(n) => Uniform.mean(n) | #Gamma(n) => Gamma.mean(n) | #Float(n) => Float.mean(n) + | #Bernoulli(n) => Bernoulli.mean(n) } let operate = (distToFloatOp: Operation.distToFloatOperation, s) => @@ -454,6 +481,8 @@ module T = { ): PointSetTypes.pointSetDist => switch d { | #Float(v) => Discrete(Discrete.make(~integralSumCache=Some(1.0), {xs: [v], ys: [1.0]})) + | #Bernoulli(v) => + Discrete(Discrete.make(~integralSumCache=Some(1.0), {xs: [0.0, 1.0], ys: [1.0 -. v.p, v.p]})) | _ => let xs = interpolateXs(~xSelection, d, sampleCount) let ys = xs |> E.A.fmap(x => pdf(x, d)) diff --git a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDistTypes.res b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDistTypes.res index 7878a3bc..e888fbd2 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDistTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDistTypes.res @@ -36,6 +36,8 @@ type gamma = { scale: float, } +type bernoulli = {p: float} + @genType type symbolicDist = [ | #Normal(normal) @@ -47,6 +49,7 @@ type symbolicDist = [ | #Triangular(triangular) | #Gamma(gamma) | #Float(float) + | #Bernoulli(bernoulli) ] type analyticalSimplificationResult = [ diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index f36c21bf..8dffecb4 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -168,6 +168,7 @@ module SymbolicConstructors = { let oneFloat = name => switch name { | "exponential" => Ok(SymbolicDist.Exponential.make) + | "bernoulli" => Ok(SymbolicDist.Bernoulli.make) | _ => Error("Unreachable state") } @@ -204,7 +205,7 @@ let dispatchToGenericOutput = ( ): option => { let (fnName, args) = call switch (fnName, args) { - | ("exponential" as fnName, [EvNumber(f)]) => + | (("exponential" | "bernoulli") as fnName, [EvNumber(f)]) => SymbolicConstructors.oneFloat(fnName) ->E.R.bind(r => r(f)) ->SymbolicConstructors.symbolicResultToOutput diff --git a/packages/squiggle-lang/src/rescript/Utility/Stdlib.res b/packages/squiggle-lang/src/rescript/Utility/Stdlib.res new file mode 100644 index 00000000..e208173e --- /dev/null +++ b/packages/squiggle-lang/src/rescript/Utility/Stdlib.res @@ -0,0 +1,14 @@ +module Bernoulli = { + +@module external cdf: (float, float) => float = "@stdlib/stats/base/dists/bernoulli/cdf" +let cdf = cdf + +@module external pmf: (float, float) => float = "@stdlib/stats/base/dists/bernoulli/pmf" +let pmf = pmf + +@module external quantile: (float, float) => float = "@stdlib/stats/base/dists/bernoulli/quantile" +let quantile = quantile + +@module external mean: (float) => float = "@stdlib/stats/base/dists/bernoulli/mean" +let mean = mean +} \ No newline at end of file diff --git a/packages/squiggle-lang/src/rescript/Utility/stdlib.ts b/packages/squiggle-lang/src/rescript/Utility/stdlib.ts new file mode 100644 index 00000000..5d106084 --- /dev/null +++ b/packages/squiggle-lang/src/rescript/Utility/stdlib.ts @@ -0,0 +1,4 @@ +var Bernoulli = require("@stdlib/stats/base/dists/bernoulli").Bernoulli; + +let bernoulliCdf = (p: number, x: number): number => new Bernoulli(p).cdf(x); +let bernoulliPmf = (p: number, x: number): number => new Bernoulli(p).cmf(x); diff --git a/yarn.lock b/yarn.lock index 81c8c21f..c30a22ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2502,6 +2502,335 @@ eval "^0.1.8" webpack-sources "^1.4.3" +"@stdlib/array@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/array/-/array-0.0.12.tgz#12f40ab95bb36d424cdad991f29fc3cb491ee29e" + integrity sha512-nDksiuvRC1dSTHrf5yOGQmlRwAzSKV8MdFQwFSvLbZGGhi5Y4hExqea5HloLgNVouVs8lnAFi2oubSM4Mc7YAg== + dependencies: + "@stdlib/assert" "^0.0.x" + "@stdlib/blas" "^0.0.x" + "@stdlib/complex" "^0.0.x" + "@stdlib/constants" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/symbol" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/assert@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/assert/-/assert-0.0.12.tgz#1648c9016e5041291f55a6464abcc4069c5103ce" + integrity sha512-38FxFf+ZoQZbdc+m09UsWtaCmzd/2e7im0JOaaFYE7icmRfm+4KiE9BRvBT4tIn7ioLB2f9PsBicKjIsf+tY1w== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/cli" "^0.0.x" + "@stdlib/complex" "^0.0.x" + "@stdlib/constants" "^0.0.x" + "@stdlib/fs" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/ndarray" "^0.0.x" + "@stdlib/number" "^0.0.x" + "@stdlib/os" "^0.0.x" + "@stdlib/process" "^0.0.x" + "@stdlib/regexp" "^0.0.x" + "@stdlib/streams" "^0.0.x" + "@stdlib/string" "^0.0.x" + "@stdlib/symbol" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/bigint@^0.0.x": + version "0.0.11" + resolved "https://registry.yarnpkg.com/@stdlib/bigint/-/bigint-0.0.11.tgz#c416a1d727001c55f4897e6424124199d638f2fd" + integrity sha512-uz0aYDLABAYyqxaCSHYbUt0yPkXYUCR7TrVvHN+UUD3i8FZ02ZKcLO+faKisDyxKEoSFTNtn3Ro8Ir5ebOlVXQ== + dependencies: + "@stdlib/utils" "^0.0.x" + +"@stdlib/blas@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/blas/-/blas-0.0.12.tgz#7e93e42b4621fc6903bf63264f045047333536c2" + integrity sha512-nWY749bWceuoWQ7gz977blCwR7lyQ/rsIXVO4b600h+NFpeA2i/ea7MYC680utIbeu2cnDWHdglBPoK535VAzA== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/assert" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/number" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/buffer@^0.0.x": + version "0.0.11" + resolved "https://registry.yarnpkg.com/@stdlib/buffer/-/buffer-0.0.11.tgz#6137b00845e6c905181cc7ebfae9f7e47c01b0ce" + integrity sha512-Jeie5eDDa1tVuRcuU+cBXI/oOXSmMxUUccZpqXzgYe0IO8QSNtNxv9mUTzJk/m5wH+lmLoDvNxzPpOH9TODjJg== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/assert" "^0.0.x" + "@stdlib/process" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/cli@^0.0.x": + version "0.0.10" + resolved "https://registry.yarnpkg.com/@stdlib/cli/-/cli-0.0.10.tgz#28e2fbe6865d7f5cd15b7dc5846c99bd3b91674f" + integrity sha512-OITGaxG46kwK799+NuOd/+ccosJ9koVuQBC610DDJv0ZJf8mD7sbjGXrmue9C4EOh8MP7Vm/6HN14BojX8oTCg== + dependencies: + "@stdlib/utils" "^0.0.x" + minimist "^1.2.0" + +"@stdlib/complex@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/complex/-/complex-0.0.12.tgz#3afbc190cd0a9b37fc7c6e508c3aa9fda9106944" + integrity sha512-UbZBdaUxT2G+lsTIrVlRZwx2IRY6GXnVILggeejsIVxHSuK+oTyapfetcAv0FJFLP+Rrr+ZzrN4b9G3hBw6NHA== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/assert" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/constants@^0.0.x": + version "0.0.11" + resolved "https://registry.yarnpkg.com/@stdlib/constants/-/constants-0.0.11.tgz#78cd56d6c2982b30264843c3d75bde7125e90cd2" + integrity sha512-cWKy0L9hXHUQTvFzdPkTvZnn/5Pjv7H4UwY0WC1rLt+A5CxFDJKjvnIi9ypSzJS3CAiGl1ZaHCdadoqXhNdkUg== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/assert" "^0.0.x" + "@stdlib/number" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/fs@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/fs/-/fs-0.0.12.tgz#662365fd5846a51f075724b4f2888ae88441b70d" + integrity sha512-zcDLbt39EEM3M3wJW6luChS53B8T+TMJkjs2526UpKJ71O0/0adR57cI7PfCpkMd33d05uM7GM+leEj4eks4Cw== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/assert" "^0.0.x" + "@stdlib/cli" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/process" "^0.0.x" + "@stdlib/string" "^0.0.x" + "@stdlib/utils" "^0.0.x" + debug "^2.6.9" + +"@stdlib/math@^0.0.x": + version "0.0.11" + resolved "https://registry.yarnpkg.com/@stdlib/math/-/math-0.0.11.tgz#eb6638bc03a20fbd6727dd5b977ee0170bda4649" + integrity sha512-qI78sR1QqGjHj8k/aAqkZ51Su2fyBvaR/jMKQqcB/ML8bpYpf+QGlGvTty5Qdru/wpqds4kVFOVbWGcNFIV2+Q== + dependencies: + "@stdlib/assert" "^0.0.x" + "@stdlib/constants" "^0.0.x" + "@stdlib/ndarray" "^0.0.x" + "@stdlib/number" "^0.0.x" + "@stdlib/strided" "^0.0.x" + "@stdlib/symbol" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + debug "^2.6.9" + +"@stdlib/ndarray@^0.0.x": + version "0.0.13" + resolved "https://registry.yarnpkg.com/@stdlib/ndarray/-/ndarray-0.0.13.tgz#2e8fc645e10f56a645a0ab81598808c0e8f43b82" + integrity sha512-Z+U9KJP4U2HWrLtuAXSPvhNetAdqaNLMcliR6S/fz+VPlFDeymRK7omRFMgVQ+1zcAvIgKZGJxpLC3vjiPUYEw== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/assert" "^0.0.x" + "@stdlib/bigint" "^0.0.x" + "@stdlib/buffer" "^0.0.x" + "@stdlib/complex" "^0.0.x" + "@stdlib/constants" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/number" "^0.0.x" + "@stdlib/string" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/nlp@^0.0.x": + version "0.0.11" + resolved "https://registry.yarnpkg.com/@stdlib/nlp/-/nlp-0.0.11.tgz#532ec0f7267b8d639e4c20c6de864e8de8a09054" + integrity sha512-D9avYWANm0Db2W7RpzdSdi5GxRYALGAqUrNnRnnKIO6sMEfr/DvONoAbWruda4QyvSC+0MJNwcEn7+PHhRwYhw== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/assert" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/random" "^0.0.x" + "@stdlib/string" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/number@^0.0.x": + version "0.0.10" + resolved "https://registry.yarnpkg.com/@stdlib/number/-/number-0.0.10.tgz#4030ad8fc3fac19a9afb415c443cee6deea0e65c" + integrity sha512-RyfoP9MlnX4kccvg8qv7vYQPbLdzfS1Mnp/prGOoWhvMG3pyBwFAan34kwFb5IS/zHC3W5EmrgXCV2QWyLg/Kg== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/assert" "^0.0.x" + "@stdlib/constants" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/os" "^0.0.x" + "@stdlib/string" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/os@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/os/-/os-0.0.12.tgz#08bbf013c62a7153099fa9cbac086ca1349a4677" + integrity sha512-O7lklZ/9XEzoCmYvzjPh7jrFWkbpOSHGI71ve3dkSvBy5tyiSL3TtivfKsIC+9ZxuEJZ3d3lIjc9e+yz4HVbqQ== + dependencies: + "@stdlib/assert" "^0.0.x" + "@stdlib/cli" "^0.0.x" + "@stdlib/fs" "^0.0.x" + "@stdlib/process" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/process@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/process/-/process-0.0.12.tgz#123325079d89a32f4212f72fb694f8fe3614cf18" + integrity sha512-P0X0TMvkissBE1Wr877Avi2/AxmP7X5Toa6GatHbpJdDg6jQmN4SgPd+NZNp98YtZUyk478c8XSIzMr1krQ20g== + dependencies: + "@stdlib/assert" "^0.0.x" + "@stdlib/buffer" "^0.0.x" + "@stdlib/cli" "^0.0.x" + "@stdlib/fs" "^0.0.x" + "@stdlib/streams" "^0.0.x" + "@stdlib/string" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/random@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/random/-/random-0.0.12.tgz#e819c3abd602ed5559ba800dba751e49c633ff85" + integrity sha512-c5yND4Ahnm9Jx0I+jsKhn4Yrz10D53ALSrIe3PG1qIz3kNFcIPnmvCuNGd+3V4ch4Mbrez55Y8z/ZC5RJh4vJQ== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/assert" "^0.0.x" + "@stdlib/blas" "^0.0.x" + "@stdlib/buffer" "^0.0.x" + "@stdlib/cli" "^0.0.x" + "@stdlib/constants" "^0.0.x" + "@stdlib/fs" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/process" "^0.0.x" + "@stdlib/stats" "^0.0.x" + "@stdlib/streams" "^0.0.x" + "@stdlib/symbol" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + debug "^2.6.9" + readable-stream "^2.1.4" + +"@stdlib/regexp@^0.0.x": + version "0.0.13" + resolved "https://registry.yarnpkg.com/@stdlib/regexp/-/regexp-0.0.13.tgz#80b98361dc7a441b47bc3fa964bb0c826759e971" + integrity sha512-3JT5ZIoq/1nXY+dY+QtkU8/m7oWDeekyItEEXMx9c/AOf0ph8fmvTUGMDNfUq0RetcznFe3b66kFz6Zt4XHviA== + dependencies: + "@stdlib/assert" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/stats@^0.0.13", "@stdlib/stats@^0.0.x": + version "0.0.13" + resolved "https://registry.yarnpkg.com/@stdlib/stats/-/stats-0.0.13.tgz#87c973f385379d794707c7b5196a173dba8b07e1" + integrity sha512-hm+t32dKbx/L7+7WlQ1o4NDEzV0J4QSnwFBCsIMIAO8+VPxTZ4FxyNERl4oKlS3hZZe4AVKjoOVhBDtgEWrS4g== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/assert" "^0.0.x" + "@stdlib/blas" "^0.0.x" + "@stdlib/constants" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/ndarray" "^0.0.x" + "@stdlib/random" "^0.0.x" + "@stdlib/string" "^0.0.x" + "@stdlib/symbol" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/streams@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/streams/-/streams-0.0.12.tgz#07f5ceae5852590afad8e1cb7ce94174becc8739" + integrity sha512-YLUlXwjJNknHp92IkJUdvn5jEQjDckpawKhDLLCoxyh3h5V+w/8+61SH7TMTfKx5lBxKJ8vvtchZh90mIJOAjQ== + dependencies: + "@stdlib/assert" "^0.0.x" + "@stdlib/buffer" "^0.0.x" + "@stdlib/cli" "^0.0.x" + "@stdlib/fs" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + debug "^2.6.9" + readable-stream "^2.1.4" + +"@stdlib/strided@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/strided/-/strided-0.0.12.tgz#86ac48e660cb7f64a45cf07e80cbbfe58be21ae1" + integrity sha512-1NINP+Y7IJht34iri/bYLY7TVxrip51f6Z3qWxGHUCH33kvk5H5QqV+RsmFEGbbyoGtdeHrT2O+xA+7R2e3SNg== + dependencies: + "@stdlib/assert" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/ndarray" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/string@^0.0.x": + version "0.0.13" + resolved "https://registry.yarnpkg.com/@stdlib/string/-/string-0.0.13.tgz#37457ca49e8d1dff0e523c68f5673c655c79eb2d" + integrity sha512-nGMHi7Qk9LBW0+Y+e3pSePQEBqyWH7+7DjFR1APcbsYccJE0p4aCaQdhPhx9Tp7j3uRGBmqPFek8wpcvIuC+CQ== + dependencies: + "@stdlib/assert" "^0.0.x" + "@stdlib/cli" "^0.0.x" + "@stdlib/constants" "^0.0.x" + "@stdlib/fs" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/nlp" "^0.0.x" + "@stdlib/process" "^0.0.x" + "@stdlib/regexp" "^0.0.x" + "@stdlib/streams" "^0.0.x" + "@stdlib/types" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/symbol@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/symbol/-/symbol-0.0.12.tgz#b9f396b0bf269c2985bb7fe99810a8e26d7288c3" + integrity sha512-2IDhpzWVGeLHgsvIsX12RXvf78r7xBkc4QLoRUv3k7Cp61BisR1Ym1p0Tq9PbxT8fknlvLToh9n5RpmESi2d4w== + dependencies: + "@stdlib/assert" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/time@^0.0.x": + version "0.0.14" + resolved "https://registry.yarnpkg.com/@stdlib/time/-/time-0.0.14.tgz#ea6daa438b1d3b019b99f5091117ee4bcef55d60" + integrity sha512-1gMFCQTabMVIgww+k4g8HHHIhyy1tIlvwT8mC0BHW7Q7TzDAgobwL0bvor+lwvCb5LlDAvNQEpaRgVT99QWGeQ== + dependencies: + "@stdlib/assert" "^0.0.x" + "@stdlib/cli" "^0.0.x" + "@stdlib/constants" "^0.0.x" + "@stdlib/fs" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/string" "^0.0.x" + "@stdlib/utils" "^0.0.x" + +"@stdlib/types@^0.0.x": + version "0.0.14" + resolved "https://registry.yarnpkg.com/@stdlib/types/-/types-0.0.14.tgz#02d3aab7a9bfaeb86e34ab749772ea22f7b2f7e0" + integrity sha512-AP3EI9/il/xkwUazcoY+SbjtxHRrheXgSbWZdEGD+rWpEgj6n2i63hp6hTOpAB5NipE0tJwinQlDGOuQ1lCaCw== + +"@stdlib/utils@^0.0.x": + version "0.0.12" + resolved "https://registry.yarnpkg.com/@stdlib/utils/-/utils-0.0.12.tgz#670de5a7b253f04f11a4cba38f790e82393bcb46" + integrity sha512-+JhFpl6l7RSq/xGnbWRQ5dAL90h9ONj8MViqlb7teBZFtePZLMwoRA1wssypFcJ8SFMRWQn7lPmpYVUkGwRSOg== + dependencies: + "@stdlib/array" "^0.0.x" + "@stdlib/assert" "^0.0.x" + "@stdlib/blas" "^0.0.x" + "@stdlib/buffer" "^0.0.x" + "@stdlib/cli" "^0.0.x" + "@stdlib/constants" "^0.0.x" + "@stdlib/fs" "^0.0.x" + "@stdlib/math" "^0.0.x" + "@stdlib/os" "^0.0.x" + "@stdlib/process" "^0.0.x" + "@stdlib/random" "^0.0.x" + "@stdlib/regexp" "^0.0.x" + "@stdlib/streams" "^0.0.x" + "@stdlib/string" "^0.0.x" + "@stdlib/symbol" "^0.0.x" + "@stdlib/time" "^0.0.x" + "@stdlib/types" "^0.0.x" + debug "^2.6.9" + "@storybook/addon-actions@6.4.22", "@storybook/addon-actions@^6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.4.22.tgz#ec1b4332e76a8021dc0a1375dfd71a0760457588" @@ -4148,7 +4477,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.1", "@types/react@^18.0.9": +"@types/react@*", "@types/react@^18.0.9": version "18.0.9" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== @@ -14349,7 +14678,7 @@ react-vega@^7.5.1: prop-types "^15.8.1" vega-embed "^6.5.1" -react@^18.0.0, react@^18.1.0: +react@^18.1.0: version "18.1.0" resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890" integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ== @@ -14375,7 +14704,7 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== From 6156ae65d14f83a0d81efe4f5bda20b888ecc7de Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 19:42:10 -0400 Subject: [PATCH 115/340] Cleanup --- .../ReducerInterface_Distribution_test.res | 2 ++ .../SymbolicDist/SymbolicDist.res | 29 ++++++++++++------- .../src/rescript/Utility/stdlib.ts | 4 --- 3 files changed, 21 insertions(+), 14 deletions(-) delete mode 100644 packages/squiggle-lang/src/rescript/Utility/stdlib.ts diff --git a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res index 571a838b..253a9cc3 100644 --- a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res +++ b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res @@ -31,6 +31,8 @@ describe("eval on distribution functions", () => { testEval("mean(normal(5,2))", "Ok(5)") testEval("mean(lognormal(1,2))", "Ok(20.085536923187668)") testEval("mean(gamma(5,5))", "Ok(25)") + testEval("mean(bernoulli(0.2))", "Ok(0.2)") + testEval("mean(bernoulli(0.8))", "Ok(0.8)") }) describe("toString", () => { testEval("toString(normal(5,2))", "Ok('Normal(5,2)')") diff --git a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res index 6c57430c..6356f97c 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res @@ -221,20 +221,27 @@ module Bernoulli = { let make = p => p >= 0.0 && p <= 1.0 ? Ok(#Bernoulli({p: p})) - : Error("Beta distribution parameters must be positive") + : Error("Bernoulli parameter must be between 0 and 1") let pmf = (x, t: t) => Stdlib.Bernoulli.pmf(x, t.p) + + //Bernoulli is a discrete distribution, so it doesn't really have a pdf(). + //We fake this for now with the pmf function, but this should be fixed at some point. let pdf = (x, t: t) => Stdlib.Bernoulli.pmf(x, t.p) let cdf = (x, t: t) => Stdlib.Bernoulli.cdf(x, t.p) let inv = (p, t: t) => Stdlib.Bernoulli.quantile(p, t.p) let mean = (t: t) => Ok(Stdlib.Bernoulli.mean(t.p)) + let min = (t: t) => t.p == 1.0 ? 1.0 : 0.0 + let max = (t: t) => t.p == 0.0 ? 0.0 : 1.0 let sample = (t: t) => { - let s = Uniform.sample(({low: 0.0, high: 1.0})); - inv(s,t) + let s = Uniform.sample({low: 0.0, high: 1.0}) + inv(s, t) } let toString = ({p}: t) => j`Bernoulli($p)` + let toPointSetDist = ({p}: t): PointSetTypes.pointSetDist => Discrete( + Discrete.make(~integralSumCache=Some(1.0), {xs: [0.0, 1.0], ys: [1.0 -. p, p]}), + ) } - module Gamma = { type t = gamma let make = (shape: float, scale: float) => { @@ -271,6 +278,9 @@ module Float = { let mean = (t: t) => Ok(t) let sample = (t: t) => t let toString = (t: t) => j`Delta($t)` + let toPointSetDist = (t: t): PointSetTypes.pointSetDist => Discrete( + Discrete.make(~integralSumCache=Some(1.0), {xs: [t], ys: [1.0]}), + ) } module From90thPercentile = { @@ -375,7 +385,7 @@ module T = { | #Lognormal(n) => Lognormal.inv(minCdfValue, n) | #Gamma(n) => Gamma.inv(minCdfValue, n) | #Uniform({low}) => low - | #Bernoulli(n) => 0.0 + | #Bernoulli(n) => Bernoulli.min(n) | #Beta(n) => Beta.inv(minCdfValue, n) | #Float(n) => n } @@ -389,7 +399,7 @@ module T = { | #Gamma(n) => Gamma.inv(maxCdfValue, n) | #Lognormal(n) => Lognormal.inv(maxCdfValue, n) | #Beta(n) => Beta.inv(maxCdfValue, n) - | #Bernoulli(n) => 1.0 + | #Bernoulli(n) => Bernoulli.max(n) | #Uniform({high}) => high | #Float(n) => n } @@ -404,8 +414,8 @@ module T = { | #Beta(n) => Beta.mean(n) | #Uniform(n) => Uniform.mean(n) | #Gamma(n) => Gamma.mean(n) - | #Float(n) => Float.mean(n) | #Bernoulli(n) => Bernoulli.mean(n) + | #Float(n) => Float.mean(n) } let operate = (distToFloatOp: Operation.distToFloatOperation, s) => @@ -480,9 +490,8 @@ module T = { d: symbolicDist, ): PointSetTypes.pointSetDist => switch d { - | #Float(v) => Discrete(Discrete.make(~integralSumCache=Some(1.0), {xs: [v], ys: [1.0]})) - | #Bernoulli(v) => - Discrete(Discrete.make(~integralSumCache=Some(1.0), {xs: [0.0, 1.0], ys: [1.0 -. v.p, v.p]})) + | #Float(v) => Float.toPointSetDist(v) + | #Bernoulli(v) => Bernoulli.toPointSetDist(v) | _ => let xs = interpolateXs(~xSelection, d, sampleCount) let ys = xs |> E.A.fmap(x => pdf(x, d)) diff --git a/packages/squiggle-lang/src/rescript/Utility/stdlib.ts b/packages/squiggle-lang/src/rescript/Utility/stdlib.ts deleted file mode 100644 index 5d106084..00000000 --- a/packages/squiggle-lang/src/rescript/Utility/stdlib.ts +++ /dev/null @@ -1,4 +0,0 @@ -var Bernoulli = require("@stdlib/stats/base/dists/bernoulli").Bernoulli; - -let bernoulliCdf = (p: number, x: number): number => new Bernoulli(p).cdf(x); -let bernoulliPmf = (p: number, x: number): number => new Bernoulli(p).cmf(x); From 432e5b9bca2da03da9e76c2121c5de70b95fb91b Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 19:42:43 -0400 Subject: [PATCH 116/340] Formatted code --- .../src/rescript/Utility/Stdlib.res | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Utility/Stdlib.res b/packages/squiggle-lang/src/rescript/Utility/Stdlib.res index e208173e..3455e962 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Stdlib.res +++ b/packages/squiggle-lang/src/rescript/Utility/Stdlib.res @@ -1,14 +1,13 @@ module Bernoulli = { + @module external cdf: (float, float) => float = "@stdlib/stats/base/dists/bernoulli/cdf" + let cdf = cdf -@module external cdf: (float, float) => float = "@stdlib/stats/base/dists/bernoulli/cdf" -let cdf = cdf + @module external pmf: (float, float) => float = "@stdlib/stats/base/dists/bernoulli/pmf" + let pmf = pmf -@module external pmf: (float, float) => float = "@stdlib/stats/base/dists/bernoulli/pmf" -let pmf = pmf + @module external quantile: (float, float) => float = "@stdlib/stats/base/dists/bernoulli/quantile" + let quantile = quantile -@module external quantile: (float, float) => float = "@stdlib/stats/base/dists/bernoulli/quantile" -let quantile = quantile - -@module external mean: (float) => float = "@stdlib/stats/base/dists/bernoulli/mean" -let mean = mean -} \ No newline at end of file + @module external mean: float => float = "@stdlib/stats/base/dists/bernoulli/mean" + let mean = mean +} From b4f67f49c4e69c0e508587b3d3b7342d683bbe51 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 19:49:33 -0400 Subject: [PATCH 117/340] Updated yarn.lock --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index c30a22ff..dc874293 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4477,7 +4477,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.9": +"@types/react@*", "@types/react@^18.0.1", "@types/react@^18.0.9": version "18.0.9" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== @@ -14678,7 +14678,7 @@ react-vega@^7.5.1: prop-types "^15.8.1" vega-embed "^6.5.1" -react@^18.1.0: +react@^18.0.0, react@^18.1.0: version "18.1.0" resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890" integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ== From e0f505c8ead40914b987f5195266c3ceabbf792a Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 21:10:13 -0400 Subject: [PATCH 118/340] Add logistic distribution --- .../ReducerInterface_Distribution_test.res | 1 + .../SymbolicDist/SymbolicDist.res | 26 ++++++++++++++++++ .../SymbolicDist/SymbolicDistTypes.res | 6 +++++ .../ReducerInterface_GenericDistribution.res | 10 ++++++- .../src/rescript/Utility/Stdlib.res | 27 +++++++++++++++++++ 5 files changed, 69 insertions(+), 1 deletion(-) diff --git a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res index 253a9cc3..48bdcaa5 100644 --- a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res +++ b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res @@ -33,6 +33,7 @@ describe("eval on distribution functions", () => { testEval("mean(gamma(5,5))", "Ok(25)") testEval("mean(bernoulli(0.2))", "Ok(0.2)") testEval("mean(bernoulli(0.8))", "Ok(0.8)") + testEval("mean(logistic(5,1))", "Ok(5)") }) describe("toString", () => { testEval("toString(normal(5,2))", "Ok('Normal(5,2)')") diff --git a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res index 6356f97c..d1fcb9ef 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDist.res @@ -216,6 +216,24 @@ module Uniform = { } } +module Logistic = { + type t = logistic + let make = (location, scale) => + scale > 0.0 + ? Ok(#Logistic({location: location, scale: scale})) + : Error("Scale must be positive") + + let pdf = (x, t: t) => Stdlib.Logistic.pdf(x, t.location, t.scale) + let cdf = (x, t: t) => Stdlib.Logistic.cdf(x, t.location, t.scale) + let inv = (p, t: t) => Stdlib.Logistic.quantile(p, t.location, t.scale) + let sample = (t: t) => { + let s = Uniform.sample({low: 0.0, high: 1.0}) + inv(s, t) + } + let mean = (t: t) => Ok(Stdlib.Logistic.mean(t.location, t.scale)) + let toString = ({location, scale}: t) => j`Logistic($location,$scale)` +} + module Bernoulli = { type t = bernoulli let make = p => @@ -304,6 +322,7 @@ module T = { | #Cauchy(n) => Cauchy.pdf(x, n) | #Gamma(n) => Gamma.pdf(x, n) | #Lognormal(n) => Lognormal.pdf(x, n) + | #Logistic(n) => Logistic.pdf(x, n) | #Uniform(n) => Uniform.pdf(x, n) | #Beta(n) => Beta.pdf(x, n) | #Float(n) => Float.pdf(x, n) @@ -317,6 +336,7 @@ module T = { | #Exponential(n) => Exponential.cdf(x, n) | #Cauchy(n) => Cauchy.cdf(x, n) | #Gamma(n) => Gamma.cdf(x, n) + | #Logistic(n) => Logistic.cdf(x, n) | #Lognormal(n) => Lognormal.cdf(x, n) | #Uniform(n) => Uniform.cdf(x, n) | #Beta(n) => Beta.cdf(x, n) @@ -331,6 +351,7 @@ module T = { | #Exponential(n) => Exponential.inv(x, n) | #Cauchy(n) => Cauchy.inv(x, n) | #Gamma(n) => Gamma.inv(x, n) + | #Logistic(n) => Logistic.inv(x, n) | #Lognormal(n) => Lognormal.inv(x, n) | #Uniform(n) => Uniform.inv(x, n) | #Beta(n) => Beta.inv(x, n) @@ -345,6 +366,7 @@ module T = { | #Exponential(n) => Exponential.sample(n) | #Cauchy(n) => Cauchy.sample(n) | #Gamma(n) => Gamma.sample(n) + | #Logistic(n) => Logistic.sample(n) | #Lognormal(n) => Lognormal.sample(n) | #Uniform(n) => Uniform.sample(n) | #Beta(n) => Beta.sample(n) @@ -369,6 +391,7 @@ module T = { | #Cauchy(n) => Cauchy.toString(n) | #Normal(n) => Normal.toString(n) | #Gamma(n) => Gamma.toString(n) + | #Logistic(n) => Logistic.toString(n) | #Lognormal(n) => Lognormal.toString(n) | #Uniform(n) => Uniform.toString(n) | #Beta(n) => Beta.toString(n) @@ -383,6 +406,7 @@ module T = { | #Cauchy(n) => Cauchy.inv(minCdfValue, n) | #Normal(n) => Normal.inv(minCdfValue, n) | #Lognormal(n) => Lognormal.inv(minCdfValue, n) + | #Logistic(n) => Logistic.inv(minCdfValue, n) | #Gamma(n) => Gamma.inv(minCdfValue, n) | #Uniform({low}) => low | #Bernoulli(n) => Bernoulli.min(n) @@ -398,6 +422,7 @@ module T = { | #Normal(n) => Normal.inv(maxCdfValue, n) | #Gamma(n) => Gamma.inv(maxCdfValue, n) | #Lognormal(n) => Lognormal.inv(maxCdfValue, n) + | #Logistic(n) => Logistic.inv(maxCdfValue, n) | #Beta(n) => Beta.inv(maxCdfValue, n) | #Bernoulli(n) => Bernoulli.max(n) | #Uniform({high}) => high @@ -412,6 +437,7 @@ module T = { | #Normal(n) => Normal.mean(n) | #Lognormal(n) => Lognormal.mean(n) | #Beta(n) => Beta.mean(n) + | #Logistic(n) => Logistic.mean(n) | #Uniform(n) => Uniform.mean(n) | #Gamma(n) => Gamma.mean(n) | #Bernoulli(n) => Bernoulli.mean(n) diff --git a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDistTypes.res b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDistTypes.res index e888fbd2..8a4956c5 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDistTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SymbolicDist/SymbolicDistTypes.res @@ -36,6 +36,11 @@ type gamma = { scale: float, } +type logistic = { + location: float, + scale: float, +} + type bernoulli = {p: float} @genType @@ -50,6 +55,7 @@ type symbolicDist = [ | #Gamma(gamma) | #Float(float) | #Bernoulli(bernoulli) + | #Logistic(logistic) ] type analyticalSimplificationResult = [ diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 8dffecb4..1f1291e9 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -178,6 +178,7 @@ module SymbolicConstructors = { | "uniform" => Ok(SymbolicDist.Uniform.make) | "beta" => Ok(SymbolicDist.Beta.make) | "lognormal" => Ok(SymbolicDist.Lognormal.make) + | "logistic" => Ok(SymbolicDist.Logistic.make) | "cauchy" => Ok(SymbolicDist.Cauchy.make) | "gamma" => Ok(SymbolicDist.Gamma.make) | "to" => Ok(SymbolicDist.From90thPercentile.make) @@ -212,7 +213,14 @@ let dispatchToGenericOutput = ( | ("delta", [EvNumber(f)]) => SymbolicDist.Float.makeSafe(f)->SymbolicConstructors.symbolicResultToOutput | ( - ("normal" | "uniform" | "beta" | "lognormal" | "cauchy" | "gamma" | "to") as fnName, + ("normal" + | "uniform" + | "beta" + | "lognormal" + | "cauchy" + | "gamma" + | "to" + | "logistic") as fnName, [EvNumber(f1), EvNumber(f2)], ) => SymbolicConstructors.twoFloat(fnName) diff --git a/packages/squiggle-lang/src/rescript/Utility/Stdlib.res b/packages/squiggle-lang/src/rescript/Utility/Stdlib.res index 3455e962..faa1cb1d 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Stdlib.res +++ b/packages/squiggle-lang/src/rescript/Utility/Stdlib.res @@ -10,4 +10,31 @@ module Bernoulli = { @module external mean: float => float = "@stdlib/stats/base/dists/bernoulli/mean" let mean = mean + + @module external stdev: float => float = "@stdlib/stats/base/dists/bernoulli/stdev" + let stdev = stdev + + @module external variance: float => float = "@stdlib/stats/base/dists/bernoulli/variance" + let variance = variance +} + +module Logistic = { + @module external cdf: (float, float, float) => float = "@stdlib/stats/base/dists/logistic/cdf" + let cdf = cdf + + @module external pdf: (float, float, float) => float = "@stdlib/stats/base/dists/logistic/pdf" + let pdf = pdf + + @module + external quantile: (float, float, float) => float = "@stdlib/stats/base/dists/logistic/quantile" + let quantile = quantile + + @module external mean: (float, float) => float = "@stdlib/stats/base/dists/logistic/mean" + let mean = mean + + @module external stdev: (float, float) => float = "@stdlib/stats/base/dists/logistic/stdev" + let stdev = stdev + + @module external variance: (float, float) => float = "@stdlib/stats/base/dists/logistic/variance" + let variance = variance } From 606f24ff24cb23cf897cbf15266d5d77540a1c78 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 15 May 2022 21:34:36 -0400 Subject: [PATCH 119/340] Cleanup and addition of toInternalSampleArray --- .../Reducer_Dispatch/Reducer_Dispatch_BuiltIn_test.res | 4 ++++ .../rescript/Distributions/SampleSetDist/SampleSetDist.res | 2 +- .../Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res | 7 +++---- .../src/rescript/Reducer/Reducer_ErrorValue.res | 2 ++ .../ReducerInterface_GenericDistribution.res | 2 ++ packages/squiggle-lang/src/rescript/Utility/Operation.res | 2 ++ 6 files changed, 14 insertions(+), 5 deletions(-) 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 f376094a..398530e3 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 @@ -17,6 +17,10 @@ describe("builtin", () => { testEval("1-1", "Ok(0)") testEval("2>1", "Ok(true)") testEval("concat('a','b')", "Ok('ab')") + testEval( + "addOne(t)=t+1; toInternalSampleArray(mapSamples(fromSamples([1,2,3,4,5,6]), addOne))", + "Ok([2,3,4,5,6,7])", + ) }) describe("builtin exception", () => { diff --git a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res index 5426fd5e..001c581b 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res @@ -83,7 +83,7 @@ let sampleN = (t: t, n) => { } } -let samplesMap = (~fn: (float) => result, t: t): result< +let samplesMap = (~fn: float => result, t: t): result< t, Operation.Error.t, > => { diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res index b1deac6d..232c4364 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res @@ -103,12 +103,11 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce let fn = r => switch Lambda.doLambdaCall(aLambdaValue, list{EvNumber(r)}, environment, reducer) { | Ok(EvNumber(f)) => Ok(f) - | _ => Error(Operation.NotYetImplemented) + | _ => Error(Operation.SampleMapNeedsNtoNFunction) } - let newDist = SampleSetDist.samplesMap(~fn, sampleSetDist) - switch newDist { + switch SampleSetDist.samplesMap(~fn, sampleSetDist) { | Ok(r) => Ok(EvDistribution(SampleSet(r))) - | Error(r) => Error(RETodo("")) + | Error(r) => Error(REOperationError(r)) } } diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res index 4d859a79..d36ca5c4 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res @@ -4,6 +4,7 @@ type errorValue = | REArrayIndexNotFound(string, int) | REAssignmentExpected | REDistributionError(DistributionTypes.error) + | REOperationError(Operation.operationError) | REExpressionExpected | REFunctionExpected(string) | REJavaScriptExn(option, option) // Javascript Exception @@ -29,6 +30,7 @@ let errorToString = err => | REExpressionExpected => "Expression expected" | REFunctionExpected(msg) => `Function expected: ${msg}` | REDistributionError(err) => `Distribution Math Error: ${DistributionTypes.Error.toString(err)}` + | REOperationError(err) => `Math Error: ${Operation.Error.toString(err)}` | REJavaScriptExn(omsg, oname) => { let answer = "JS Exception:" let answer = switch oname { diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index f36c21bf..d6b72574 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -262,6 +262,8 @@ let dispatchToGenericOutput = ( Helpers.toDistFn(ToSampleSet(Belt.Int.fromFloat(float)), dist, ~env) | ("toSampleSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToSampleSet(env.sampleCount), dist, ~env) + | ("toInternalSampleArray", [EvDistribution(SampleSet(dist))]) => + Some(FloatArray(SampleSetDist.T.get(dist))) | ("fromSamples", [EvArray(inputArray)]) => { let _wrapInputErrors = x => SampleSetDist.NonNumericInput(x) let parsedArray = Helpers.parseNumberArray(inputArray)->E.R2.errMap(_wrapInputErrors) diff --git a/packages/squiggle-lang/src/rescript/Utility/Operation.res b/packages/squiggle-lang/src/rescript/Utility/Operation.res index cfa18925..36d12761 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Operation.res +++ b/packages/squiggle-lang/src/rescript/Utility/Operation.res @@ -56,6 +56,7 @@ type operationError = | InfinityError | NegativeInfinityError | LogicallyInconsistentPathwayError + | SampleMapNeedsNtoNFunction | NotYetImplemented // should be removed when `klDivergence` for mixed and discrete is implemented. @genType @@ -70,6 +71,7 @@ module Error = { | InfinityError => "Operation returned positive infinity" | NegativeInfinityError => "Operation returned negative infinity" | LogicallyInconsistentPathwayError => "This pathway should have been logically unreachable" + | SampleMapNeedsNtoNFunction => "SampleMap needs a function that converts a number to a number" | NotYetImplemented => "This pathway is not yet implemented" } } From f493bbc0818c8f617f282cd80390ae1a7f2ec70b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 14:35:41 +0000 Subject: [PATCH 120/340] :arrow_up: Bump @types/react-dom from 18.0.3 to 18.0.4 Bumps [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) from 18.0.3 to 18.0.4. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom) --- updated-dependencies: - dependency-name: "@types/react-dom" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index e8513982..c6870767 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -33,7 +33,7 @@ "@types/lodash": "^4.14.182", "@types/node": "^17.0.32", "@types/react": "^18.0.9", - "@types/react-dom": "^18.0.2", + "@types/react-dom": "^18.0.4", "@types/styled-components": "^5.1.24", "@types/webpack": "^5.28.0", "cross-env": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index dc874293..92b2d1d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4437,10 +4437,10 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.2": - version "18.0.3" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.3.tgz#a022ea08c75a476fe5e96b675c3e673363853831" - integrity sha512-1RRW9kst+67gveJRYPxGmVy8eVJ05O43hg77G2j5m76/RFJtMbcfAs2viQ2UNsvvDg8F7OfQZx8qQcl6ymygaQ== +"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.4": + version "18.0.4" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.4.tgz#dcbcadb277bcf6c411ceff70069424c57797d375" + integrity sha512-FgTtbqPOCI3dzZPZoC2T/sx3L34qxy99ITWn4eoSA95qPyXDMH0ALoAqUp49ITniiJFsXUVBtalh/KffMpg21Q== dependencies: "@types/react" "*" From 40fe4433c4a1c19da9191dacb6bba3dc61c99dbb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 14:37:54 +0000 Subject: [PATCH 121/340] :arrow_up: Bump prism-react-renderer from 1.3.1 to 1.3.3 Bumps [prism-react-renderer](https://github.com/FormidableLabs/prism-react-renderer) from 1.3.1 to 1.3.3. - [Release notes](https://github.com/FormidableLabs/prism-react-renderer/releases) - [Commits](https://github.com/FormidableLabs/prism-react-renderer/compare/v1.3.1...v1.3.3) --- updated-dependencies: - dependency-name: prism-react-renderer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/website/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/website/package.json b/packages/website/package.json index 5f4172f6..e07feb6f 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -16,7 +16,7 @@ "@docusaurus/preset-classic": "2.0.0-beta.20", "@quri/squiggle-components": "^0.2.20", "clsx": "^1.1.1", - "prism-react-renderer": "^1.2.1", + "prism-react-renderer": "^1.3.3", "react": "^18.1.0", "react-dom": "^18.1.0", "remark-math": "^3", diff --git a/yarn.lock b/yarn.lock index dc874293..e50e856f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14007,10 +14007,10 @@ pretty-time@^1.1.0: resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA== -prism-react-renderer@^1.2.1, prism-react-renderer@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.1.tgz#88fc9d0df6bed06ca2b9097421349f8c2f24e30d" - integrity sha512-xUeDMEz074d0zc5y6rxiMp/dlC7C+5IDDlaEUlcBOFE2wddz7hz5PNupb087mPwTt7T9BrFmewObfCBuf/LKwQ== +prism-react-renderer@^1.3.1, prism-react-renderer@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.3.tgz#9b5a4211a6756eee3c96fee9a05733abc0b0805c" + integrity sha512-Viur/7tBTCH2HmYzwCHmt2rEFn+rdIWNIINXyg0StiISbDiIhHKhrFuEK8eMkKgvsIYSjgGqy/hNyucHp6FpoQ== prismjs@^1.21.0, prismjs@^1.28.0: version "1.28.0" From 909c91d7bf900035a6203ffe014e3d9c604955d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 May 2022 14:42:12 +0000 Subject: [PATCH 122/340] :arrow_up: Bump @types/node from 17.0.32 to 17.0.33 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.32 to 17.0.33. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index c6870767..e40f285f 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -31,7 +31,7 @@ "@testing-library/user-event": "^14.2.0", "@types/jest": "^27.5.0", "@types/lodash": "^4.14.182", - "@types/node": "^17.0.32", + "@types/node": "^17.0.33", "@types/react": "^18.0.9", "@types/react-dom": "^18.0.4", "@types/styled-components": "^5.1.24", diff --git a/yarn.lock b/yarn.lock index 92b2d1d2..1ba81968 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4367,10 +4367,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^17.0.32", "@types/node@^17.0.5": - version "17.0.32" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.32.tgz#51d59d7a90ef2d0ae961791e0900cad2393a0149" - integrity sha512-eAIcfAvhf/BkHcf4pkLJ7ECpBAhh9kcxRBpip9cTiO+hf+aJrsxYxBeS6OXvOd9WqNAJmavXVpZvY1rBjNsXmw== +"@types/node@*", "@types/node@^17.0.33", "@types/node@^17.0.5": + version "17.0.33" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.33.tgz#3c1879b276dc63e73030bb91165e62a4509cd506" + integrity sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ== "@types/node@^14.0.10": version "14.18.16" From 30ab62e9b8839ab949c677884dfea3b0a713e917 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 16 May 2022 12:03:37 -0400 Subject: [PATCH 123/340] backed out of mutually recursive dispatch Value: [1e-5 to 1e-3] --- .../ReducerInterface_GenericDistribution.res | 35 +++++-------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 2e99994f..2484fa62 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -165,7 +165,7 @@ module Helpers = { let constructNonNormalizedPointSet = ( ~supportOf: DistributionTypes.genericDist, fn: float => float, - env: DistributionOperation.env + env: DistributionOperation.env, ): DistributionTypes.genericDist => { let cdf = x => toFloatFn(#Cdf(x), supportOf, ~env) let leftEndpoint = cdf(MagicNumbers.Epsilon.ten) @@ -216,7 +216,7 @@ module SymbolicConstructors = { } } -let rec dispatchToGenericOutput = ( +let dispatchToGenericOutput = ( call: ExpressionValue.functionCall, env: DistributionOperation.env, ): option => { @@ -243,7 +243,8 @@ let rec dispatchToGenericOutput = ( | ("mean", [EvDistribution(dist)]) => Helpers.toFloatFn(#Mean, dist, ~env) | ("integralSum", [EvDistribution(dist)]) => Helpers.toFloatFn(#IntegralSum, dist, ~env) | ("toString", [EvDistribution(dist)]) => Helpers.toStringFn(ToString, dist, ~env) - | ("toSparkline", [EvDistribution(dist)]) => Helpers.toStringFn(ToSparkline(MagicNumbers.Environment.sparklineLength), dist, ~env) + | ("toSparkline", [EvDistribution(dist)]) => + Helpers.toStringFn(ToSparkline(MagicNumbers.Environment.sparklineLength), dist, ~env) | ("toSparkline", [EvDistribution(dist), EvNumber(n)]) => Helpers.toStringFn(ToSparkline(Belt.Float.toInt(n)), dist, ~env) | ("exp", [EvDistribution(a)]) => @@ -266,26 +267,16 @@ let rec dispatchToGenericOutput = ( "logScoreWithPointResolution", [EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer))), EvDistribution(prior)], ) => - DistributionOperation.run(FromDist(ToScore(LogScore(answer, prior->Some)), prediction), ~env)->Some + DistributionOperation.run( + FromDist(ToScore(LogScore(answer, prior->Some)), prediction), + ~env, + )->Some | ("logScoreWithPointResolution", [EvDistribution(prediction), EvNumber(answer)]) | ( "logScoreWithPointResolution", [EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))], ) => DistributionOperation.run(FromDist(ToScore(LogScore(answer, None)), prediction), ~env)->Some - | ("logScore", [EvRecord(r)]) => - [ - recurRecordArgs( - "logScoreWithPointResolution", - ["estimate", "answer", "prior"], - r, - env, - ), - recurRecordArgs("klDivergence", ["estimate", "answer"], r, env), - recurRecordArgs("logScoreWithPointResolution", ["estimate", "answer"], r, env), - ]->E.A.O.firstSome - | ("increment", [EvNumber(x)]) => (x +. 1.0)->DistributionOperation.Float->Some // this tests recurRecordArgs function - | ("increment", [EvRecord(r)]) => recurRecordArgs("increment", ["incrementee"], r, env) | ("isNormalized", [EvDistribution(dist)]) => Helpers.toBoolFn(IsNormalized, dist, ~env) | ("toPointSet", [EvDistribution(dist)]) => Helpers.toDistFn(ToPointSet, dist, ~env) | ("scaleLog", [EvDistribution(dist)]) => @@ -372,16 +363,6 @@ let rec dispatchToGenericOutput = ( | _ => None } } -and recurRecordArgs = ( - fnName: string, - argNames: array, - args: ExpressionValue.record, - env: DistributionOperation.env, -): option => - // argNames -> E.A2.fmap(x => Js.Dict.get(args, x)) -> E.A.O.arrSomeToSomeArr -> E.O.bind(a => dispatchToGenericOutput((fnName, a), _environment)) - argNames - ->E.A2.fmap(x => Js.Dict.unsafeGet(args, x)) - ->(a => dispatchToGenericOutput((fnName, a), env)) let genericOutputToReducerValue = (o: DistributionOperation.outputType): result< expressionValue, From 3c3c88fb7bd15e356f05a5babcf48843a27b9439 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 16 May 2022 12:06:21 -0400 Subject: [PATCH 124/340] `...Resolution` => `..Answer` --- .../ReducerInterface_GenericDistribution.res | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 2484fa62..4df742be 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -260,20 +260,20 @@ let dispatchToGenericOutput = ( | ("klDivergence", [EvDistribution(a), EvDistribution(b)]) => Some(DistributionOperation.run(FromDist(ToScore(KLDivergence(b)), a), ~env)) | ( - "logScoreWithPointResolution", + "logScoreWithPointAnswer", [EvDistribution(prediction), EvNumber(answer), EvDistribution(prior)], ) | ( - "logScoreWithPointResolution", + "logScoreWithPointAnswer", [EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer))), EvDistribution(prior)], ) => DistributionOperation.run( FromDist(ToScore(LogScore(answer, prior->Some)), prediction), ~env, )->Some - | ("logScoreWithPointResolution", [EvDistribution(prediction), EvNumber(answer)]) + | ("logScoreWithPointAnswer", [EvDistribution(prediction), EvNumber(answer)]) | ( - "logScoreWithPointResolution", + "logScoreWithPointAnswer", [EvDistribution(prediction), EvDistribution(Symbolic(#Float(answer)))], ) => DistributionOperation.run(FromDist(ToScore(LogScore(answer, None)), prediction), ~env)->Some From 81b2c74ac8d4b889f894ee4393c4ed6c1d930a1c Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 16 May 2022 13:18:01 -0400 Subject: [PATCH 125/340] `klDivergence` with prior Value: [1e-4 to 5e-23] --- .../ReducerInterface_GenericDistribution.res | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 616ad39c..4021649f 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -180,6 +180,20 @@ module Helpers = { ->PointSetTypes.Continuous ->DistributionTypes.PointSet } + + let klDivergenceWithPrior = ( + prediction: DistributionTypes.genericDist, + answer: DistributionTypes.genericDist, + prior: DistributionTypes.genericDist, + env: DistributionOperation.env, + ) => { + let term1 = DistributionOperation.Constructors.klDivergence(~env, prediction, answer) + let term2 = DistributionOperation.Constructors.klDivergence(~env, prior, answer) + switch E.R.merge(term1, term2)->E.R2.fmap(((a, b)) => a -. b) { + | Ok(x) => x->DistributionOperation.Float->Some + | Error(_) => None + } + } } module SymbolicConstructors = { @@ -268,8 +282,10 @@ let dispatchToGenericOutput = ( ~env, )->Some | ("normalize", [EvDistribution(dist)]) => Helpers.toDistFn(Normalize, dist, ~env) - | ("klDivergence", [EvDistribution(a), EvDistribution(b)]) => - Some(DistributionOperation.run(FromDist(ToScore(KLDivergence(b)), a), ~env)) + | ("klDivergence", [EvDistribution(prediction), EvDistribution(answer)]) => + Some(DistributionOperation.run(FromDist(ToScore(KLDivergence(answer)), prediction), ~env)) + | ("klDivergence", [EvDistribution(prediction), EvDistribution(answer), EvDistribution(prior)]) => + Helpers.klDivergenceWithPrior(prediction, answer, prior, env) | ( "logScoreWithPointAnswer", [EvDistribution(prediction), EvNumber(answer), EvDistribution(prior)], From 1d2bb556de10028c98ed1ea6ede5549ff1f6c156 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 16 May 2022 15:39:40 -0400 Subject: [PATCH 126/340] Minor CR comments Value: [1e-6 to 1e-3] --- .../PointSetDist/PointSetDist_Scoring.res | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index ddf5207d..bfc40071 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -15,9 +15,6 @@ module KLDivergence = { } } -/* - -*/ module LogScoreWithPointResolution = { let logFn = Js.Math.log let score = ( @@ -25,21 +22,21 @@ module LogScoreWithPointResolution = { ~predictionPdf: float => float, ~answer: float, ): result => { - let numer = answer->predictionPdf - if numer < 0.0 { + let numerator = answer->predictionPdf + if numerator < 0.0 { Operation.ComplexNumberError->Error - } else if numer == 0.0 { + } else if numerator == 0.0 { infinity->Ok } else { -.( switch priorPdf { - | None => numer->logFn + | None => numerator->logFn | Some(f) => { let priorDensityOfAnswer = f(answer) if priorDensityOfAnswer == 0.0 { neg_infinity } else { - (numer /. priorDensityOfAnswer)->logFn + (numerator /. priorDensityOfAnswer)->logFn } } } From 9e7319ed5735dca757c90ebdc50cc5dab8ce5e24 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 16 May 2022 18:06:14 -0400 Subject: [PATCH 127/340] More substantial CR; more named args Value: [1e-6 to 1e-2] --- .../Distributions/DistributionOperation.res | 15 +++++++++--- .../Distributions/DistributionOperation.resi | 6 ++--- .../Distributions/DistributionTypes.res | 6 ++--- .../rescript/Distributions/GenericDist.res | 23 +++++++++++-------- .../rescript/Distributions/GenericDist.resi | 6 ++--- .../Distributions/PointSetDist/Continuous.res | 2 +- .../Distributions/PointSetDist/Discrete.res | 2 +- .../PointSetDist/Distributions.res | 6 ++++- .../Distributions/PointSetDist/Mixed.res | 2 +- .../PointSetDist/PointSetDist.res | 7 +++--- .../PointSetDist/PointSetDist_Scoring.res | 2 +- .../ReducerInterface_GenericDistribution.res | 18 --------------- .../squiggle-lang/src/rescript/Utility/E.res | 13 ++--------- .../src/rescript/Utility/Operation.res | 4 ++-- 14 files changed, 51 insertions(+), 61 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res index 9af9917d..61b5cd6b 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.res @@ -150,7 +150,12 @@ let rec run = (~env, functionCallInfo: functionCallInfo): outputType => { ->E.R2.fmap(r => Float(r)) ->OutputLocal.fromResult | ToScore(LogScore(answer, prior)) => - GenericDist.Score.logScoreWithPointResolution(dist, answer, prior, ~toPointSetFn) + GenericDist.Score.logScoreWithPointResolution( + ~prediction=dist, + ~answer, + ~prior, + ~toPointSetFn, + ) ->E.R2.fmap(r => Float(r)) ->OutputLocal.fromResult | ToBool(IsNormalized) => dist->GenericDist.isNormalized->Bool @@ -267,8 +272,12 @@ module Constructors = { let normalize = (~env, dist) => C.normalize(dist)->run(~env)->toDistR let isNormalized = (~env, dist) => C.isNormalized(dist)->run(~env)->toBoolR let klDivergence = (~env, dist1, dist2) => C.klDivergence(dist1, dist2)->run(~env)->toFloatR - let logScoreWithPointResolution = (~env, prediction, answer, prior) => - C.logScoreWithPointResolution(prediction, answer, prior)->run(~env)->toFloatR + let logScoreWithPointResolution = ( + ~env, + ~prediction: DistributionTypes.genericDist, + ~answer: float, + ~prior: option, + ) => C.logScoreWithPointResolution(~prediction, ~answer, ~prior)->run(~env)->toFloatR let toPointSet = (~env, dist) => C.toPointSet(dist)->run(~env)->toDistR let toSampleSet = (~env, dist, n) => C.toSampleSet(dist, n)->run(~env)->toDistR let fromSamples = (~env, xs) => C.fromSamples(xs)->run(~env)->toDistR diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi index 7941489e..aa006c06 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionOperation.resi @@ -65,9 +65,9 @@ module Constructors: { @genType let logScoreWithPointResolution: ( ~env: env, - genericDist, - float, - option, + ~prediction: genericDist, + ~answer: float, + ~prior: option, ) => result @genType let toPointSet: (~env: env, genericDist) => result diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res index f377a616..2bb409ad 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res @@ -162,9 +162,9 @@ module Constructors = { let truncate = (dist, left, right): t => FromDist(ToDist(Truncate(left, right)), dist) let inspect = (dist): t => FromDist(ToDist(Inspect), dist) let klDivergence = (dist1, dist2): t => FromDist(ToScore(KLDivergence(dist2)), dist1) - let logScoreWithPointResolution = (prior, prediction, answer): t => FromDist( - ToScore(LogScore(prediction, answer)), - prior, + let logScoreWithPointResolution = (~prediction, ~answer, ~prior): t => FromDist( + ToScore(LogScore(answer, prior)), + prediction, ) let scalePower = (dist, n): t => FromDist(ToDist(Scale(#Power, n)), dist) let scaleLogarithm = (dist, n): t => FromDist(ToDist(Scale(#Logarithm, n)), dist) diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res index c2b03474..1df10240 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res @@ -68,18 +68,21 @@ module Score = { } let logScoreWithPointResolution = ( - prediction, - answer, - prior, + ~prediction: DistributionTypes.genericDist, + ~answer: float, + ~prior: option, ~toPointSetFn: toPointSetFn, ): result => { switch prior { | Some(prior') => - E.R.merge(toPointSetFn(prior'), toPointSetFn(prediction))->E.R.bind(((a, b)) => + E.R.merge(toPointSetFn(prior'), toPointSetFn(prediction))->E.R.bind((( + prior'', + prediction'', + )) => PointSetDist.T.logScoreWithPointResolution( - b, - answer, - a->Some, + ~prediction=prediction'', + ~answer, + ~prior=prior''->Some, )->E.R2.errMap(x => DistributionTypes.OperationError(x)) ) | None => @@ -87,9 +90,9 @@ module Score = { ->toPointSetFn ->E.R.bind(x => PointSetDist.T.logScoreWithPointResolution( - x, - answer, - None, + ~prediction=x, + ~answer, + ~prior=None, )->E.R2.errMap(x => DistributionTypes.OperationError(x)) ) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi index ea9a4110..79fb54ab 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi @@ -26,9 +26,9 @@ let toFloatOperation: ( module Score: { let klDivergence: (t, t, ~toPointSetFn: toPointSetFn) => result let logScoreWithPointResolution: ( - t, - float, - option, + ~prediction: t, + ~answer: float, + ~prior: option, ~toPointSetFn: toPointSetFn, ) => result } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res index c1d87946..3661a531 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Continuous.res @@ -279,7 +279,7 @@ module T = Dist({ ) newShape->E.R2.fmap(x => x->make->integralEndY) } - let logScoreWithPointResolution = (prediction: t, answer: float, prior: option) => { + let logScoreWithPointResolution = (~prediction: t, ~answer: float, ~prior: option) => { let priorPdf = prior->E.O2.fmap((shape, x) => XYShape.XtoY.linear(x, shape.xyShape)) let predictionPdf = x => XYShape.XtoY.linear(x, prediction.xyShape) PointSetDist_Scoring.LogScoreWithPointResolution.score(~priorPdf, ~predictionPdf, ~answer) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res index c0e3f3a8..fea5db6f 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Discrete.res @@ -229,7 +229,7 @@ module T = Dist({ answer, )->E.R2.fmap(integralEndY) } - let logScoreWithPointResolution = (prediction: t, answer: float, prior: option) => { + let logScoreWithPointResolution = (~prediction: t, ~answer: float, ~prior: option) => { Error(Operation.NotYetImplemented) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res index f28b6369..2d0358ec 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Distributions.res @@ -34,7 +34,11 @@ module type dist = { let mean: t => float let variance: t => float let klDivergence: (t, t) => result - let logScoreWithPointResolution: (t, float, option) => result + let logScoreWithPointResolution: ( + ~prediction: t, + ~answer: float, + ~prior: option, + ) => result } module Dist = (T: dist) => { diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res index d3f09798..42a88909 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/Mixed.res @@ -306,7 +306,7 @@ module T = Dist({ let klContinuousPart = Continuous.T.klDivergence(prediction.continuous, answer.continuous) E.R.merge(klDiscretePart, klContinuousPart)->E.R2.fmap(t => fst(t) +. snd(t)) } - let logScoreWithPointResolution = (prediction: t, answer: float, prior: option) => { + let logScoreWithPointResolution = (~prediction: t, ~answer: float, ~prior: option) => { Error(Operation.NotYetImplemented) } }) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index cdeaef5a..d21a7383 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -203,11 +203,12 @@ module T = Dist({ | (m1, m2) => Mixed.T.klDivergence(m1->toMixed, m2->toMixed) } - let logScoreWithPointResolution = (prediction: t, answer: float, prior: option) => { + let logScoreWithPointResolution = (~prediction: t, ~answer: float, ~prior: option) => { switch (prior, prediction) { | (Some(Continuous(t1)), Continuous(t2)) => - Continuous.T.logScoreWithPointResolution(t2, answer, t1->Some) - | (None, Continuous(t2)) => Continuous.T.logScoreWithPointResolution(t2, answer, None) + Continuous.T.logScoreWithPointResolution(~prediction=t2, ~answer, ~prior=t1->Some) + | (None, Continuous(t2)) => + Continuous.T.logScoreWithPointResolution(~prediction=t2, ~answer, ~prior=None) | _ => Error(Operation.NotYetImplemented) } } diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res index bfc40071..532bc76c 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist_Scoring.res @@ -24,7 +24,7 @@ module LogScoreWithPointResolution = { ): result => { let numerator = answer->predictionPdf if numerator < 0.0 { - Operation.ComplexNumberError->Error + Operation.PdfInvalidError->Error } else if numerator == 0.0 { infinity->Ok } else { diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 4021649f..0f29f9db 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -162,24 +162,6 @@ module Helpers = { } } } - let constructNonNormalizedPointSet = ( - ~supportOf: DistributionTypes.genericDist, - fn: float => float, - env: DistributionOperation.env, - ): DistributionTypes.genericDist => { - let cdf = x => toFloatFn(#Cdf(x), supportOf, ~env) - let leftEndpoint = cdf(MagicNumbers.Epsilon.ten) - let rightEndpoint = cdf(1.0 -. MagicNumbers.Epsilon.ten) - let xs = switch (leftEndpoint, rightEndpoint) { - | (Some(Float(a)), Some(Float(b))) => - E.A.Floats.range(a, b, MagicNumbers.Environment.defaultXYPointLength) - | _ => [] - } - {xs: xs, ys: E.A.fmap(fn, xs)} - ->Continuous.make - ->PointSetTypes.Continuous - ->DistributionTypes.PointSet - } let klDivergenceWithPrior = ( prediction: DistributionTypes.genericDist, diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 35439230..64729324 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -620,6 +620,7 @@ module A = { | Some(o) => o | None => [] } + // REturns `None` there are no non-`None` elements let rec arrSomeToSomeArr = (optionals: array>): option> => { let optionals' = optionals->Belt.List.fromArray switch optionals' { @@ -631,17 +632,7 @@ module A = { } } } - let rec firstSome = (optionals: array>): option<'a> => { - let optionals' = optionals->Belt.List.fromArray - switch optionals' { - | list{} => None - | list{x, ...xs} => - switch x { - | Some(_) => x - | None => xs->Belt.List.toArray->firstSome - } - } - } + let firstSome = x => Belt.Array.getBy(x, O.isSome) } module R = { diff --git a/packages/squiggle-lang/src/rescript/Utility/Operation.res b/packages/squiggle-lang/src/rescript/Utility/Operation.res index cfa18925..3f56493b 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Operation.res +++ b/packages/squiggle-lang/src/rescript/Utility/Operation.res @@ -55,7 +55,7 @@ type operationError = | ComplexNumberError | InfinityError | NegativeInfinityError - | LogicallyInconsistentPathwayError + | PdfInvalidError | NotYetImplemented // should be removed when `klDivergence` for mixed and discrete is implemented. @genType @@ -69,7 +69,7 @@ module Error = { | ComplexNumberError => "Operation returned complex result" | InfinityError => "Operation returned positive infinity" | NegativeInfinityError => "Operation returned negative infinity" - | LogicallyInconsistentPathwayError => "This pathway should have been logically unreachable" + | PdfInvalidError => "This Pdf is invalid" | NotYetImplemented => "This pathway is not yet implemented" } } From eafdfdc7b7462a9d00d61f151b859ba1baf90ac0 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Mon, 16 May 2022 20:11:38 -0400 Subject: [PATCH 128/340] Cleanup to samplesMap() code --- .../rescript/Distributions/DistributionTypes.res | 1 + .../Distributions/SampleSetDist/SampleSetDist.res | 15 ++++++++------- .../Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res | 2 +- packages/squiggle-lang/src/rescript/Utility/E.res | 7 +++++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res index a9f7dfbe..5a6865fc 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res +++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res @@ -37,6 +37,7 @@ module Error = { | LogarithmOfDistributionError(s) => `Logarithm of input error: ${s}` | SampleSetError(TooFewSamples) => "Too Few Samples" | SampleSetError(NonNumericInput(err)) => `Found a non-number in input: ${err}` + | SampleSetError(OperationError(err)) => Operation.Error.toString(err) | OperationError(err) => Operation.Error.toString(err) | PointSetConversionError(err) => SampleSetDist.pointsetConversionErrorToString(err) | SparklineError(err) => PointSetTypes.sparklineErrorToString(err) diff --git a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res index 001c581b..834008f5 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res @@ -1,12 +1,14 @@ @genType module Error = { @genType - type sampleSetError = TooFewSamples | NonNumericInput(string) + type sampleSetError = + TooFewSamples | NonNumericInput(string) | OperationError(Operation.operationError) let sampleSetErrorToString = (err: sampleSetError): string => switch err { | TooFewSamples => "Too few samples when constructing sample set" | NonNumericInput(err) => `Found a non-number in input: ${err}` + | OperationError(err) => Operation.Error.toString(err) } @genType @@ -16,6 +18,8 @@ module Error = { switch err { | TooFewSamplesForConversionToPointSet => "Too Few Samples to convert to point set" } + + let fromOperationError = e => OperationError(e) } include Error @@ -85,13 +89,10 @@ let sampleN = (t: t, n) => { let samplesMap = (~fn: float => result, t: t): result< t, - Operation.Error.t, + sampleSetError, > => { let samples = T.get(t)->E.A2.fmap(fn) - - E.A.R.firstErrorOrOpen(samples)->E.R2.fmap(x => - E.R.toExn("Input of samples should be larger than 5", make(x)) - ) + E.A.R.firstErrorOrOpen(samples)->E.R2.errMap(Error.fromOperationError) |> E.R2.bind(make) } //TODO: Figure out what to do if distributions are different lengths. ``zip`` is kind of inelegant for this. @@ -107,7 +108,7 @@ let map2 = (~fn: (float, float) => result, ~t1: t, ~t2 // I could prove this to the type system (say, creating a {first: float, second: float, ..., fifth: float, rest: array} // But doing so would take too much time, so I'll leave it as an assertion E.A.R.firstErrorOrOpen(samples)->E.R2.fmap(x => - E.R.toExn("Input of samples should be larger than 5", make(x)) + E.R.toExnFnString(Error.sampleSetErrorToString, make(x)) ) } diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res index 232c4364..cd16e1fe 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res @@ -107,7 +107,7 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce } switch SampleSetDist.samplesMap(~fn, sampleSetDist) { | Ok(r) => Ok(EvDistribution(SampleSet(r))) - | Error(r) => Error(REOperationError(r)) + | Error(r) => Error(REDistributionError(SampleSetError(r))) } } diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 15678e1a..fb682f78 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -235,13 +235,16 @@ module R = { | Ok(a) => f(a) | Error(err) => Error(err) } - let toExn = (msg: string, x: result<'a, 'b>): 'a => switch x { | Ok(r) => r | Error(_) => raise(Assertion(msg)) } - + let toExnFnString = (errorToStringFn, o) => + switch o { + | Ok(r) => r + | Error(r) => raise(Assertion(errorToStringFn(r))) + } let default = (default, res: Belt.Result.t<'a, 'b>) => switch res { | Ok(r) => r From d7dded7c0407c13eaed6e48ca070127fda8fd4ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 14:36:48 +0000 Subject: [PATCH 129/340] :arrow_up: Bump @babel/plugin-proposal-private-property-in-object Bumps [@babel/plugin-proposal-private-property-in-object](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-private-property-in-object) from 7.16.7 to 7.17.12. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.17.12/packages/babel-plugin-proposal-private-property-in-object) --- updated-dependencies: - dependency-name: "@babel/plugin-proposal-private-property-in-object" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index e40f285f..9332c753 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -17,7 +17,7 @@ "vega-lite": "^5.2.0" }, "devDependencies": { - "@babel/plugin-proposal-private-property-in-object": "^7.16.7", + "@babel/plugin-proposal-private-property-in-object": "^7.17.12", "@storybook/addon-actions": "^6.4.22", "@storybook/addon-essentials": "^6.4.22", "@storybook/addon-links": "^6.4.22", diff --git a/yarn.lock b/yarn.lock index 37f58792..bb26f237 100644 --- a/yarn.lock +++ b/yarn.lock @@ -245,10 +245,10 @@ browserslist "^4.20.2" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d" - integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ== +"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.12.tgz#d4f8393fc4838cbff6b7c199af5229aee16d07cf" + integrity sha512-sZoOeUTkFJMyhqCei2+Z+wtH/BehW8NVKQt7IRUQlRiOARuXymJYfN/FCcI8CvVbR0XVyDM6eLFOlR7YtiXnew== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-environment-visitor" "^7.16.7" @@ -363,10 +363,10 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" - integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.17.12", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96" + integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA== "@babel/helper-remap-async-to-generator@^7.16.8": version "7.16.8" @@ -607,14 +607,14 @@ "@babel/helper-create-class-features-plugin" "^7.16.10" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-private-property-in-object@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" - integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ== +"@babel/plugin-proposal-private-property-in-object@^7.16.7", "@babel/plugin-proposal-private-property-in-object@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d" + integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-create-class-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.17.12" + "@babel/helper-plugin-utils" "^7.17.12" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": From 3d54e81a5f9c48580c2c54045ac5d0de431b0e01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 14:39:18 +0000 Subject: [PATCH 130/340] :arrow_up: Bump @types/node from 17.0.33 to 17.0.34 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.33 to 17.0.34. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index e40f285f..5151a2b3 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -31,7 +31,7 @@ "@testing-library/user-event": "^14.2.0", "@types/jest": "^27.5.0", "@types/lodash": "^4.14.182", - "@types/node": "^17.0.33", + "@types/node": "^17.0.34", "@types/react": "^18.0.9", "@types/react-dom": "^18.0.4", "@types/styled-components": "^5.1.24", diff --git a/yarn.lock b/yarn.lock index 37f58792..a6a164e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4367,10 +4367,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^17.0.33", "@types/node@^17.0.5": - version "17.0.33" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.33.tgz#3c1879b276dc63e73030bb91165e62a4509cd506" - integrity sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ== +"@types/node@*", "@types/node@^17.0.34", "@types/node@^17.0.5": + version "17.0.34" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.34.tgz#3b0b6a50ff797280b8d000c6281d229f9c538cef" + integrity sha512-XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA== "@types/node@^14.0.10": version "14.18.16" From e0f4809ad73842ecf2fb3091166519eafe104c5d Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 17 May 2022 18:54:31 -0400 Subject: [PATCH 131/340] Function registry first attempt --- .../src/rescript/FunctionRegistry.res | 113 ++++++++++++++++++ .../squiggle-lang/src/rescript/Utility/E.res | 6 + 2 files changed, 119 insertions(+) create mode 100644 packages/squiggle-lang/src/rescript/FunctionRegistry.res diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res new file mode 100644 index 00000000..ef44c269 --- /dev/null +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -0,0 +1,113 @@ +type expressionValue = ReducerInterface_ExpressionValue.expressionValue + +type rec itype = + I_Number | I_DistOrNumber | I_Record(iRecord) | I_Array(array) | I_Option(itype) +and iRecord = array +and iRecordParam = (string, itype) + +type rec value = + | Number(float) + | Dist(DistributionTypes.genericDist) + | Option(option) + | DistOrNumber(distOrNumber) + | Record(record) +and record = array<(string, value)> +and distOrNumber = Number(float) | Dist(DistributionTypes.genericDist) + +type runFn = array => result + +type fnDefinition = {name: string, inputs: array, run: runFn} + +type function = { + name: string, + definitions: array, +} + +let rec matchInput = (input: itype, r: expressionValue): option => + switch (input, r) { + | (I_Number, EvNumber(f)) => Some(Number(f)) + | (I_DistOrNumber, EvNumber(f)) => Some(DistOrNumber(Number(f))) + | (I_DistOrNumber, EvDistribution(f)) => Some(DistOrNumber(Dist(f))) + | (I_Option(v), _) => Some(Option(matchInput(v, r))) + | (I_Record(recordParams), EvRecord(record)) => { + let getAndMatch = (name, input) => + E.Dict.get(record, name)->E.O.bind(v => matchInput(input, v)) + let arrayOfNameValues: array<(Js.Dict.key, option)> = + recordParams->E.A2.fmap(((name, input)) => (name, getAndMatch(name, input))) + let hasNullValues = E.A.hasBy(arrayOfNameValues, ((_, value)) => E.O.isNone(value)) + if hasNullValues { + None + } else { + arrayOfNameValues + ->E.A2.fmap(((name, value)) => (name, value->E.O2.toExn(""))) + ->(r => Some(Record(r))) + } + } + | _ => None + } + +type match = DifferentName | SameNameDifferentArguments(string) | Match(string, array) + +let isFullMatch = (match: match) => + switch match { + | Match(_, _) => true + | _ => false + } + +let isNameMatchOnly = (match: match) => + switch match { + | SameNameDifferentArguments(_) => true + | _ => false + } + +let matchSingle = (f: fnDefinition, fnName: string, args: array) => { + if f.name !== fnName { + DifferentName + } else { + let inputTypes = f.inputs + if E.A.length(f.inputs) !== E.A.length(args) { + SameNameDifferentArguments(f.name) + } else { + let foo = + E.A.zip(inputTypes, args) + ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) + ->E.A.O.arrSomeToSomeArr + switch foo { + | Some(r) => Match(f.name, r) + | None => SameNameDifferentArguments(f.name) + } + } + } +} + +let getByOpen = (a,op,bin) => switch(E.A.getBy(a, r => bin(op(r)))) { + | Some(r) => Some(op(r)) + | None => None +} + +let match = (f: function, fnName: string, args: array) => { + let matchedDefinition = E.A.getBy(f.definitions, r => isFullMatch(matchSingle(r, fnName, args))) + switch matchedDefinition { + | Some(matchedDefinition) => { + let match = matchSingle(matchedDefinition, fnName, args) + switch match { + | Match(a, b) => Ok(Match(a, b)) + | _ => Error("Should be Impossible") + } + } + | None => { + let matchedNameDefinition = E.A.getBy(f.definitions, r => + isNameMatchOnly(matchSingle(r, fnName, args)) + ) + let foo = switch matchedNameDefinition { + | Some(matchedNameDefinition) => + switch matchSingle(matchedNameDefinition, fnName, args) { + | SameNameDifferentArguments(r) => Ok(SameNameDifferentArguments(r)) + | _ => Error("Should be Impossible") + } + | _ => Ok(DifferentName) + } + foo + } + } +} diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 64729324..4ed24ead 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -830,3 +830,9 @@ module JsArray = { |> Js.Array.map(O.toExn("Warning: This should not have happened")) let filter = Js.Array.filter } + +module Dict = { + type t<'a> = Js.Dict.t<'a> + let get = Js.Dict.get + let keys = Js.Dict.keys +} \ No newline at end of file From f30de20c8d24d24d48a2e4aebd085ce3b4723fc1 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 17 May 2022 20:45:32 -0400 Subject: [PATCH 132/340] Refactored match() code --- .../src/rescript/FunctionRegistry.res | 38 ++++--------------- .../squiggle-lang/src/rescript/Utility/E.res | 13 ++++++- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index ef44c269..5d94ff20 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -1,7 +1,7 @@ type expressionValue = ReducerInterface_ExpressionValue.expressionValue type rec itype = - I_Number | I_DistOrNumber | I_Record(iRecord) | I_Array(array) | I_Option(itype) + I_Number | I_Numeric | I_DistOrNumber | I_Record(iRecord) | I_Array(array) | I_Option(itype) and iRecord = array and iRecordParam = (string, itype) @@ -28,6 +28,8 @@ let rec matchInput = (input: itype, r: expressionValue): option => | (I_Number, EvNumber(f)) => Some(Number(f)) | (I_DistOrNumber, EvNumber(f)) => Some(DistOrNumber(Number(f))) | (I_DistOrNumber, EvDistribution(f)) => Some(DistOrNumber(Dist(f))) + | (I_Numeric, EvNumber(f)) => Some(Number(f)) + | (I_Numeric, EvDistribution(Symbolic(#Float(f)))) => Some((Number(f))) | (I_Option(v), _) => Some(Option(matchInput(v, r))) | (I_Record(recordParams), EvRecord(record)) => { let getAndMatch = (name, input) => @@ -80,34 +82,10 @@ let matchSingle = (f: fnDefinition, fnName: string, args: array } } -let getByOpen = (a,op,bin) => switch(E.A.getBy(a, r => bin(op(r)))) { - | Some(r) => Some(op(r)) - | None => None -} - let match = (f: function, fnName: string, args: array) => { - let matchedDefinition = E.A.getBy(f.definitions, r => isFullMatch(matchSingle(r, fnName, args))) - switch matchedDefinition { - | Some(matchedDefinition) => { - let match = matchSingle(matchedDefinition, fnName, args) - switch match { - | Match(a, b) => Ok(Match(a, b)) - | _ => Error("Should be Impossible") - } - } - | None => { - let matchedNameDefinition = E.A.getBy(f.definitions, r => - isNameMatchOnly(matchSingle(r, fnName, args)) - ) - let foo = switch matchedNameDefinition { - | Some(matchedNameDefinition) => - switch matchSingle(matchedNameDefinition, fnName, args) { - | SameNameDifferentArguments(r) => Ok(SameNameDifferentArguments(r)) - | _ => Error("Should be Impossible") - } - | _ => Ok(DifferentName) - } - foo - } - } + let matchedDefinition = () => + E.A.getByOpen(f.definitions, r => matchSingle(r, fnName, args), isFullMatch) + let getMatchedNameOnlyDefinition = () => + E.A.getByOpen(f.definitions, r => matchSingle(r, fnName, args), isNameMatchOnly) + E.A.O.firstSomeFnWithDefault([matchedDefinition, getMatchedNameOnlyDefinition], DifferentName) } diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 4ed24ead..c3cf855d 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -549,6 +549,12 @@ module A = { |> (x => Ok(x)) } + let getByOpen = (a, op, bin) => + switch getBy(a, r => bin(op(r))) { + | Some(r) => Some(op(r)) + | None => None + } + let tail = Belt.Array.sliceToEnd(_, 1) let zip = Belt.Array.zip @@ -633,6 +639,11 @@ module A = { } } let firstSome = x => Belt.Array.getBy(x, O.isSome) + + let firstSomeFn = (r: array option<'a>>): option<'a> => + O.flatten(getByOpen(r, l => l(), O.isSome)) + + let firstSomeFnWithDefault = (r, default) => firstSomeFn(r)->O2.default(default) } module R = { @@ -835,4 +846,4 @@ module Dict = { type t<'a> = Js.Dict.t<'a> let get = Js.Dict.get let keys = Js.Dict.keys -} \ No newline at end of file +} From 3085805a4d93a369943ad489e1cceb55fdbaf6bf Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 17 May 2022 21:16:26 -0400 Subject: [PATCH 133/340] Experiment with function registry for normal distribution --- .../src/rescript/FunctionRegistry.res | 66 ++++++++++++++++++- 1 file changed, 63 insertions(+), 3 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index 5d94ff20..766e3aaf 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -1,7 +1,12 @@ type expressionValue = ReducerInterface_ExpressionValue.expressionValue type rec itype = - I_Number | I_Numeric | I_DistOrNumber | I_Record(iRecord) | I_Array(array) | I_Option(itype) + | I_Number + | I_Numeric + | I_DistOrNumber + | I_Record(iRecord) + | I_Array(array) + | I_Option(itype) and iRecord = array and iRecordParam = (string, itype) @@ -14,7 +19,7 @@ type rec value = and record = array<(string, value)> and distOrNumber = Number(float) | Dist(DistributionTypes.genericDist) -type runFn = array => result +type runFn = array => result type fnDefinition = {name: string, inputs: array, run: runFn} @@ -23,13 +28,25 @@ type function = { definitions: array, } +module Function = { + let make = (name, definitions): function => { + name: name, + definitions: definitions, + } + let makeDefinition = (name, inputs, run): fnDefinition => { + name: name, + inputs: inputs, + run: run, + } +} + let rec matchInput = (input: itype, r: expressionValue): option => switch (input, r) { | (I_Number, EvNumber(f)) => Some(Number(f)) | (I_DistOrNumber, EvNumber(f)) => Some(DistOrNumber(Number(f))) | (I_DistOrNumber, EvDistribution(f)) => Some(DistOrNumber(Dist(f))) | (I_Numeric, EvNumber(f)) => Some(Number(f)) - | (I_Numeric, EvDistribution(Symbolic(#Float(f)))) => Some((Number(f))) + | (I_Numeric, EvDistribution(Symbolic(#Float(f)))) => Some(Number(f)) | (I_Option(v), _) => Some(Option(matchInput(v, r))) | (I_Record(recordParams), EvRecord(record)) => { let getAndMatch = (name, input) => @@ -89,3 +106,46 @@ let match = (f: function, fnName: string, args: array) => { E.A.getByOpen(f.definitions, r => matchSingle(r, fnName, args), isNameMatchOnly) E.A.O.firstSomeFnWithDefault([matchedDefinition, getMatchedNameOnlyDefinition], DifferentName) } + +let twoNumberInputs = (inputs: array) => + switch inputs { + | [Number(n1), Number(n2)] => Ok(n1, n2) + | _ => Error("Wrong inputs / Logically impossible") + } + +let twoNumberInputsRecord = (v1, v2, inputs: array) => + switch inputs { + | [Record([(name1, n1), (name2, n2)])] if name1 == v1 && name2 == v2 => twoNumberInputs([n1, n2]) + | _ => Error("Wrong inputs / Logically impossible") + } + +let contain = r => ReducerInterface_ExpressionValue.EvDistribution(Symbolic(r)) + +let meanStdev = (mean, stdev) => SymbolicDist.Normal.make(mean, stdev)->E.R2.fmap(contain) + +let p5and95 = (p5, p95) => contain(SymbolicDist.Normal.from90PercentCI(p5, p95)) + +let convertTwoInputs = (inputs: array): result => + twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev)) + +let normal = Function.make( + "Normal", + [ + Function.makeDefinition("normal", [I_Numeric, I_Numeric], inputs => + twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev)) + ), + Function.makeDefinition( + "normal", + [I_Record([("mean", I_Numeric), ("stdev", I_Numeric)])], + inputs => + twoNumberInputsRecord("mean", "stdev", inputs)->E.R.bind(((mean, stdev)) => + meanStdev(mean, stdev) + ), + ), + Function.makeDefinition("normal", [I_Record([("p5", I_Numeric), ("p95", I_Numeric)])], inputs => + twoNumberInputsRecord("p5", "p95", inputs)->E.R.bind(((mean, stdev)) => + meanStdev(mean, stdev) + ) + ), + ], +) From c1de95b39ae7c120e2cab0c6b708e3956d0734e7 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Wed, 18 May 2022 16:22:11 -0400 Subject: [PATCH 134/340] Added simple registry module --- .../src/rescript/FunctionRegistry.res | 149 ++++++++++++++++-- .../squiggle-lang/src/rescript/Utility/E.res | 3 + 2 files changed, 139 insertions(+), 13 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index 766e3aaf..84e5eccb 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -28,6 +28,8 @@ type function = { definitions: array, } +type registry = array + module Function = { let make = (name, definitions): function => { name: name, @@ -79,23 +81,27 @@ let isNameMatchOnly = (match: match) => | _ => false } +let matchSingleSameName = (f: fnDefinition, args: array) => { + let inputTypes = f.inputs + if E.A.length(f.inputs) !== E.A.length(args) { + SameNameDifferentArguments(f.name) + } else { + let foo = + E.A.zip(inputTypes, args) + ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) + ->E.A.O.arrSomeToSomeArr + switch foo { + | Some(r) => Match(f.name, r) + | None => SameNameDifferentArguments(f.name) + } + } +} + let matchSingle = (f: fnDefinition, fnName: string, args: array) => { if f.name !== fnName { DifferentName } else { - let inputTypes = f.inputs - if E.A.length(f.inputs) !== E.A.length(args) { - SameNameDifferentArguments(f.name) - } else { - let foo = - E.A.zip(inputTypes, args) - ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) - ->E.A.O.arrSomeToSomeArr - switch foo { - | Some(r) => Match(f.name, r) - | None => SameNameDifferentArguments(f.name) - } - } + matchSingleSameName(f, args) } } @@ -107,6 +113,123 @@ let match = (f: function, fnName: string, args: array) => { E.A.O.firstSomeFnWithDefault([matchedDefinition, getMatchedNameOnlyDefinition], DifferentName) } +module IndexMatch = { + type t = [#FullMatch(int) | #NameMatchOnly(array) | #NoMatch] + let isFullMatch = (t: t) => + switch t { + | #FullMatch(_) => true + | _ => false + } + let isNameOnlyMatch = (t: t) => + switch t { + | #NameMatchOnly(_) => true + | _ => false + } +} + +let match2 = (f: function, fnName: string, args: array) => { + let matchedDefinition = () => + E.A.getIndexBy(f.definitions, r => isFullMatch(matchSingle(r, fnName, args))) |> E.O.fmap(r => + #FullMatch(r) + ) + let getMatchedNameOnlyDefinition = () => { + let nameMatchIndexes = + f.definitions + ->E.A2.fmapi((index, r) => isNameMatchOnly(matchSingle(r, fnName, args)) ? Some(index) : None) + ->E.A.O.concatSomes + switch nameMatchIndexes { + | [] => None + | elements => Some(#NameMatchOnly(elements)) + } + } + + E.A.O.firstSomeFnWithDefault([matchedDefinition, getMatchedNameOnlyDefinition], #NoMatch) +} + +module IndexMatch2 = { + type match = { + fnName: string, + inputIndex: int, + } + type t = [#FullMatch(match) | #NameMatchOnly(array) | #NoMatch] + let makeMatch = (fnName: string, inputIndex: int) => {fnName: fnName, inputIndex: inputIndex} + let isFullMatch = (t: t) => + switch t { + | #FullMatch(_) => true + | _ => false + } + let isNameOnlyMatch = (t: t) => + switch t { + | #NameMatchOnly(_) => true + | _ => false + } +} + +module Registry = { + let findExactMatches = (r: registry, fnName: string, args: array) => { + let functionMatchPairs = r->E.A2.fmap(l => (l, match2(l, fnName, args))) + let getFullMatch = E.A.getBy(functionMatchPairs, ((_, match)) => IndexMatch.isFullMatch(match)) + let fullMatch: option = getFullMatch->E.O.bind(((fn, match)) => + switch match { + | #FullMatch(index) => Some(IndexMatch2.makeMatch(fn.name, index)) + | _ => None + } + ) + fullMatch + } + + let findNameMatches = (r: registry, fnName: string, args: array) => { + let functionMatchPairs = r->E.A2.fmap(l => (l, match2(l, fnName, args))) + let getNameMatches = + functionMatchPairs + ->E.A2.fmap(((fn, match)) => IndexMatch.isNameOnlyMatch(match) ? Some((fn, match)) : None) + ->E.A.O.concatSomes + let matches = + getNameMatches + ->E.A2.fmap(((fn, match)) => + switch match { + | #NameMatchOnly(indexes) => + indexes->E.A2.fmap(index => IndexMatch2.makeMatch(fn.name, index)) + | _ => [] + } + ) + ->Belt.Array.concatMany + E.A.toNoneIfEmpty(matches) + } + + let findMatches = (r: registry, fnName: string, args: array) => { + switch findExactMatches(r, fnName, args) { + | Some(r) => #FullMatch(r) + | None => + switch findNameMatches(r, fnName, args) { + | Some(r) => #NameMatchOnly(r) + | None => #NoMatch + } + } + } + + let fullMatchToDef = (registry: registry, {fnName, inputIndex}: IndexMatch2.match): option< + fnDefinition, + > => + registry + ->E.A.getBy(fn => fn.name === fnName) + ->E.O.bind(fn => E.A.get(fn.definitions, inputIndex)) + + let runDef = (fnDefinition: fnDefinition, args: array) => { + switch matchSingleSameName(fnDefinition, args) { + | Match(_, values) => fnDefinition.run(values) + | _ => Error("Impossible") + } + } + + let matchAndRun = (r: registry, fnName: string, args: array) => { + switch findMatches(r, fnName, args) { + | #FullMatch(m) => fullMatchToDef(r, m)->E.O2.fmap(runDef(_, args)) + | _ => None + } + } +} + let twoNumberInputs = (inputs: array) => switch inputs { | [Number(n1), Number(n2)] => Ok(n1, n2) diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index c3cf855d..06d8d4e9 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -522,6 +522,7 @@ module A = { let unsafe_get = Array.unsafe_get let get = Belt.Array.get let getBy = Belt.Array.getBy + let getIndexBy = Belt.Array.getIndexBy let last = a => get(a, length(a) - 1) let first = get(_, 0) let hasBy = (r, fn) => Belt.Array.getBy(r, fn) |> O.isSome @@ -535,6 +536,7 @@ module A = { let reducei = Belt.Array.reduceWithIndex let isEmpty = r => length(r) < 1 let stableSortBy = Belt.SortArray.stableSortBy + let toNoneIfEmpty = r => isEmpty(r) ? None : Some(r) let toRanges = (a: array<'a>) => switch a |> Belt.Array.length { | 0 @@ -830,6 +832,7 @@ module A = { module A2 = { let fmap = (a, b) => A.fmap(b, a) + let fmapi = (a, b) => A.fmapi(b, a) let joinWith = (a, b) => A.joinWith(b, a) let filter = (a, b) => A.filter(b, a) } From f7f94cbcb141c85269b1e72e4c07892e5a2ca0c4 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Wed, 18 May 2022 16:49:22 -0400 Subject: [PATCH 135/340] First part of cleanup --- .../src/rescript/FunctionRegistry.res | 158 +++++++++--------- 1 file changed, 76 insertions(+), 82 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index 84e5eccb..d7d2986b 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -30,18 +30,6 @@ type function = { type registry = array -module Function = { - let make = (name, definitions): function => { - name: name, - definitions: definitions, - } - let makeDefinition = (name, inputs, run): fnDefinition => { - name: name, - inputs: inputs, - run: run, - } -} - let rec matchInput = (input: itype, r: expressionValue): option => switch (input, r) { | (I_Number, EvNumber(f)) => Some(Number(f)) @@ -67,86 +55,92 @@ let rec matchInput = (input: itype, r: expressionValue): option => | _ => None } -type match = DifferentName | SameNameDifferentArguments(string) | Match(string, array) +module FnDefinition = { + type definitionMatch = + DifferentName | SameNameDifferentArguments(string) | Match(string, array) -let isFullMatch = (match: match) => - switch match { - | Match(_, _) => true - | _ => false + let isFullMatch = (match: definitionMatch) => + switch match { + | Match(_, _) => true + | _ => false + } + + let isNameMatchOnly = (match: definitionMatch) => + switch match { + | SameNameDifferentArguments(_) => true + | _ => false + } + + let matchSingleSameName = (f: fnDefinition, args: array) => { + let inputTypes = f.inputs + if E.A.length(f.inputs) !== E.A.length(args) { + SameNameDifferentArguments(f.name) + } else { + let foo = + E.A.zip(inputTypes, args) + ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) + ->E.A.O.arrSomeToSomeArr + switch foo { + | Some(r) => Match(f.name, r) + | None => SameNameDifferentArguments(f.name) + } + } } -let isNameMatchOnly = (match: match) => - switch match { - | SameNameDifferentArguments(_) => true - | _ => false - } - -let matchSingleSameName = (f: fnDefinition, args: array) => { - let inputTypes = f.inputs - if E.A.length(f.inputs) !== E.A.length(args) { - SameNameDifferentArguments(f.name) - } else { - let foo = - E.A.zip(inputTypes, args) - ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) - ->E.A.O.arrSomeToSomeArr - switch foo { - | Some(r) => Match(f.name, r) - | None => SameNameDifferentArguments(f.name) + let match = (f: fnDefinition, fnName: string, args: array) => { + if f.name !== fnName { + DifferentName + } else { + matchSingleSameName(f, args) } } } -let matchSingle = (f: fnDefinition, fnName: string, args: array) => { - if f.name !== fnName { - DifferentName - } else { - matchSingleSameName(f, args) - } -} - -let match = (f: function, fnName: string, args: array) => { - let matchedDefinition = () => - E.A.getByOpen(f.definitions, r => matchSingle(r, fnName, args), isFullMatch) - let getMatchedNameOnlyDefinition = () => - E.A.getByOpen(f.definitions, r => matchSingle(r, fnName, args), isNameMatchOnly) - E.A.O.firstSomeFnWithDefault([matchedDefinition, getMatchedNameOnlyDefinition], DifferentName) -} - -module IndexMatch = { - type t = [#FullMatch(int) | #NameMatchOnly(array) | #NoMatch] - let isFullMatch = (t: t) => +module Function = { + type match = [#FullMatch(int) | #NameMatchOnly(array) | #NoMatch] + let isFullMatch = (t: match) => switch t { | #FullMatch(_) => true | _ => false } - let isNameOnlyMatch = (t: t) => + let isNameOnlyMatch = (t: match) => switch t { | #NameMatchOnly(_) => true | _ => false } -} - -let match2 = (f: function, fnName: string, args: array) => { - let matchedDefinition = () => - E.A.getIndexBy(f.definitions, r => isFullMatch(matchSingle(r, fnName, args))) |> E.O.fmap(r => - #FullMatch(r) - ) - let getMatchedNameOnlyDefinition = () => { - let nameMatchIndexes = - f.definitions - ->E.A2.fmapi((index, r) => isNameMatchOnly(matchSingle(r, fnName, args)) ? Some(index) : None) - ->E.A.O.concatSomes - switch nameMatchIndexes { - | [] => None - | elements => Some(#NameMatchOnly(elements)) - } + let make = (name, definitions): function => { + name: name, + definitions: definitions, + } + let makeDefinition = (name, inputs, run): fnDefinition => { + name: name, + inputs: inputs, + run: run, } - E.A.O.firstSomeFnWithDefault([matchedDefinition, getMatchedNameOnlyDefinition], #NoMatch) + let match = (f: function, fnName: string, args: array): match => { + let matchedDefinition = () => + E.A.getIndexBy(f.definitions, r => + FnDefinition.isFullMatch(FnDefinition.match(r, fnName, args)) + ) |> E.O.fmap(r => #FullMatch(r)) + let getMatchedNameOnlyDefinition = () => { + let nameMatchIndexes = + f.definitions + ->E.A2.fmapi((index, r) => + FnDefinition.isNameMatchOnly(FnDefinition.match(r, fnName, args)) ? Some(index) : None + ) + ->E.A.O.concatSomes + switch nameMatchIndexes { + | [] => None + | elements => Some(#NameMatchOnly(elements)) + } + } + + E.A.O.firstSomeFnWithDefault([matchedDefinition, getMatchedNameOnlyDefinition], #NoMatch) + } } -module IndexMatch2 = { +module RegistryMatch = { type match = { fnName: string, inputIndex: int, @@ -167,11 +161,11 @@ module IndexMatch2 = { module Registry = { let findExactMatches = (r: registry, fnName: string, args: array) => { - let functionMatchPairs = r->E.A2.fmap(l => (l, match2(l, fnName, args))) - let getFullMatch = E.A.getBy(functionMatchPairs, ((_, match)) => IndexMatch.isFullMatch(match)) - let fullMatch: option = getFullMatch->E.O.bind(((fn, match)) => + let functionMatchPairs = r->E.A2.fmap(l => (l, Function.match(l, fnName, args))) + let getFullMatch = E.A.getBy(functionMatchPairs, ((_, match)) => Function.isFullMatch(match)) + let fullMatch: option = getFullMatch->E.O.bind(((fn, match)) => switch match { - | #FullMatch(index) => Some(IndexMatch2.makeMatch(fn.name, index)) + | #FullMatch(index) => Some(RegistryMatch.makeMatch(fn.name, index)) | _ => None } ) @@ -179,17 +173,17 @@ module Registry = { } let findNameMatches = (r: registry, fnName: string, args: array) => { - let functionMatchPairs = r->E.A2.fmap(l => (l, match2(l, fnName, args))) + let functionMatchPairs = r->E.A2.fmap(l => (l, Function.match(l, fnName, args))) let getNameMatches = functionMatchPairs - ->E.A2.fmap(((fn, match)) => IndexMatch.isNameOnlyMatch(match) ? Some((fn, match)) : None) + ->E.A2.fmap(((fn, match)) => Function.isNameOnlyMatch(match) ? Some((fn, match)) : None) ->E.A.O.concatSomes let matches = getNameMatches ->E.A2.fmap(((fn, match)) => switch match { | #NameMatchOnly(indexes) => - indexes->E.A2.fmap(index => IndexMatch2.makeMatch(fn.name, index)) + indexes->E.A2.fmap(index => RegistryMatch.makeMatch(fn.name, index)) | _ => [] } ) @@ -208,7 +202,7 @@ module Registry = { } } - let fullMatchToDef = (registry: registry, {fnName, inputIndex}: IndexMatch2.match): option< + let fullMatchToDef = (registry: registry, {fnName, inputIndex}: RegistryMatch.match): option< fnDefinition, > => registry @@ -216,7 +210,7 @@ module Registry = { ->E.O.bind(fn => E.A.get(fn.definitions, inputIndex)) let runDef = (fnDefinition: fnDefinition, args: array) => { - switch matchSingleSameName(fnDefinition, args) { + switch FnDefinition.matchSingleSameName(fnDefinition, args) { | Match(_, values) => fnDefinition.run(values) | _ => Error("Impossible") } From b67c90eb0627ae0ad8c301ff067e4bb8d0f4fb8e Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Wed, 18 May 2022 17:27:36 -0400 Subject: [PATCH 136/340] Cleaned up FunctionRegistry to use Match type --- .../src/rescript/FunctionRegistry.res | 129 ++++++++++-------- 1 file changed, 69 insertions(+), 60 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index d7d2986b..4cd20e87 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -55,59 +55,80 @@ let rec matchInput = (input: itype, r: expressionValue): option => | _ => None } -module FnDefinition = { - type definitionMatch = - DifferentName | SameNameDifferentArguments(string) | Match(string, array) +module MatchSimple = { + type t = DifferentName | SameNameDifferentArguments | FullMatch - let isFullMatch = (match: definitionMatch) => + let isFullMatch = (match: t) => switch match { - | Match(_, _) => true + | FullMatch => true | _ => false } - let isNameMatchOnly = (match: definitionMatch) => + let isNameMatchOnly = (match: t) => + switch match { + | SameNameDifferentArguments => true + | _ => false + } +} + +module Match = { + type t<'a, 'b> = DifferentName | SameNameDifferentArguments('a) | FullMatch('b) + + let isFullMatch = (match: t<'a, 'b>): bool => + switch match { + | FullMatch(_) => true + | _ => false + } + + let isNameMatchOnly = (match: t<'a, 'b>) => switch match { | SameNameDifferentArguments(_) => true | _ => false } +} - let matchSingleSameName = (f: fnDefinition, args: array) => { +module FnDefinition = { + type definitionMatch = MatchSimple.t + + let getArgValues = (f: fnDefinition, args: array): option> => { let inputTypes = f.inputs if E.A.length(f.inputs) !== E.A.length(args) { - SameNameDifferentArguments(f.name) + None } else { - let foo = - E.A.zip(inputTypes, args) - ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) - ->E.A.O.arrSomeToSomeArr - switch foo { - | Some(r) => Match(f.name, r) - | None => SameNameDifferentArguments(f.name) - } + E.A.zip(inputTypes, args) + ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) + ->E.A.O.arrSomeToSomeArr + } + } + + let matchAssumingSameName = (f: fnDefinition, args: array) => { + switch getArgValues(f, args) { + | Some(_) => MatchSimple.FullMatch + | None => MatchSimple.SameNameDifferentArguments } } let match = (f: fnDefinition, fnName: string, args: array) => { if f.name !== fnName { - DifferentName + MatchSimple.DifferentName } else { - matchSingleSameName(f, args) + matchAssumingSameName(f, args) + } + } + + let run = (f: fnDefinition, args: array) => { + let argValues = getArgValues(f, args) + switch argValues { + | Some(values) => f.run(values) + | None => Error("Impossible") } } } module Function = { - type match = [#FullMatch(int) | #NameMatchOnly(array) | #NoMatch] - let isFullMatch = (t: match) => - switch t { - | #FullMatch(_) => true - | _ => false - } - let isNameOnlyMatch = (t: match) => - switch t { - | #NameMatchOnly(_) => true - | _ => false - } + type definitionId = int + type match = Match.t, definitionId> + let make = (name, definitions): function => { name: name, definitions: definitions, @@ -121,22 +142,25 @@ module Function = { let match = (f: function, fnName: string, args: array): match => { let matchedDefinition = () => E.A.getIndexBy(f.definitions, r => - FnDefinition.isFullMatch(FnDefinition.match(r, fnName, args)) - ) |> E.O.fmap(r => #FullMatch(r)) + MatchSimple.isFullMatch(FnDefinition.match(r, fnName, args)) + ) |> E.O.fmap(r => Match.FullMatch(r)) let getMatchedNameOnlyDefinition = () => { let nameMatchIndexes = f.definitions ->E.A2.fmapi((index, r) => - FnDefinition.isNameMatchOnly(FnDefinition.match(r, fnName, args)) ? Some(index) : None + MatchSimple.isNameMatchOnly(FnDefinition.match(r, fnName, args)) ? Some(index) : None ) ->E.A.O.concatSomes switch nameMatchIndexes { | [] => None - | elements => Some(#NameMatchOnly(elements)) + | elements => Some(Match.SameNameDifferentArguments(elements)) } } - E.A.O.firstSomeFnWithDefault([matchedDefinition, getMatchedNameOnlyDefinition], #NoMatch) + E.A.O.firstSomeFnWithDefault( + [matchedDefinition, getMatchedNameOnlyDefinition], + Match.DifferentName, + ) } } @@ -145,27 +169,19 @@ module RegistryMatch = { fnName: string, inputIndex: int, } - type t = [#FullMatch(match) | #NameMatchOnly(array) | #NoMatch] + type t = Match.t, match> let makeMatch = (fnName: string, inputIndex: int) => {fnName: fnName, inputIndex: inputIndex} - let isFullMatch = (t: t) => - switch t { - | #FullMatch(_) => true - | _ => false - } - let isNameOnlyMatch = (t: t) => - switch t { - | #NameMatchOnly(_) => true - | _ => false - } } module Registry = { let findExactMatches = (r: registry, fnName: string, args: array) => { let functionMatchPairs = r->E.A2.fmap(l => (l, Function.match(l, fnName, args))) - let getFullMatch = E.A.getBy(functionMatchPairs, ((_, match)) => Function.isFullMatch(match)) + let getFullMatch = E.A.getBy(functionMatchPairs, ((_, match: Function.match)) => + Match.isFullMatch(match) + ) let fullMatch: option = getFullMatch->E.O.bind(((fn, match)) => switch match { - | #FullMatch(index) => Some(RegistryMatch.makeMatch(fn.name, index)) + | FullMatch(index) => Some(RegistryMatch.makeMatch(fn.name, index)) | _ => None } ) @@ -176,13 +192,13 @@ module Registry = { let functionMatchPairs = r->E.A2.fmap(l => (l, Function.match(l, fnName, args))) let getNameMatches = functionMatchPairs - ->E.A2.fmap(((fn, match)) => Function.isNameOnlyMatch(match) ? Some((fn, match)) : None) + ->E.A2.fmap(((fn, match)) => Match.isNameMatchOnly(match) ? Some((fn, match)) : None) ->E.A.O.concatSomes let matches = getNameMatches ->E.A2.fmap(((fn, match)) => switch match { - | #NameMatchOnly(indexes) => + | SameNameDifferentArguments(indexes) => indexes->E.A2.fmap(index => RegistryMatch.makeMatch(fn.name, index)) | _ => [] } @@ -193,11 +209,11 @@ module Registry = { let findMatches = (r: registry, fnName: string, args: array) => { switch findExactMatches(r, fnName, args) { - | Some(r) => #FullMatch(r) + | Some(r) => Match.FullMatch(r) | None => switch findNameMatches(r, fnName, args) { - | Some(r) => #NameMatchOnly(r) - | None => #NoMatch + | Some(r) => Match.SameNameDifferentArguments(r) + | None => Match.DifferentName } } } @@ -209,16 +225,9 @@ module Registry = { ->E.A.getBy(fn => fn.name === fnName) ->E.O.bind(fn => E.A.get(fn.definitions, inputIndex)) - let runDef = (fnDefinition: fnDefinition, args: array) => { - switch FnDefinition.matchSingleSameName(fnDefinition, args) { - | Match(_, values) => fnDefinition.run(values) - | _ => Error("Impossible") - } - } - let matchAndRun = (r: registry, fnName: string, args: array) => { switch findMatches(r, fnName, args) { - | #FullMatch(m) => fullMatchToDef(r, m)->E.O2.fmap(runDef(_, args)) + | Match.FullMatch(m) => fullMatchToDef(r, m)->E.O2.fmap(FnDefinition.run(_, args)) | _ => None } } From 88ae0e25b410d0d697000b0901edec432beb0b83 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Wed, 18 May 2022 18:25:32 -0400 Subject: [PATCH 137/340] Simple experiment of it working --- .../src/rescript/FunctionRegistry.res | 20 +++++++++++++----- .../ReducerInterface_GenericDistribution.res | 21 +++++++++++++++---- .../squiggle-lang/src/rescript/Utility/E.res | 8 +++++++ 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index 4cd20e87..f0d142c1 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -95,9 +95,13 @@ module FnDefinition = { if E.A.length(f.inputs) !== E.A.length(args) { None } else { - E.A.zip(inputTypes, args) + let foo = E.A.zip(inputTypes, args) + ->(e => {Js.log2("Here", e); e}) ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) - ->E.A.O.arrSomeToSomeArr + ->(e => {Js.log2("Here2", e); e}) + ->E.A.O.openIfAllSome + ->(e => {Js.log2("Here3", e); e}); + foo } } @@ -117,7 +121,9 @@ module FnDefinition = { } let run = (f: fnDefinition, args: array) => { + Js.log3("Run", f, args) let argValues = getArgValues(f, args) + Js.log2("RunArgValues", argValues) switch argValues { | Some(values) => f.run(values) | None => Error("Impossible") @@ -227,17 +233,21 @@ module Registry = { let matchAndRun = (r: registry, fnName: string, args: array) => { switch findMatches(r, fnName, args) { - | Match.FullMatch(m) => fullMatchToDef(r, m)->E.O2.fmap(FnDefinition.run(_, args)) + | Match.FullMatch(m) => fullMatchToDef(r, m)->E.O2.fmap(r => { + FnDefinition.run(r, args) + }) | _ => None } } } -let twoNumberInputs = (inputs: array) => +let twoNumberInputs = (inputs: array) =>{ + Js.log2("HII",inputs); switch inputs { | [Number(n1), Number(n2)] => Ok(n1, n2) | _ => Error("Wrong inputs / Logically impossible") } +} let twoNumberInputsRecord = (v1, v2, inputs: array) => switch inputs { @@ -270,7 +280,7 @@ let normal = Function.make( ), Function.makeDefinition("normal", [I_Record([("p5", I_Numeric), ("p95", I_Numeric)])], inputs => twoNumberInputsRecord("p5", "p95", inputs)->E.R.bind(((mean, stdev)) => - meanStdev(mean, stdev) + Ok(p5and95(mean, stdev)) ) ), ], diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 0f29f9db..824b5b32 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -227,8 +227,8 @@ let dispatchToGenericOutput = ( | ("delta", [EvNumber(f)]) => SymbolicDist.Float.makeSafe(f)->SymbolicConstructors.symbolicResultToOutput | ( - ("normal" - | "uniform" + ( + "uniform" | "beta" | "lognormal" | "cauchy" @@ -386,6 +386,19 @@ let genericOutputToReducerValue = (o: DistributionOperation.outputType): result< | GenDistError(err) => Error(REDistributionError(err)) } -let dispatch = (call, environment) => { - dispatchToGenericOutput(call, environment)->E.O2.fmap(genericOutputToReducerValue) +let registered = [FunctionRegistry.normal] + +let tryRegistry = (call:ExpressionValue.functionCall) => { + let (fnName, args) = call; + let response = FunctionRegistry.Registry.matchAndRun(registered, fnName, args) + let foo = response -> E.O2.fmap(r => r->E.R2.errMap(s => Reducer_ErrorValue.RETodo(s))) + foo +} + +let dispatch = (call:ExpressionValue.functionCall, environment) => { + let regularDispatch = dispatchToGenericOutput(call, environment)->E.O2.fmap(genericOutputToReducerValue) + switch(regularDispatch){ + | Some(x) => Some(x) + | None => tryRegistry(call) + } } diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 06d8d4e9..b096303d 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -646,6 +646,14 @@ module A = { O.flatten(getByOpen(r, l => l(), O.isSome)) let firstSomeFnWithDefault = (r, default) => firstSomeFn(r)->O2.default(default) + + let openIfAllSome = (optionals: array>): option> => { + if all(O.isSome, optionals) { + Some(optionals |> fmap(O.toExn("Warning: This should not have happened"))) + } else { + None + } + } } module R = { From 76bbfb2ef18a6b71a5ae8411fe3e474e37d7f79d Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Wed, 18 May 2022 18:42:28 -0400 Subject: [PATCH 138/340] Added lognormal fn definitions --- .../src/rescript/FunctionRegistry.res | 49 +++++++++++++------ .../ReducerInterface_GenericDistribution.res | 22 ++++----- 2 files changed, 46 insertions(+), 25 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index f0d142c1..d01d5736 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -95,13 +95,9 @@ module FnDefinition = { if E.A.length(f.inputs) !== E.A.length(args) { None } else { - let foo = E.A.zip(inputTypes, args) - ->(e => {Js.log2("Here", e); e}) + E.A.zip(inputTypes, args) ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) - ->(e => {Js.log2("Here2", e); e}) ->E.A.O.openIfAllSome - ->(e => {Js.log2("Here3", e); e}); - foo } } @@ -121,9 +117,7 @@ module FnDefinition = { } let run = (f: fnDefinition, args: array) => { - Js.log3("Run", f, args) let argValues = getArgValues(f, args) - Js.log2("RunArgValues", argValues) switch argValues { | Some(values) => f.run(values) | None => Error("Impossible") @@ -233,16 +227,16 @@ module Registry = { let matchAndRun = (r: registry, fnName: string, args: array) => { switch findMatches(r, fnName, args) { - | Match.FullMatch(m) => fullMatchToDef(r, m)->E.O2.fmap(r => { + | Match.FullMatch(m) => + fullMatchToDef(r, m)->E.O2.fmap(r => { FnDefinition.run(r, args) - }) + }) | _ => None } } } -let twoNumberInputs = (inputs: array) =>{ - Js.log2("HII",inputs); +let twoNumberInputs = (inputs: array) => { switch inputs { | [Number(n1), Number(n2)] => Ok(n1, n2) | _ => Error("Wrong inputs / Logically impossible") @@ -279,9 +273,36 @@ let normal = Function.make( ), ), Function.makeDefinition("normal", [I_Record([("p5", I_Numeric), ("p95", I_Numeric)])], inputs => - twoNumberInputsRecord("p5", "p95", inputs)->E.R.bind(((mean, stdev)) => - Ok(p5and95(mean, stdev)) - ) + twoNumberInputsRecord("p5", "p95", inputs)->E.R.bind(((v1, v2)) => Ok(p5and95(v1, v2))) ), ], ) + +let logNormal = Function.make( + "Lognormal", + [ + Function.makeDefinition("lognormal", [I_Numeric, I_Numeric], inputs => + twoNumberInputs(inputs)->E.R.bind(((mu, sigma)) => + SymbolicDist.Lognormal.make(mu, sigma)->E.R2.fmap(contain) + ) + ), + Function.makeDefinition( + "lognormal", + [I_Record([("p5", I_Numeric), ("p95", I_Numeric)])], + inputs => + twoNumberInputsRecord("p5", "p95", inputs)->E.R.bind(((p5, p95)) => Ok( + contain(SymbolicDist.Lognormal.from90PercentCI(p5, p95)), + )), + ), + Function.makeDefinition( + "lognormal", + [I_Record([("mean", I_Numeric), ("stdev", I_Numeric)])], + inputs => + twoNumberInputsRecord("mean", "stdev", inputs)->E.R.bind(((mean, stdev)) => + SymbolicDist.Lognormal.fromMeanAndStdev(mean, stdev)->E.R2.fmap(contain) + ), + ), + ], +) + +let allFunctions = [normal, logNormal] diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 824b5b32..d2e9b65e 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -227,8 +227,7 @@ let dispatchToGenericOutput = ( | ("delta", [EvNumber(f)]) => SymbolicDist.Float.makeSafe(f)->SymbolicConstructors.symbolicResultToOutput | ( - ( - "uniform" + ("uniform" | "beta" | "lognormal" | "cauchy" @@ -386,19 +385,20 @@ let genericOutputToReducerValue = (o: DistributionOperation.outputType): result< | GenDistError(err) => Error(REDistributionError(err)) } -let registered = [FunctionRegistry.normal] +let registered = FunctionRegistry.allFunctions -let tryRegistry = (call:ExpressionValue.functionCall) => { - let (fnName, args) = call; +let tryRegistry = (call: ExpressionValue.functionCall) => { + let (fnName, args) = call let response = FunctionRegistry.Registry.matchAndRun(registered, fnName, args) - let foo = response -> E.O2.fmap(r => r->E.R2.errMap(s => Reducer_ErrorValue.RETodo(s))) + let foo = response->E.O2.fmap(r => r->E.R2.errMap(s => Reducer_ErrorValue.RETodo(s))) foo } -let dispatch = (call:ExpressionValue.functionCall, environment) => { - let regularDispatch = dispatchToGenericOutput(call, environment)->E.O2.fmap(genericOutputToReducerValue) - switch(regularDispatch){ - | Some(x) => Some(x) - | None => tryRegistry(call) +let dispatch = (call: ExpressionValue.functionCall, environment) => { + let regularDispatch = + dispatchToGenericOutput(call, environment)->E.O2.fmap(genericOutputToReducerValue) + switch regularDispatch { + | Some(x) => Some(x) + | None => tryRegistry(call) } } From 69d962ce753dfdef944d834cc7fa99b81a82053f Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Wed, 18 May 2022 19:10:34 -0400 Subject: [PATCH 139/340] Wip, working on allowing distributions in normal --- .../squiggle-lang/src/rescript/FunctionRegistry.res | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index d01d5736..7a74ed0c 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -258,12 +258,24 @@ let p5and95 = (p5, p95) => contain(SymbolicDist.Normal.from90PercentCI(p5, p95)) let convertTwoInputs = (inputs: array): result => twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev)) +// let twoDistOrStdev = (a1:distOrNumber, a2:distOrNumber, fn) => { +// switch (a1, a2) { +// | (Number(a1), Number(a2)) => fn(a1, a2) +// | (Dist(a1), Number(a2)) => toSampleSetDist(a1, 1000)->sampleMap(r => fn(r, a2) |> sample) +// | (Number(a1), Dist(a2)) => toSampleSetDist(a2, 1000)->sampleMap(r => fn(a1, r) |> sample) +// | (Dist(a1), Dist(a2)) => SampleSetDist.map2(a1, a2, (m, s) => fn(m, s) |> sample) +// } +// } + let normal = Function.make( "Normal", [ Function.makeDefinition("normal", [I_Numeric, I_Numeric], inputs => twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev)) ), + Function.makeDefinition("normal", [I_DistOrNumber, I_DistOrNumber], inputs => + twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev)) + ), Function.makeDefinition( "normal", [I_Record([("mean", I_Numeric), ("stdev", I_Numeric)])], From db050668d121e34d16351b4375eabb0e16f993c2 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 5 May 2022 21:45:25 +0200 Subject: [PATCH 140/340] parser toFunction additive multiplicative compact whitespace pow relational equality boolean whitespace separator left associative operators expression not identifier function call array constructor string indexed values ident priority block outerBlock optional final expression statement separator outerBlock innerBlock better errors note xor white space and record unary minus inner/outer block statement lambda sort lambda is a value constructor lambdaCall ternary ternary basicValue cleanup quotes chained Functions dot operators unify unary operators unify unary operatos notes notes notes notes parser priorities set white space or newline defined allow newlines notes function call has become a post operator recordElement recursive index postOperatorToFunction better integer comments notes record priority comment atom finalComment generated parser type cast format initiate test file test initiated; todo nodeCall; nodeExpression callIdentifier recover extra initiate testing initial tests pass tests pass remove function node ternary test parse passed to tests pass notes sort toExpression format notes remove unused modules remove unnecessary nodeLambdaCall notes note fix construct array comment test todo elixir pipe fix toString notes initial to expression test value test parsing records records comments ternary ifthenelse inner block passed inner block lambda lambda new parser tested now test tricks ternary in expression to test lambda as argument to test lambda in structures Use peggy Parser expectEvalError macros tested remove mathjs parse reducer test comparison operator --- .../Reducer_Dispatch_BuiltInMacros_test.res | 16 +- .../Reducer_Dispatch_BuiltIn_test.res | 2 +- .../Reducer_MathJsParse_test.res | 74 - .../Reducer_Peggy_Parse_test.res | 142 + .../Reducer_Peggy_ToExpression_test.res | 133 + .../__tests__/Reducer/Reducer_TestHelpers.res | 4 + .../Reducer/Reducer_externalBindings_test.res | 53 +- .../Reducer/Reducer_functionTricks_test.res | 27 +- .../__tests__/Reducer/Reducer_test.res | 69 +- packages/squiggle-lang/package.json | 1 + .../Reducer_Dispatch_BuiltIn.res | 8 +- .../Reducer_Dispatch_BuiltInMacros.res | 4 +- .../Reducer_Expression/Reducer_Expression.res | 17 +- .../Reducer_Expression_T.res | 6 + .../Reducer/Reducer_MathJs/Reducer_MathJs.res | 2 - .../Reducer_MathJs/Reducer_MathJs_Parse.res | 182 - .../Reducer_MathJs_ToExpression.res | 154 - .../Reducer_Peggy_GeneratedParser.js | 4273 +++++++++++++++++ .../Reducer_Peggy_GeneratedParser.pegjs | 321 ++ .../Reducer_Peggy/Reducer_Peggy_Parse.res | 109 + .../Reducer_Peggy_ToExpression.res | 49 + .../ReducerInterface_ExpressionValue.res | 6 + 22 files changed, 5103 insertions(+), 549 deletions(-) delete mode 100644 packages/squiggle-lang/__tests__/Reducer/Reducer_MathJs/Reducer_MathJsParse_test.res create mode 100644 packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res create mode 100644 packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res delete mode 100644 packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_Parse.res delete mode 100644 packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_ToExpression.res create mode 100644 packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js create mode 100644 packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs create mode 100644 packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_Parse.res create mode 100644 packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res index 7bbc43dd..e4c2e456 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res @@ -16,33 +16,33 @@ testMacro([], exampleExpression, "Ok(1)") describe("bindStatement", () => { // A statement is bound by the bindings created by the previous statement - testMacro([], eBindStatement(eBindings([]), exampleStatementY), "Ok((:$setBindings {} :y 1))") + testMacro([], eBindStatement(eBindings([]), exampleStatementY), "Ok((:$setBindings {} :y 1) context: {})") // Then it answers the bindings for the next statement when reduced testMacroEval([], eBindStatement(eBindings([]), exampleStatementY), "Ok({y: 1})") // Now let's feed a binding to see what happens testMacro( [], eBindStatement(eBindings([("x", EvNumber(2.))]), exampleStatementX), - "Ok((:$setBindings {x: 2} :y 2))", + "Ok((:$setBindings {x: 2} :y 2) context: {x: 2})", ) // An expression does not return a binding, thus error - testMacro([], eBindStatement(eBindings([]), exampleExpression), "Error(Assignment expected)") + testMacro([], eBindStatement(eBindings([]), exampleExpression), "Assignment expected") // When bindings from previous statement are missing the context is injected. This must be the first statement of a block testMacro( [("z", EvNumber(99.))], eBindStatementDefault(exampleStatementY), - "Ok((:$setBindings {z: 99} :y 1))", + "Ok((:$setBindings {z: 99} :y 1) context: {z: 99})", ) }) describe("bindExpression", () => { // x is simply bound in the expression - testMacro([], eBindExpression(eBindings([("x", EvNumber(2.))]), eSymbol("x")), "Ok(2)") + testMacro([], eBindExpression(eBindings([("x", EvNumber(2.))]), eSymbol("x")), "Ok(2 context: {x: 2})") // When an let statement is the end expression then bindings are returned testMacro( [], eBindExpression(eBindings([("x", EvNumber(2.))]), exampleStatementY), - "Ok((:$exportBindings (:$setBindings {x: 2} :y 1)))", + "Ok((:$exportBindings (:$setBindings {x: 2} :y 1)) context: {x: 2})", ) // Now let's reduce that expression testMacroEval( @@ -110,7 +110,7 @@ describe("block", () => { }), "Ok((:$$bindExpression (:$$block (:$let :y (:add :x 1)) :y)))", ) - MyOnly.testMacroEval( + testMacroEval( [("x", EvNumber(1.))], eBlock(list{ eBlock(list{ @@ -125,7 +125,7 @@ describe("block", () => { describe("lambda", () => { // assign a lambda to a variable let lambdaExpression = eFunction("$$lambda", list{eArrayString(["y"]), exampleExpressionY}) - testMacro([], lambdaExpression, "Ok(lambda(y=>internal))") + testMacro([], lambdaExpression, "Ok(lambda(y=>internal code))") // call a lambda let callLambdaExpression = list{lambdaExpression, eNumber(1.)}->ExpressionT.EList testMacro([], callLambdaExpression, "Ok(((:$$lambda [y] :y) 1))") 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 f376094a..3e29b191 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 @@ -22,6 +22,6 @@ describe("builtin", () => { describe("builtin exception", () => { //It's a pity that MathJs does not return error position test("MathJs Exception", () => - expectEvalToBe("testZadanga()", "Error(JS Exception: Error: Undefined function testZadanga)") + expectEvalToBe("testZadanga(1)", "Error(JS Exception: Error: Undefined function testZadanga)") ) }) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_MathJs/Reducer_MathJsParse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_MathJs/Reducer_MathJsParse_test.res deleted file mode 100644 index b6c8c290..00000000 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_MathJs/Reducer_MathJsParse_test.res +++ /dev/null @@ -1,74 +0,0 @@ -module Parse = Reducer_MathJs.Parse -module Result = Belt.Result - -open Jest -open Expect - -let expectParseToBe = (expr, answer) => - Parse.parse(expr)->Result.flatMap(Parse.castNodeType)->Parse.toStringResult->expect->toBe(answer) - -let testParse = (expr, answer) => test(expr, () => expectParseToBe(expr, answer)) - -let testDescriptionParse = (desc, expr, answer) => test(desc, () => expectParseToBe(expr, answer)) - -module MySkip = { - let testParse = (expr, answer) => Skip.test(expr, () => expectParseToBe(expr, answer)) - - let testDescriptionParse = (desc, expr, answer) => - Skip.test(desc, () => expectParseToBe(expr, answer)) -} - -module MyOnly = { - let testParse = (expr, answer) => Only.test(expr, () => expectParseToBe(expr, answer)) - let testDescriptionParse = (desc, expr, answer) => - Only.test(desc, () => expectParseToBe(expr, answer)) -} - -describe("MathJs parse", () => { - describe("literals operators parenthesis", () => { - testParse("1", "1") - testParse("'hello'", "'hello'") - testParse("true", "true") - testParse("1+2", "add(1, 2)") - testParse("add(1,2)", "add(1, 2)") - testParse("(1)", "(1)") - testParse("(1+2)", "(add(1, 2))") - }) - - describe("multi-line", () => { - testParse("1; 2", "{1; 2}") - }) - - describe("variables", () => { - testParse("x = 1", "x = 1") - testParse("x", "x") - testParse("x = 1; x", "{x = 1; x}") - }) - - describe("functions", () => { - testParse("identity(x) = x", "identity = (x) => x") - testParse("identity(x)", "identity(x)") - }) - - describe("arrays", () => { - testDescriptionParse("empty", "[]", "[]") - testDescriptionParse("define", "[0, 1, 2]", "[0, 1, 2]") - testDescriptionParse("define with strings", "['hello', 'world']", "['hello', 'world']") - testParse("range(0, 4)", "range(0, 4)") - testDescriptionParse("index", "([0,1,2])[1]", "([0, 1, 2])[1]") - }) - - describe("records", () => { - testDescriptionParse("define", "{a: 1, b: 2}", "{a: 1, b: 2}") - testDescriptionParse("use", "record.property", "record['property']") - }) - - describe("comments", () => { - testDescriptionParse("define", "1 # This is a comment", "1") - }) - - describe("ternary operator", () => { - testParse("1 ? 2 : 3", "ternary(1, 2, 3)") - testParse("1 ? 2 : 3 ? 4 : 5", "ternary(1, 2, ternary(3, 4, 5))") - }) -}) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res new file mode 100644 index 00000000..1553b6df --- /dev/null +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -0,0 +1,142 @@ +module Parse = Reducer_Peggy_Parse +module Result = Belt.Result + +open Jest +open Expect + +let expectParseToBe = (expr, answer) => + Parse.parse(expr)->Parse.toStringResult->expect->toBe(answer) + +let testParse = (expr, answer) => test(expr, () => expectParseToBe(expr, answer)) + +module MySkip = { + let testParse = (expr, answer) => Skip.test(expr, () => expectParseToBe(expr, answer)) + + let testDescriptionParse = (desc, expr, answer) => + Skip.test(desc, () => expectParseToBe(expr, answer)) +} + +module MyOnly = { + let testParse = (expr, answer) => Only.test(expr, () => expectParseToBe(expr, answer)) + let testDescriptionParse = (desc, expr, answer) => + Only.test(desc, () => expectParseToBe(expr, answer)) +} + +describe("Peggy parse", () => { + describe("literals operators parenthesis", () => { + // Note that there is always an outer block. Otherwise, external bindings are ignrored at the first statement + testParse("1", "{1}") + testParse("'hello'", "{'hello'}") + testParse("true", "{true}") + testParse("1+2", "{(::add 1 2)}") + testParse("add(1,2)", "{(::add 1 2)}") + testParse("(1)", "{1}") + testParse("(1+2)", "{(::add 1 2)}") + }) + + describe("unary", () => { + testParse("-1", "{(::unaryMinus 1)}") + testParse("!true", "{(::not true)}") + testParse("1 + -1", "{(::add 1 (::unaryMinus 1))}") + testParse("-a[0]", "{(::unaryMinus (::$atIndex :a 0))}") + }) + + describe("multi-line", () => { + testParse("x=1; 2", "{:x = {1}; 2}") + testParse("x=1; y=2", "{:x = {1}; :y = {2}}") + }) + + describe("variables", () => { + testParse("x = 1", "{:x = {1}}") + testParse("x", "{:x}") + testParse("x = 1; x", "{:x = {1}; :x}") + }) + + describe("functions", () => { + testParse("identity(x) = x", "{:identity = {|:x| {:x}}}") // Function definitions become lambda assignments + testParse("identity(x)", "{(::identity :x)}") + }) + + describe("arrays", () => { + testParse("[]", "{(::$constructArray ())}") + testParse("[0, 1, 2]", "{(::$constructArray (0 1 2))}") + testParse("['hello', 'world']", "{(::$constructArray ('hello' 'world'))}") + testParse("([0,1,2])[1]", "{(::$atIndex (::$constructArray (0 1 2)) 1)}") + }) + + describe("records", () => { + testParse("{a: 1, b: 2}", "{(::$constructRecord ('a': 1 'b': 2))}") + testParse("{1+0: 1, 2+0: 2}", "{(::$constructRecord ((::add 1 0): 1 (::add 2 0): 2))}") // key can be any expression + testParse("record.property", "{(::$atIndex :record 'property')}") + }) + + describe("comments", () => { + testParse("1 # This is a line comment", "{1}") + testParse("1 // This is a line comment", "{1}") + testParse("1 /* This is a multi line comment */", "{1}") + testParse("/* This is a multi line comment */ 1", "{1}") + }) + + describe("ternary operator", () => { + testParse("1 ? 2 : 3", "{(::$$ternary 1 2 3)}") + testParse("1 ? 2 : 3 ? 4 : 5", "{(::$$ternary 1 2 (::$$ternary 3 4 5))}") // nested ternary + }) + + describe("if then else", () => { + testParse("if 1 then 2 else 3", "{(::$$ternary 1 {2} {3})}") + testParse("if 1 then {2} else {3}", "{(::$$ternary 1 {2} {3})}") + testParse( + "if 1 then {2} else if 3 then {4} else {5}", + "{(::$$ternary 1 {2} (::$$ternary 3 {4} {5}))}", + ) //nested if + }) + + describe("pipe", () => { + testParse("1 -> add(2)", "{(::add 1 2)}") + testParse("-1 -> add(2)", "{(::add (::unaryMinus 1) 2)}") + testParse("1 -> add(2) * 3", "{(::multiply (::add 1 2) 3)}") + }) + + describe("elixir pipe", () => { + testParse("1 |> add(2)", "{(::add 1 2)}") + }) + + describe("to", () => { + testParse("1 to 2", "{(::credibleIntervalToDistribution 1 2)}") + testParse("-1 to -2", "{(::credibleIntervalToDistribution (::unaryMinus 1) (::unaryMinus 2))}") // lower than unary + testParse( + "a[1] to a[2]", + "{(::credibleIntervalToDistribution (::$atIndex :a 1) (::$atIndex :a 2))}", + ) // lower than post + testParse( + "a.p1 to a.p2", + "{(::credibleIntervalToDistribution (::$atIndex :a 'p1') (::$atIndex :a 'p2'))}", + ) // lower than post + testParse("1 to 2 + 3", "{(::add (::credibleIntervalToDistribution 1 2) 3)}") // higher than binary operators + testParse( + "1->add(2) to 3->add(4) -> add(4)", + "{(::credibleIntervalToDistribution (::add 1 2) (::add (::add 3 4) 4))}", + ) // lower than chain + }) + + describe("inner block", () => { + // inner blocks are 0 argument lambdas. They can be used whenever a value is required. + // Like lambdas they have a local scope. + testParse("x={y=1; y}; x", "{:x = {:y = {1}; :y}; :x}") + }) + + describe("lambda", () => { + testParse("{|x| x}", "{{|:x| {:x}}}") + testParse("f={|x| x}", "{:f = {{|:x| {:x}}}}") + testParse("f(x)=x", "{:f = {|:x| {:x}}}") // Function definitions are lambda assignments + testParse("f(x)=x ? 1 : 0", "{:f = {|:x| {(::$$ternary :x 1 0)}}}") // Function definitions are lambda assignments + }) + + describe("Using lambda as value", () => { + testParse("myadd(x,y)=x+y; z=myadd; z", "{:myadd = {|:x,:y| {(::add :x :y)}}; :z = {:myadd}; :z}") + testParse("myadd(x,y)=x+y; z=[myadd]; z", "{:myadd = {|:x,:y| {(::add :x :y)}}; :z = {(::$constructArray (:myadd))}; :z}") + testParse("myaddd(x,y)=x+y; z={x: myaddd}; z", "{:myaddd = {|:x,:y| {(::add :x :y)}}; :z = {(::$constructRecord ('x': :myaddd))}; :z}") + }) +}) + + diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res new file mode 100644 index 00000000..81326456 --- /dev/null +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res @@ -0,0 +1,133 @@ +module Expression = Reducer_Expression +module ExpressionT = Reducer_Expression_T +module ExpressionValue = ReducerInterface_ExpressionValue +module Parse = Reducer_Peggy_Parse +module ToExpression = Reducer_Peggy_ToExpression +module Result = Belt.Result + +open Jest +open Expect + +let expectToExpressionToBe = (expr, answer, ~v="_", ()) => { + let rExpr = Parse.parse(expr) + ->Result.map(ToExpression.fromNode) + let a1 = rExpr->ExpressionT.toStringResultOkless + if (v=="_") { + a1->expect->toBe(answer) + } else { + let a2 = rExpr->Result.flatMap( + expr => Expression.reduceExpression(expr, Belt.Map.String.empty, ExpressionValue.defaultEnvironment) + )->ExpressionValue.toStringResultOkless + (a1, a2)->expect->toEqual((answer, v)) + } +} + +let testToExpression = (expr, answer, ~v="_", ()) => test(expr, () => expectToExpressionToBe(expr, answer, ~v=v, ())) + +module MySkip = { + let testToExpression = (expr, answer, ~v="_", ()) => Skip.test(expr, () => expectToExpressionToBe(expr, answer, ~v=v, ())) +} + +module MyOnly = { + let testToExpression = (expr, answer, ~v="_", ()) => Only.test(expr, () => expectToExpressionToBe(expr, answer, ~v=v, ())) +} + +describe("Peggy to Expression", () => { + describe("literals operators parenthesis", () => { + // Note that there is always an outer block. Otherwise, external bindings are ignrored at the first statement + testToExpression("1", "(:$$block 1)", ~v="1", ()) + testToExpression("'hello'", "(:$$block 'hello')", ~v="'hello'", ()) + testToExpression("true", "(:$$block true)", ~v="true", ()) + testToExpression("1+2", "(:$$block (:add 1 2))", ~v="3", ()) + testToExpression("add(1,2)", "(:$$block (:add 1 2))", ~v="3", ()) + testToExpression("(1)", "(:$$block 1)", ()) + testToExpression("(1+2)", "(:$$block (:add 1 2))", ()) + }) + + describe("unary", () => { + testToExpression("-1", "(:$$block (:unaryMinus 1))", ~v="-1", ()) + testToExpression("!true", "(:$$block (:not true))", ~v="false", ()) + testToExpression("1 + -1", "(:$$block (:add 1 (:unaryMinus 1)))", ~v="0", ()) + testToExpression("-a[0]", "(:$$block (:unaryMinus (:$atIndex :a 0)))", ()) + }) + + describe("multi-line", () => { + testToExpression("x=1; 2", "(:$$block (:$let :x (:$$block 1)) 2)", ~v="2", ()) + testToExpression("x=1; y=2", "(:$$block (:$let :x (:$$block 1)) (:$let :y (:$$block 2)))", ~v="{x: 1,y: 2}", ()) + }) + + describe("variables", () => { + testToExpression("x = 1", "(:$$block (:$let :x (:$$block 1)))", ~v="{x: 1}", ()) + testToExpression("x", "(:$$block :x)", ~v=":x", ()) //TODO: value should return error + testToExpression("x = 1; x", "(:$$block (:$let :x (:$$block 1)) :x)", ~v="1", ()) + }) + + describe("functions", () => { + testToExpression("identity(x) = x", "(:$$block (:$let :identity (:$$lambda [x] (:$$block :x))))", ~v="{identity: lambda(x=>internal code)}", ()) // Function definitions become lambda assignments + testToExpression("identity(x)", "(:$$block (:identity :x))", ()) // Note value returns error properly + }) + + describe("arrays", () => { + testToExpression("[]", "(:$$block (:$constructArray ()))", ~v="[]", ()) + testToExpression("[0, 1, 2]", "(:$$block (:$constructArray (0 1 2)))", ~v="[0,1,2]", ()) + testToExpression("['hello', 'world']", "(:$$block (:$constructArray ('hello' 'world')))", ~v="['hello','world']", ()) + testToExpression("([0,1,2])[1]", "(:$$block (:$atIndex (:$constructArray (0 1 2)) 1))", ~v="1", ()) + }) + + describe("records", () => { + testToExpression("{a: 1, b: 2}", "(:$$block (:$constructRecord (('a' 1) ('b' 2))))", ~v="{a: 1,b: 2}", ()) + testToExpression("{1+0: 1, 2+0: 2}", "(:$$block (:$constructRecord (((:add 1 0) 1) ((:add 2 0) 2))))", ()) // key can be any expression + testToExpression("record.property", "(:$$block (:$atIndex :record 'property'))", ()) + testToExpression("record={property: 1}; record.property", "(:$$block (:$let :record (:$$block (:$constructRecord (('property' 1))))) (:$atIndex :record 'property'))", ~v="1", ()) + }) + + describe("comments", () => { + testToExpression("1 # This is a line comment", "(:$$block 1)", ~v="1", ()) + testToExpression("1 // This is a line comment", "(:$$block 1)", ~v="1", ()) + testToExpression("1 /* This is a multi line comment */", "(:$$block 1)", ~v="1", ()) + testToExpression("/* This is a multi line comment */ 1", "(:$$block 1)", ~v="1", ()) + }) + + describe("ternary operator", () => { + testToExpression("true ? 1 : 0", "(:$$block (:$$ternary true 1 0))", ~v="1", ()) + testToExpression("false ? 1 : 0", "(:$$block (:$$ternary false 1 0))", ~v="0", ()) + testToExpression("true ? 1 : false ? 2 : 0", "(:$$block (:$$ternary true 1 (:$$ternary false 2 0)))", ~v="1", ()) // nested ternary + testToExpression("false ? 1 : false ? 2 : 0", "(:$$block (:$$ternary false 1 (:$$ternary false 2 0)))", ~v="0", ()) // nested ternary + }) + + describe("if then else", () => { + testToExpression("if true then 2 else 3", "(:$$block (:$$ternary true (:$$block 2) (:$$block 3)))", ()) + testToExpression("if true then {2} else {3}", "(:$$block (:$$ternary true (:$$block 2) (:$$block 3)))", ()) + testToExpression( + "if false then {2} else if false then {4} else {5}", + "(:$$block (:$$ternary false (:$$block 2) (:$$ternary false (:$$block 4) (:$$block 5))))", () + ) //nested if + }) + + describe("pipe", () => { + testToExpression("1 -> add(2)", "(:$$block (:add 1 2))", ~v="3", ()) + testToExpression("-1 -> add(2)", "(:$$block (:add (:unaryMinus 1) 2))", ~v="1", ()) // note that unary has higher priority naturally + testToExpression("1 -> add(2) * 3", "(:$$block (:multiply (:add 1 2) 3))", ~v="9", ()) + }) + + describe("elixir pipe", () => { + testToExpression("1 |> add(2)", "(:$$block (:add 1 2))", ~v="3", ()) + }) + + // see testParse for priorities of to and credibleIntervalToDistribution + + describe("inner block", () => { + // inner blocks are 0 argument lambdas. They can be used whenever a value is required. + // Like lambdas they have a local scope. + testToExpression("y=99; x={y=1; y}", "(:$$block (:$let :y (:$$block 99)) (:$let :x (:$$block (:$let :y (:$$block 1)) :y)))", ~v="{x: 1,y: 99}", ()) + }) + + describe("lambda", () => { + testToExpression("{|x| x}", "(:$$block (:$$lambda [x] (:$$block :x)))", ~v="lambda(x=>internal code)", ()) + testToExpression("f={|x| x}", "(:$$block (:$let :f (:$$block (:$$lambda [x] (:$$block :x)))))", ~v="{f: lambda(x=>internal code)}", ()) + testToExpression("f(x)=x","(:$$block (:$let :f (:$$lambda [x] (:$$block :x))))", ~v="{f: lambda(x=>internal code)}", ()) // Function definitions are lambda assignments + testToExpression("f(x)=x ? 1 : 0", "(:$$block (:$let :f (:$$lambda [x] (:$$block (:$$ternary :x 1 0)))))", ~v="{f: lambda(x=>internal code)}", ()) + }) +}) + + diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_TestHelpers.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_TestHelpers.res index 766acd43..6ec9930c 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_TestHelpers.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_TestHelpers.res @@ -19,6 +19,9 @@ let expectParseToBe = (expr: string, answer: string) => let expectEvalToBe = (expr: string, answer: string) => Reducer.evaluate(expr)->ExpressionValue.toStringResult->expect->toBe(answer) +let expectEvalError = (expr: string) => + Reducer.evaluate(expr)->ExpressionValue.toStringResult->expect->toMatch("Error\(") + let expectEvalBindingsToBe = (expr: string, bindings: Reducer.externalBindings, answer: string) => Reducer.evaluateUsingOptions(expr, ~externalBindings=Some(bindings), ~environment=None) ->ExpressionValue.toStringResult @@ -29,6 +32,7 @@ let testParseToBe = (expr, answer) => test(expr, () => expectParseToBe(expr, ans let testDescriptionParseToBe = (desc, expr, answer) => test(desc, () => expectParseToBe(expr, answer)) +let testEvalError = expr => test(expr, () => expectEvalError(expr)) let testEvalToBe = (expr, answer) => test(expr, () => expectEvalToBe(expr, answer)) let testDescriptionEvalToBe = (desc, expr, answer) => test(desc, () => expectEvalToBe(expr, answer)) let testEvalBindingsToBe = (expr, bindingsList, answer) => diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res index 3a903343..25a7371d 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res @@ -2,62 +2,11 @@ open Jest open Reducer_TestHelpers -// describe("Parse for Bindings", () => { -// testParseOuterToBe("x", "Ok((:$$bindExpression (:$$bindings) :x))") -// testParseOuterToBe("x+1", "Ok((:$$bindExpression (:$$bindings) (:add :x 1)))") -// testParseOuterToBe( -// "y = x+1; y", -// "Ok((:$$bindExpression (:$$bindStatement (:$$bindings) (:$let :y (:add :x 1))) :y))", -// ) -// }) - -// describe("Parse Partial", () => { -// testParsePartialToBe( -// "x", -// "Ok((:$$bindExpression (:$$bindStatement (:$$bindings) :x) (:$exportVariablesExpression)))", -// ) -// testParsePartialToBe( -// "y=x", -// "Ok((:$$bindExpression (:$$bindStatement (:$$bindings) (:$let :y :x)) (:$exportVariablesExpression)))", -// ) -// testParsePartialToBe( -// "y=x+1", -// "Ok((:$$bindExpression (:$$bindStatement (:$$bindings) (:$let :y (:add :x 1))) (:$exportVariablesExpression)))", -// ) -// testParsePartialToBe( -// "y = x+1; z = y", -// "Ok((:$$bindExpression (:$$bindStatement (:$$bindStatement (:$$bindings) (:$let :y (:add :x 1))) (:$let :z :y)) (:$exportVariablesExpression)))", -// ) -// }) - describe("Eval with Bindings", () => { testEvalBindingsToBe("x", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(1)") testEvalBindingsToBe("x+1", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(2)") - testParseToBe("y = x+1; y", "Ok((:$$block (:$$block (:$let :y (:add :x 1)) :y)))") + testParseToBe("y = x+1; y", "Ok((:$$block (:$let :y (:$$block (:add :x 1))) :y))") testEvalBindingsToBe("y = x+1; y", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(2)") testEvalBindingsToBe("y = x+1", list{("x", ExpressionValue.EvNumber(1.))}, "Ok({x: 1,y: 2})") }) -/* - Partial code is a partial code fragment that is cut out from a larger code. - Therefore it does not end with an expression. -*/ -// describe("Eval Partial", () => { -// testEvalPartialBindingsToBe( -// // A partial cannot end with an expression -// "x", -// list{("x", ExpressionValue.EvNumber(1.))}, -// "Error(Assignment expected)", -// ) -// testEvalPartialBindingsToBe("y=x", list{("x", ExpressionValue.EvNumber(1.))}, "Ok({x: 1,y: 1})") -// testEvalPartialBindingsToBe( -// "y=x+1", -// list{("x", ExpressionValue.EvNumber(1.))}, -// "Ok({x: 1,y: 2})", -// ) -// testEvalPartialBindingsToBe( -// "y = x+1; z = y", -// list{("x", ExpressionValue.EvNumber(1.))}, -// "Ok({x: 1,y: 2,z: 2})", -// ) -// }) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res index d9f7e7c8..66df8f14 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res @@ -51,7 +51,7 @@ describe("call and bindings", () => { ) testParseToBe( "f=99; g(x)=f; g(2)", - "Ok((:$$block (:$$block (:$let :f 99) (:$let :g (:$$lambda [x] (:$$block :f))) (:g 2))))", + "Ok((:$$block (:$let :f (:$$block 99)) (:$let :g (:$$lambda [x] (:$$block :f))) (:g 2)))", ) testEvalToBe("f=99; g(x)=f; g(2)", "Ok(99)") testEvalToBe("f(x)=x; g(x)=f(x); g(2)", "Ok(2)") @@ -63,15 +63,26 @@ describe("call and bindings", () => { }) describe("function tricks", () => { - testParseToBe( - "f(x)=f(y)=2; f(2)", - "Ok((:$$block (:$$block (:$let :f (:$$lambda [x] (:$$block (:$let :f (:$$lambda [y] (:$$block 2)))))) (:f 2))))", - ) - testEvalToBe("f(x)=f(y)=2; f(2)", "Ok({f: lambda(y=>internal code),x: 2})") + testEvalError("f(x)=f(y)=2; f(2)") //Error because chain assignment is not allowed testEvalToBe("y=2;g(x)=y+1;g(2)", "Ok(3)") testEvalToBe("y=2;g(x)=inspect(y)+1", "Ok({g: lambda(x=>internal code),y: 2})") MySkip.testEvalToBe("f(x) = x(x); f(f)", "????") // TODO: Infinite loop. Any solution? Catching proper exception or timeout? MySkip.testEvalToBe("f(x, x)=x+x; f(1,2)", "????") // TODO: Duplicate parameters - MySkip.testEvalToBe("myadd(x,y)=x+y; z=[add]; z[0](3,2)", "????") //TODO: to fix with new parser - MySkip.testEvalToBe("myaddd(x,y)=x+y; z={x: add}; z.x(3,2)", "????") //TODO: to fix with new parser + testEvalToBe("myadd(x,y)=x+y; z=myadd; z", "Ok(lambda(x,y=>internal code))") + testEvalToBe("myadd(x,y)=x+y; z=myadd; z(1, 1)", "Ok(2)") }) + +describe("lambda in structures", () => { + testEvalToBe("myadd(x,y)=x+y; z=[myadd]", "Ok({myadd: lambda(x,y=>internal code),z: [lambda(x,y=>internal code)]})") + testEvalToBe("myadd(x,y)=x+y; z=[myadd]; z[0]", "Ok(lambda(x,y=>internal code))") + testEvalToBe("myadd(x,y)=x+y; z=[myadd]; z[0](3,2)", "Ok(5)") + testEvalToBe("myaddd(x,y)=x+y; z={x: myaddd}; z", "Ok({x: lambda(x,y=>internal code)})") + testEvalToBe("myaddd(x,y)=x+y; z={x: myaddd}; z.x", "Ok(lambda(x,y=>internal code))") + testEvalToBe("myaddd(x,y)=x+y; z={x: myaddd}; z.x(3,2)", "Ok(5)") +}) + +describe("ternary and bindings", () => { + testEvalToBe("f(x)=x ? 1 : 0; f(true)", "Ok(1)") + testEvalToBe("f(x)=x>2 ? 1 : 0; f(3)", "Ok(1)") +}) + diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_test.res index 80468c0f..3d0989d8 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_test.res @@ -1,55 +1,9 @@ open Jest open Reducer_TestHelpers -describe("reducer using mathjs parse", () => { - // Test the MathJs parser compatibility - // Those tests toString that there is a semantic mapping from MathJs to Expression - // Reducer.parse is called by Reducer.eval - // See https://mathjs.org/docs/expressions/syntax.html - // See https://mathjs.org/docs/reference/functions.html - // Those tests toString that we are converting mathjs parse tree to what we need - - describe("expressions", () => { - testParseToBe("1", "Ok((:$$block 1))") - testParseToBe("(1)", "Ok((:$$block 1))") - testParseToBe("1+2", "Ok((:$$block (:add 1 2)))") - testParseToBe("1+2*3", "Ok((:$$block (:add 1 (:multiply 2 3))))") - }) - describe("arrays", () => { - //Note. () is a empty list in Lisp - // The only builtin structure in Lisp is list. There are no arrays - // [1,2,3] becomes (1 2 3) - testDescriptionParseToBe("empty", "[]", "Ok((:$$block ()))") - testParseToBe("[1, 2, 3]", "Ok((:$$block (1 2 3)))") - testParseToBe("['hello', 'world']", "Ok((:$$block ('hello' 'world')))") - testDescriptionParseToBe("index", "([0,1,2])[1]", "Ok((:$$block (:$atIndex (0 1 2) (1))))") - }) - describe("records", () => { - testDescriptionParseToBe( - "define", - "{a: 1, b: 2}", - "Ok((:$$block (:$constructRecord (('a' 1) ('b' 2)))))", - ) - testDescriptionParseToBe( - "use", - "{a: 1, b: 2}.a", - "Ok((:$$block (:$atIndex (:$constructRecord (('a' 1) ('b' 2))) ('a'))))", - ) - }) - describe("multi-line", () => { - testParseToBe("1; 2", "Ok((:$$block (:$$block 1 2)))") - testParseToBe("1+1; 2+1", "Ok((:$$block (:$$block (:add 1 1) (:add 2 1))))") - }) - describe("assignment", () => { - testParseToBe("x=1; x", "Ok((:$$block (:$$block (:$let :x 1) :x)))") - testParseToBe("x=1+1; x+1", "Ok((:$$block (:$$block (:$let :x (:add 1 1)) (:add :x 1))))") - }) -}) - describe("eval", () => { // All MathJs operators and functions are builtin for string, float and boolean // .e.g + - / * > >= < <= == /= not and or - // See https://mathjs.org/docs/expressions/syntax.html // See https://mathjs.org/docs/reference/functions.html describe("expressions", () => { testEvalToBe("1", "Ok(1)") @@ -70,20 +24,21 @@ describe("eval", () => { }) describe("records", () => { test("define", () => expectEvalToBe("{a: 1, b: 2}", "Ok({a: 1,b: 2})")) - test("index", () => expectEvalToBe("{a: 1}.a", "Ok(1)")) - test("index not found", () => expectEvalToBe("{a: 1}.b", "Error(Record property not found: b)")) + test("index", () => expectEvalToBe("r = {a: 1}; r.a", "Ok(1)")) + test("index", () => expectEvalToBe("r = {a: 1}; r.b", "Error(Record property not found: b)")) + testEvalError("{a: 1}.b") // invalid syntax }) describe("multi-line", () => { - testEvalToBe("1; 2", "Error(Assignment expected)") - testEvalToBe("1+1; 2+1", "Error(Assignment expected)") + testEvalError("1; 2") + testEvalError("1+1; 2+1") }) describe("assignment", () => { testEvalToBe("x=1; x", "Ok(1)") testEvalToBe("x=1+1; x+1", "Ok(3)") testEvalToBe("x=1; y=x+1; y+1", "Ok(3)") - testEvalToBe("1; x=1", "Error(Assignment expected)") - testEvalToBe("1; 1", "Error(Assignment expected)") + testEvalError("1; x=1") + testEvalError("1; 1") testEvalToBe("x=1; x=1", "Ok({x: 1})") }) }) @@ -94,9 +49,9 @@ describe("test exceptions", () => { "javascriptraise('div by 0')", "Error(JS Exception: Error: 'div by 0')", ) - testDescriptionEvalToBe( - "rescript exception", - "rescriptraise()", - "Error(TODO: unhandled rescript exception)", - ) + // testDescriptionEvalToBe( + // "rescript exception", + // "rescriptraise()", + // "Error(TODO: unhandled rescript exception)", + // ) }) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 97b710b6..7a6ddf74 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -4,6 +4,7 @@ "homepage": "https://squiggle-language.com", "license": "MIT", "scripts": { + "peggy": "peggy --cache ", "build": "yarn build:rescript && yarn build:typescript", "build:rescript": "rescript build -with-deps", "build:typescript": "tsc", diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res index d1a77040..98022417 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res @@ -13,6 +13,8 @@ open Reducer_ErrorValue DO NOT try to add external function mapping here! */ +//TODO: pow to xor + exception TestRescriptException let callInternal = (call: functionCall, environment, reducer: ExpressionT.reducerFn): result< @@ -116,9 +118,9 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce } switch call { - | ("$atIndex", [EvArray(aValueArray), EvArray([EvNumber(fIndex)])]) => - arrayAtIndex(aValueArray, fIndex) - | ("$atIndex", [EvRecord(dict), EvArray([EvString(sIndex)])]) => recordAtIndex(dict, sIndex) + | ("$atIndex", [EvArray(aValueArray), EvNumber(fIndex)]) => arrayAtIndex(aValueArray, fIndex) + | ("$atIndex", [EvRecord(dict), EvString(sIndex)]) => recordAtIndex(dict, sIndex) + | ("$constructArray", [EvArray(aValueArray)]) => EvArray(aValueArray)->Ok | ("$constructRecord", [EvArray(arrayOfPairs)]) => constructRecord(arrayOfPairs) | ("$exportBindings", [EvRecord(externalBindings)]) => doExportBindings(externalBindings) | ("$setBindings", [EvRecord(externalBindings), EvSymbol(symbol), value]) => diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res index a771dd32..afb9ec26 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res @@ -4,6 +4,7 @@ Macros are used to define language building blocks. They are like Lisp macros. */ module Bindings = Reducer_Expression_Bindings +module ExpressionBuilder = Reducer_Expression_ExpressionBuilder module ExpressionT = Reducer_Expression_T module ExpressionValue = ReducerInterface.ExpressionValue module ExpressionWithContext = Reducer_ExpressionWithContext @@ -139,7 +140,8 @@ let dispatchMacroCall = ( bindings: ExpressionT.bindings, environment, ): result => { - let rCondition = reduceExpression(condition, bindings, environment) + let blockCondition = ExpressionBuilder.eBlock(list{condition}) + let rCondition = reduceExpression(blockCondition, bindings, environment) rCondition->Result.flatMap(conditionValue => switch conditionValue { | ExpressionValue.EvBool(false) => ExpressionWithContext.noContext(ifFalse)->Ok diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res index 81830e84..6883fe51 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res @@ -18,13 +18,10 @@ type internalCode = ReducerInterface_ExpressionValue.internalCode type t = expression /* - Converts a MathJs code to expression + Converts a Squigle code to expression */ -let parse_ = (expr: string, parser, converter): result => - expr->parser->Result.flatMap(node => converter(node)) - -let parse = (mathJsCode: string): result => - mathJsCode->parse_(MathJs.Parse.parse, MathJs.ToExpression.fromNode) +let parse = (peggyCode: string): result => + peggyCode->Reducer_Peggy_Parse.parse->Result.map(node => Reducer_Peggy_ToExpression.fromNode(node)) /* Recursively evaluate/reduce the expression (Lisp AST) @@ -75,11 +72,17 @@ and reduceExpressionList = ( and reduceValueList = (valueList: list, environment): result< expressionValue, 'e, -> => +> => switch valueList { | list{EvCall(fName), ...args} => (fName, args->Belt.List.toArray)->BuiltIn.dispatch(environment, reduceExpression) + | list{EvLambda(_lamdaCall)} => + valueList + ->Lambda.checkIfReduced + ->Result.flatMap(reducedValueList => + reducedValueList->Belt.List.toArray->ExpressionValue.EvArray->Ok + ) | list{EvLambda(lamdaCall), ...args} => Lambda.doLambdaCall(lamdaCall, args, environment, reduceExpression) | _ => diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_T.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_T.res index b21ba8b7..65ba4c96 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_T.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_T.res @@ -42,6 +42,12 @@ let toStringResult = codeResult => | Error(m) => `Error(${Reducer_ErrorValue.errorToString(m)})` } +let toStringResultOkless = codeResult => + switch codeResult { + | Ok(a) => toString(a) + | Error(m) => `Error(${Reducer_ErrorValue.errorToString(m)})` + } + let inspect = (expr: expression): expression => { Js.log(toString(expr)) expr diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs.res index 38033109..640f010a 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs.res @@ -1,3 +1 @@ module Eval = Reducer_MathJs_Eval -module Parse = Reducer_MathJs_Parse -module ToExpression = Reducer_MathJs_ToExpression diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_Parse.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_Parse.res deleted file mode 100644 index 704d1d38..00000000 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_Parse.res +++ /dev/null @@ -1,182 +0,0 @@ -/* - MathJs Nodes - We make MathJs Nodes strong-typed -*/ -module Extra = Reducer_Extra -open Reducer_ErrorValue - -type node = {"type": string, "isNode": bool, "comment": string} -type arrayNode = {...node, "items": array} -type block = {"node": node} -type blockNode = {...node, "blocks": array} -type conditionalNode = {...node, "condition": node, "trueExpr": node, "falseExpr": node} -type constantNode = {...node, "value": unit} -type functionAssignmentNode = {...node, "name": string, "params": array, "expr": node} -type indexNode = {...node, "dimensions": array} -type objectNode = {...node, "properties": Js.Dict.t} -type accessorNode = {...node, "object": node, "index": indexNode, "name": string} -type parenthesisNode = {...node, "content": node} -//rangeNode -//relationalNode -type symbolNode = {...node, "name": string} -type functionNode = {...node, "fn": unit, "args": array} -type operatorNode = {...functionNode, "op": string} -type assignmentNode = {...node, "object": symbolNode, "value": node} -type assignmentNodeWAccessor = {...node, "object": accessorNode, "value": node} -type assignmentNodeWIndex = {...assignmentNodeWAccessor, "index": Js.null} - -external castAccessorNode: node => accessorNode = "%identity" -external castArrayNode: node => arrayNode = "%identity" -external castAssignmentNode: node => assignmentNode = "%identity" -external castAssignmentNodeWAccessor: node => assignmentNodeWAccessor = "%identity" -external castAssignmentNodeWIndex: node => assignmentNodeWIndex = "%identity" -external castBlockNode: node => blockNode = "%identity" -external castConditionalNode: node => conditionalNode = "%identity" -external castConstantNode: node => constantNode = "%identity" -external castFunctionAssignmentNode: node => functionAssignmentNode = "%identity" -external castFunctionNode: node => functionNode = "%identity" -external castIndexNode: node => indexNode = "%identity" -external castObjectNode: node => objectNode = "%identity" -external castOperatorNode: node => operatorNode = "%identity" -external castOperatorNodeToFunctionNode: operatorNode => functionNode = "%identity" -external castParenthesisNode: node => parenthesisNode = "%identity" -external castSymbolNode: node => symbolNode = "%identity" - -/* - MathJs Parser -*/ -@module("mathjs") external parse__: string => node = "parse" - -let parse = (expr: string): result => - try { - Ok(parse__(expr)) - } catch { - | Js.Exn.Error(obj) => REJavaScriptExn(Js.Exn.message(obj), Js.Exn.name(obj))->Error - } - -type mathJsNode = - | MjAccessorNode(accessorNode) - | MjArrayNode(arrayNode) - | MjAssignmentNode(assignmentNode) - | MjBlockNode(blockNode) - | MjConditionalNode(conditionalNode) - | MjConstantNode(constantNode) - | MjFunctionAssignmentNode(functionAssignmentNode) - | MjFunctionNode(functionNode) - | MjIndexNode(indexNode) - | MjObjectNode(objectNode) - | MjOperatorNode(operatorNode) - | MjParenthesisNode(parenthesisNode) - | MjSymbolNode(symbolNode) - -let castNodeType = (node: node) => { - let decideAssignmentNode = node => { - let iNode = node->castAssignmentNodeWIndex - if Js.null == iNode["index"] && iNode["object"]["type"] == "SymbolNode" { - node->castAssignmentNode->MjAssignmentNode->Ok - } else { - RESyntaxError("Assignment to index or property not supported")->Error - } - } - - switch node["type"] { - | "AccessorNode" => node->castAccessorNode->MjAccessorNode->Ok - | "ArrayNode" => node->castArrayNode->MjArrayNode->Ok - | "AssignmentNode" => node->decideAssignmentNode - | "BlockNode" => node->castBlockNode->MjBlockNode->Ok - | "ConditionalNode" => node->castConditionalNode->MjConditionalNode->Ok - | "ConstantNode" => node->castConstantNode->MjConstantNode->Ok - | "FunctionAssignmentNode" => node->castFunctionAssignmentNode->MjFunctionAssignmentNode->Ok - | "FunctionNode" => node->castFunctionNode->MjFunctionNode->Ok - | "IndexNode" => node->castIndexNode->MjIndexNode->Ok - | "ObjectNode" => node->castObjectNode->MjObjectNode->Ok - | "OperatorNode" => node->castOperatorNode->MjOperatorNode->Ok - | "ParenthesisNode" => node->castParenthesisNode->MjParenthesisNode->Ok - | "SymbolNode" => node->castSymbolNode->MjSymbolNode->Ok - | _ => RETodo(`Argg, unhandled MathJsNode: ${node["type"]}`)->Error - } -} - -external unitAsSymbolNode: unit => symbolNode = "%identity" -external unitAsString: unit => string = "%identity" - -let nameOfFunctionNode = (fNode: functionNode): string => { - let name = fNode["fn"] - if Js.typeof(name) == "string" { - name->unitAsString - } else { - (name->unitAsSymbolNode)["name"] - } -} - -let rec toString = (mathJsNode: mathJsNode): string => { - let toStringValue = (a: 'a): string => - if Js.typeof(a) == "string" { - `'${Js.String.make(a)}'` - } else { - Js.String.make(a) - } - - let toStringNodeArray = (nodeArray: array): string => - nodeArray - ->Belt.Array.map(a => toStringMathJsNode(a)) - ->Extra.Array.interperse(", ") - ->Js.String.concatMany("") - - let toStringFunctionAssignmentNode = (faNode: functionAssignmentNode): string => { - let paramNames = Js.Array2.toString(faNode["params"]) - `${faNode["name"]} = (${paramNames}) => ${toStringMathJsNode(faNode["expr"])}` - } - let toStringFunctionNode = (fnode: functionNode): string => - `${fnode->nameOfFunctionNode}(${fnode["args"]->toStringNodeArray})` - - let toStringObjectEntry = ((key: string, value: node)): string => - `${key}: ${value->toStringMathJsNode}` - - let toStringObjectNode = (oNode: objectNode): string => - `{${oNode["properties"] - ->Js.Dict.entries - ->Belt.Array.map(entry => entry->toStringObjectEntry) - ->Extra.Array.interperse(", ") - ->Js.String.concatMany("")}}` - - let toStringIndexNode = (iNode: indexNode): string => - iNode["dimensions"] - ->Belt.Array.map(each => toStringResult(each->castNodeType)) - ->Js.String.concatMany("") - - let toStringSymbolNode = (sNode: symbolNode): string => sNode["name"] - - let toStringBlocks = (blocks: array): string => - blocks - ->Belt.Array.map(each => each["node"]->castNodeType->toStringResult) - ->Extra.Array.interperse("; ") - ->Js.String.concatMany("") - - switch mathJsNode { - | MjAccessorNode(aNode) => - `${aNode["object"]->toStringMathJsNode}[${aNode["index"]->toStringIndexNode}]` - | MjArrayNode(aNode) => `[${aNode["items"]->toStringNodeArray}]` - | MjAssignmentNode(aNode) => - `${aNode["object"]->toStringSymbolNode} = ${aNode["value"]->toStringMathJsNode}` - | MjBlockNode(bNode) => `{${bNode["blocks"]->toStringBlocks}}` - | MjConditionalNode(cNode) => - `ternary(${toStringMathJsNode(cNode["condition"])}, ${toStringMathJsNode( - cNode["trueExpr"], - )}, ${toStringMathJsNode(cNode["falseExpr"])})` - | MjConstantNode(cNode) => cNode["value"]->toStringValue - | MjFunctionAssignmentNode(faNode) => faNode->toStringFunctionAssignmentNode - | MjFunctionNode(fNode) => fNode->toStringFunctionNode - | MjIndexNode(iNode) => iNode->toStringIndexNode - | MjObjectNode(oNode) => oNode->toStringObjectNode - | MjOperatorNode(opNode) => opNode->castOperatorNodeToFunctionNode->toStringFunctionNode - | MjParenthesisNode(pNode) => `(${toStringMathJsNode(pNode["content"])})` - | MjSymbolNode(sNode) => sNode->toStringSymbolNode - } -} -and toStringResult = (rMathJsNode: result): string => - switch rMathJsNode { - | Error(e) => errorToString(e) - | Ok(mathJsNode) => toString(mathJsNode) - } -and toStringMathJsNode = node => node->castNodeType->toStringResult diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_ToExpression.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_ToExpression.res deleted file mode 100644 index 6355de88..00000000 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_MathJs/Reducer_MathJs_ToExpression.res +++ /dev/null @@ -1,154 +0,0 @@ -/* * WARNING. DO NOT EDIT, BEAUTIFY, COMMENT ON OR REFACTOR THIS CODE. -We will stop using MathJs parser and -this whole file will go to trash -**/ -module ErrorValue = Reducer_ErrorValue -module ExpressionBuilder = Reducer_Expression_ExpressionBuilder -module ExpressionT = Reducer_Expression_T -module ExpressionValue = ReducerInterface.ExpressionValue -module JavaScript = Reducer_Js -module Parse = Reducer_MathJs_Parse -module Result = Belt.Result - -type errorValue = ErrorValue.errorValue -type expression = ExpressionT.expression -type expressionValue = ExpressionValue.expressionValue - -let blockToNode = block => block["node"] - -let rec fromInnerNode = (mathJsNode: Parse.node): result => - Parse.castNodeType(mathJsNode)->Result.flatMap(typedMathJsNode => { - let fromNodeList = (nodeList: list): result, 'e> => - Belt.List.reduceReverse(nodeList, Ok(list{}), (racc, currNode) => - racc->Result.flatMap(acc => - fromInnerNode(currNode)->Result.map(currCode => list{currCode, ...acc}) - ) - ) - - let caseFunctionNode = fNode => { - let rLispArgs = fNode["args"]->Belt.List.fromArray->fromNodeList - rLispArgs->Result.map(lispArgs => - ExpressionBuilder.eFunction(fNode->Parse.nameOfFunctionNode, lispArgs) - ) - } - - let caseObjectNode = oNode => { - let fromObjectEntries = entryList => { - let rargs = Belt.List.reduceReverse(entryList, Ok(list{}), ( - racc, - (key: string, value: Parse.node), - ) => - racc->Result.flatMap(acc => - fromInnerNode(value)->Result.map(valueExpression => { - let entryCode = - list{ExpressionBuilder.eString(key), valueExpression}->ExpressionT.EList - list{entryCode, ...acc} - }) - ) - ) - rargs->Result.flatMap(args => - ExpressionBuilder.eFunction("$constructRecord", list{ExpressionT.EList(args)})->Ok - ) // $constructRecord gets a single argument: List of key-value paiers - } - - oNode["properties"]->Js.Dict.entries->Belt.List.fromArray->fromObjectEntries - } - - let caseIndexNode = iNode => { - let rpropertyCodeList = Belt.List.reduceReverse( - iNode["dimensions"]->Belt.List.fromArray, - Ok(list{}), - (racc, currentPropertyMathJsNode) => - racc->Result.flatMap(acc => - fromInnerNode(currentPropertyMathJsNode)->Result.map(propertyCode => list{ - propertyCode, - ...acc, - }) - ), - ) - rpropertyCodeList->Result.map(propertyCodeList => ExpressionT.EList(propertyCodeList)) - } - - let caseAccessorNode = (objectNode, indexNode) => { - caseIndexNode(indexNode)->Result.flatMap(indexCode => { - fromInnerNode(objectNode)->Result.flatMap(objectCode => - ExpressionBuilder.eFunction("$atIndex", list{objectCode, indexCode})->Ok - ) - }) - } - - let caseBlock = (nodesArray: array): result => { - let rStatements: result, 'a> = - nodesArray - ->Belt.List.fromArray - ->Belt.List.reduceReverse(Ok(list{}), (racc, currNode) => - racc->Result.flatMap(acc => - fromInnerNode(currNode)->Result.map(currCode => list{currCode, ...acc}) - ) - ) - rStatements->Result.map(statements => ExpressionBuilder.eBlock(statements)) - } - - let caseAssignmentNode = aNode => { - let symbolName = aNode["object"]["name"] - let rValueExpression = fromInnerNode(aNode["value"]) - rValueExpression->Result.map(valueExpression => - ExpressionBuilder.eLetStatement(symbolName, valueExpression) - ) - } - - let caseFunctionAssignmentNode = faNode => { - let symbol = faNode["name"]->ExpressionBuilder.eSymbol - let rValueExpression = fromInnerNode(faNode["expr"]) - - rValueExpression->Result.flatMap(valueExpression => { - let lispParams = ExpressionBuilder.eArrayString(faNode["params"]) - let valueBlock = ExpressionBuilder.eBlock(list{valueExpression}) - let lambda = ExpressionBuilder.eFunction("$$lambda", list{lispParams, valueBlock}) - ExpressionBuilder.eFunction("$let", list{symbol, lambda})->Ok - }) - } - - let caseArrayNode = aNode => { - aNode["items"]->Belt.List.fromArray->fromNodeList->Result.map(list => ExpressionT.EList(list)) - } - - let caseConditionalNode = cndNode => { - let rCondition = fromInnerNode(cndNode["condition"]) - let rTrueExpr = fromInnerNode(cndNode["trueExpr"]) - let rFalse = fromInnerNode(cndNode["falseExpr"]) - - rCondition->Result.flatMap(condition => - rTrueExpr->Result.flatMap(trueExpr => - rFalse->Result.flatMap(falseExpr => - ExpressionBuilder.eFunction("$$ternary", list{condition, trueExpr, falseExpr})->Ok - ) - ) - ) - } - - let rFinalExpression: result = switch typedMathJsNode { - | MjAccessorNode(aNode) => caseAccessorNode(aNode["object"], aNode["index"]) - | MjArrayNode(aNode) => caseArrayNode(aNode) - | MjAssignmentNode(aNode) => caseAssignmentNode(aNode) - | MjSymbolNode(sNode) => { - let expr: expression = ExpressionBuilder.eSymbol(sNode["name"]) - let rExpr: result = expr->Ok - rExpr - } - | MjBlockNode(bNode) => bNode["blocks"]->Js.Array2.map(blockToNode)->caseBlock - | MjConditionalNode(cndNode) => caseConditionalNode(cndNode) - | MjConstantNode(cNode) => - cNode["value"]->JavaScript.Gate.jsToEv->Result.flatMap(v => v->ExpressionT.EValue->Ok) - | MjFunctionAssignmentNode(faNode) => caseFunctionAssignmentNode(faNode) - | MjFunctionNode(fNode) => fNode->caseFunctionNode - | MjIndexNode(iNode) => caseIndexNode(iNode) - | MjObjectNode(oNode) => caseObjectNode(oNode) - | MjOperatorNode(opNode) => opNode->Parse.castOperatorNodeToFunctionNode->caseFunctionNode - | MjParenthesisNode(pNode) => pNode["content"]->fromInnerNode - } - rFinalExpression - }) - -let fromNode = (node: Parse.node): result => - fromInnerNode(node)->Result.map(expr => ExpressionBuilder.eBlock(list{expr})) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js new file mode 100644 index 00000000..fa2d84ec --- /dev/null +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -0,0 +1,4273 @@ +// Generated by Peggy 1.2.0. +// +// https://peggyjs.org/ + +"use strict"; + + + var toFunction = { + '-': 'subtract', + '->': 'pipe', + '!=': 'unequal', + '.-': 'dotSubtract', + '.*': 'dotMultiply', + './': 'dotDivide', + '.^': 'dotPow', + '.+': 'dotAdd', + '*': 'multiply', + '/': 'divide', + '&&': 'and', + '^': 'pow', // or xor + '+': 'add', + '<': 'smaller', + '<=': 'smallerEq', + '==': 'equal', + '>': 'larger', + '>=': 'largerEq', + '||': 'or', + 'to': 'credibleIntervalToDistribution', + } + + var unaryToFunction = { + '-': 'unaryMinus', + '!': 'not', + '.-': 'unaryDotMinus', + } + + var postOperatorToFunction = { + '.': '$atIndex', + '()': '$$applyAll', + '[]': '$atIndex', + } + + function nodeBlock(statements) {return{type: 'Block', statements: statements}} + function nodeBoolean(value) {return {type: 'Boolean', value: value}} + function nodeCallIndentifier(value) {return {type: 'CallIdentifier', value: value}} + function nodeExpression(args) {return {type: 'Expression', nodes: args}} + function nodeFloat(value) {return {type: 'Float', value: value}} + function makeFunctionCall(fn, args) { + if (fn === '$$applyAll') { + // Any list of values is applied from left to right anyway. + // Like in Haskell and Lisp. + // So we remove the redundant $$applyAll. + if (args[0].type === "Identifier") {args[0].type = "CallIdentifier"} + return nodeExpression(args) + } else { + return nodeExpression([nodeCallIndentifier(fn), ...args]) + } + } + function nodeIdentifier(value) {return {type: 'Identifier', value: value}} + function nodeInteger(value) {return {type: 'Integer', value: value}} + function nodeKeyValue(key, value) { + if (key.type === 'Identifier') {key.type = 'String'} + return {type: 'KeyValue', key: key, value: value}} + function nodeLambda(args, body) {return {type: 'Lambda', args: args, body: body}} + function nodeLetStatment(variable, value) {return {type: 'LetStatement', variable: variable, value: value}} + function nodeString(value) {return {type: 'String', value: value}} + function nodeTernary(condition, trueExpression, falseExpression) {return {type: 'Ternary', condition: condition, trueExpression: trueExpression, falseExpression: falseExpression}} + + +function peg$subclass(child, parent) { + function C() { this.constructor = child; } + C.prototype = parent.prototype; + child.prototype = new C(); +} + +function peg$SyntaxError(message, expected, found, location) { + var self = Error.call(this, message); + if (Object.setPrototypeOf) { + Object.setPrototypeOf(self, peg$SyntaxError.prototype); + } + self.expected = expected; + self.found = found; + self.location = location; + self.name = "SyntaxError"; + return self; +} + +peg$subclass(peg$SyntaxError, Error); + +function peg$padEnd(str, targetLength, padString) { + padString = padString || " "; + if (str.length > targetLength) { return str; } + targetLength -= str.length; + padString += padString.repeat(targetLength); + return str + padString.slice(0, targetLength); +} + +peg$SyntaxError.prototype.format = function(sources) { + var str = "Error: " + this.message; + if (this.location) { + var src = null; + var k; + for (k = 0; k < sources.length; k++) { + if (sources[k].source === this.location.source) { + src = sources[k].text.split(/\r\n|\n|\r/g); + break; + } + } + var s = this.location.start; + var loc = this.location.source + ":" + s.line + ":" + s.column; + if (src) { + var e = this.location.end; + var filler = peg$padEnd("", s.line.toString().length); + var line = src[s.line - 1]; + var last = s.line === e.line ? e.column : line.length + 1; + str += "\n --> " + loc + "\n" + + filler + " |\n" + + s.line + " | " + line + "\n" + + filler + " | " + peg$padEnd("", s.column - 1) + + peg$padEnd("", last - s.column, "^"); + } else { + str += "\n at " + loc; + } + } + return str; +}; + +peg$SyntaxError.buildMessage = function(expected, found) { + var DESCRIBE_EXPECTATION_FNS = { + literal: function(expectation) { + return "\"" + literalEscape(expectation.text) + "\""; + }, + + class: function(expectation) { + var escapedParts = expectation.parts.map(function(part) { + return Array.isArray(part) + ? classEscape(part[0]) + "-" + classEscape(part[1]) + : classEscape(part); + }); + + return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]"; + }, + + any: function() { + return "any character"; + }, + + end: function() { + return "end of input"; + }, + + other: function(expectation) { + return expectation.description; + } + }; + + function hex(ch) { + return ch.charCodeAt(0).toString(16).toUpperCase(); + } + + function literalEscape(s) { + return s + .replace(/\\/g, "\\\\") + .replace(/"/g, "\\\"") + .replace(/\0/g, "\\0") + .replace(/\t/g, "\\t") + .replace(/\n/g, "\\n") + .replace(/\r/g, "\\r") + .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) + .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); + } + + function classEscape(s) { + return s + .replace(/\\/g, "\\\\") + .replace(/\]/g, "\\]") + .replace(/\^/g, "\\^") + .replace(/-/g, "\\-") + .replace(/\0/g, "\\0") + .replace(/\t/g, "\\t") + .replace(/\n/g, "\\n") + .replace(/\r/g, "\\r") + .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) + .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); + } + + function describeExpectation(expectation) { + return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation); + } + + function describeExpected(expected) { + var descriptions = expected.map(describeExpectation); + var i, j; + + descriptions.sort(); + + if (descriptions.length > 0) { + for (i = 1, j = 1; i < descriptions.length; i++) { + if (descriptions[i - 1] !== descriptions[i]) { + descriptions[j] = descriptions[i]; + j++; + } + } + descriptions.length = j; + } + + switch (descriptions.length) { + case 1: + return descriptions[0]; + + case 2: + return descriptions[0] + " or " + descriptions[1]; + + default: + return descriptions.slice(0, -1).join(", ") + + ", or " + + descriptions[descriptions.length - 1]; + } + } + + function describeFound(found) { + return found ? "\"" + literalEscape(found) + "\"" : "end of input"; + } + + return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found."; +}; + +function peg$parse(input, options) { + options = options !== undefined ? options : {}; + + var peg$FAILED = {}; + var peg$source = options.grammarSource; + + var peg$startRuleFunctions = { start: peg$parsestart }; + var peg$startRuleFunction = peg$parsestart; + + var peg$c0 = "{"; + var peg$c1 = "}"; + var peg$c2 = "="; + var peg$c3 = "("; + var peg$c4 = ")"; + var peg$c5 = ","; + var peg$c6 = "if"; + var peg$c7 = "then"; + var peg$c8 = "else"; + var peg$c9 = "?"; + var peg$c10 = ":"; + var peg$c11 = "&&"; + var peg$c12 = "||"; + var peg$c13 = "=="; + var peg$c14 = "!="; + var peg$c15 = "<="; + var peg$c16 = "<"; + var peg$c17 = ">="; + var peg$c18 = ">"; + var peg$c19 = "+"; + var peg$c20 = "-"; + var peg$c21 = ".+"; + var peg$c22 = ".-"; + var peg$c23 = "*"; + var peg$c24 = "/"; + var peg$c25 = ".*"; + var peg$c26 = "./"; + var peg$c27 = "^"; + var peg$c28 = ".^"; + var peg$c29 = "to"; + var peg$c30 = "->"; + var peg$c31 = "|>"; + var peg$c32 = "!"; + var peg$c33 = "["; + var peg$c34 = "]"; + var peg$c35 = "."; + var peg$c36 = "'"; + var peg$c37 = "\""; + var peg$c38 = "true"; + var peg$c39 = "false"; + var peg$c40 = "|"; + var peg$c41 = ";"; + var peg$c42 = "//"; + var peg$c43 = "#"; + var peg$c44 = "/*"; + var peg$c45 = "*/"; + + var peg$r0 = /^[_a-z]/; + var peg$r1 = /^[_a-z0-9]/i; + var peg$r2 = /^[^']/; + var peg$r3 = /^[^"]/; + var peg$r4 = /^[0-9]/; + var peg$r5 = /^[.]/; + var peg$r6 = /^[^\r\n]/; + var peg$r7 = /^[^*]/; + var peg$r8 = /^[ \t]/; + var peg$r9 = /^[\n\r]/; + + var peg$e0 = peg$literalExpectation("{", false); + var peg$e1 = peg$literalExpectation("}", false); + var peg$e2 = peg$literalExpectation("=", false); + var peg$e3 = peg$literalExpectation("(", false); + var peg$e4 = peg$literalExpectation(")", false); + var peg$e5 = peg$literalExpectation(",", false); + var peg$e6 = peg$literalExpectation("if", false); + var peg$e7 = peg$literalExpectation("then", false); + var peg$e8 = peg$literalExpectation("else", false); + var peg$e9 = peg$literalExpectation("?", false); + var peg$e10 = peg$literalExpectation(":", false); + var peg$e11 = peg$literalExpectation("&&", false); + var peg$e12 = peg$literalExpectation("||", false); + var peg$e13 = peg$literalExpectation("==", false); + var peg$e14 = peg$literalExpectation("!=", false); + var peg$e15 = peg$literalExpectation("<=", false); + var peg$e16 = peg$literalExpectation("<", false); + var peg$e17 = peg$literalExpectation(">=", false); + var peg$e18 = peg$literalExpectation(">", false); + var peg$e19 = peg$literalExpectation("+", false); + var peg$e20 = peg$literalExpectation("-", false); + var peg$e21 = peg$literalExpectation(".+", false); + var peg$e22 = peg$literalExpectation(".-", false); + var peg$e23 = peg$literalExpectation("*", false); + var peg$e24 = peg$literalExpectation("/", false); + var peg$e25 = peg$literalExpectation(".*", false); + var peg$e26 = peg$literalExpectation("./", false); + var peg$e27 = peg$literalExpectation("^", false); + var peg$e28 = peg$literalExpectation(".^", false); + var peg$e29 = peg$literalExpectation("to", false); + var peg$e30 = peg$literalExpectation("->", false); + var peg$e31 = peg$literalExpectation("|>", false); + var peg$e32 = peg$literalExpectation("!", false); + var peg$e33 = peg$literalExpectation("[", false); + var peg$e34 = peg$literalExpectation("]", false); + var peg$e35 = peg$literalExpectation(".", false); + var peg$e36 = peg$otherExpectation("identifier"); + var peg$e37 = peg$classExpectation(["_", ["a", "z"]], false, false); + var peg$e38 = peg$classExpectation(["_", ["a", "z"], ["0", "9"]], false, true); + var peg$e39 = peg$otherExpectation("string"); + var peg$e40 = peg$literalExpectation("'", false); + var peg$e41 = peg$classExpectation(["'"], true, false); + var peg$e42 = peg$literalExpectation("\"", false); + var peg$e43 = peg$classExpectation(["\""], true, false); + var peg$e44 = peg$otherExpectation("integer"); + var peg$e45 = peg$classExpectation([["0", "9"]], false, false); + var peg$e46 = peg$classExpectation(["."], false, false); + var peg$e47 = peg$otherExpectation("float"); + var peg$e48 = peg$otherExpectation("boolean"); + var peg$e49 = peg$literalExpectation("true", false); + var peg$e50 = peg$literalExpectation("false", false); + var peg$e51 = peg$literalExpectation("|", false); + var peg$e52 = peg$otherExpectation("array"); + var peg$e53 = peg$otherExpectation("record"); + var peg$e54 = peg$otherExpectation("optional whitespace"); + var peg$e55 = peg$otherExpectation("optional whitespace or newline"); + var peg$e56 = peg$otherExpectation("whitespace"); + var peg$e57 = peg$otherExpectation("whitespace or newline"); + var peg$e58 = peg$otherExpectation("statement separator"); + var peg$e59 = peg$literalExpectation(";", false); + var peg$e60 = peg$otherExpectation("line comment"); + var peg$e61 = peg$literalExpectation("//", false); + var peg$e62 = peg$literalExpectation("#", false); + var peg$e63 = peg$classExpectation(["\r", "\n"], true, false); + var peg$e64 = peg$otherExpectation("comment"); + var peg$e65 = peg$literalExpectation("/*", false); + var peg$e66 = peg$classExpectation(["*"], true, false); + var peg$e67 = peg$literalExpectation("*/", false); + var peg$e68 = peg$classExpectation([" ", "\t"], false, false); + var peg$e69 = peg$otherExpectation("newline"); + var peg$e70 = peg$classExpectation(["\n", "\r"], false, false); + + var peg$f0 = function(start) {return start}; + var peg$f1 = function(statements, finalExpression) { if (finalExpression != null) { statements.push(finalExpression) } + return nodeBlock(statements) }; + var peg$f2 = function(finalExpression) { return nodeBlock([finalExpression])}; + var peg$f3 = function(statements, finalExpression) { statements.push(finalExpression) + return nodeBlock(statements) }; + var peg$f4 = function(finalExpression) { return nodeBlock([finalExpression]) }; + var peg$f5 = function(head, tail) { return [head, ...tail] }; + var peg$f6 = function(head) { return [head] }; + var peg$f7 = function(variable, value) { return nodeLetStatment(variable, value) }; + var peg$f8 = function(variable, args, body) { var value = nodeLambda(args, body) + return nodeLetStatment(variable, value) }; + var peg$f9 = function(head, tail) { return [head, ...tail]; }; + var peg$f10 = function(condition, trueExpression, falseExpression) { return nodeTernary(condition, trueExpression, falseExpression) }; + var peg$f11 = function(head, operator, arg) {return {operator: operator, right: arg}}; + var peg$f12 = function(head, tail) { return tail.reduce(function(result, element) { + return makeFunctionCall(toFunction[element.operator], [result, element.right]) + }, head)}; + var peg$f13 = function(left, operator, right) { return makeFunctionCall(toFunction[operator], [left, right])}; + var peg$f14 = function(head, chained) {return chained}; + var peg$f15 = function(head, tail) { return tail.reduce(function(result, element) { + return makeFunctionCall(element.fnName, [result, ...element.args]) + }, head)}; + var peg$f16 = function(fn, args) { return {fnName: fn.value, args: args}}; + var peg$f17 = function(fn) { return {fnName: fn.value, args: []}}; + var peg$f18 = function(unaryOperator, right) { return makeFunctionCall(unaryToFunction[unaryOperator], [right])}; + var peg$f19 = function(head, arg) {return {fn: postOperatorToFunction['[]'], args: [arg]}}; + var peg$f20 = function(head, args) {return {fn: postOperatorToFunction['()'], args: args}}; + var peg$f21 = function(head, tail) { return tail.reduce(function(result, element) { + return makeFunctionCall(element.fn, [result, ...element.args]) + }, head)}; + var peg$f22 = function(head, arg) {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}}; + var peg$f23 = function(expression) {return expression}; + var peg$f24 = function(identifier) {return nodeIdentifier(text())}; + var peg$f25 = function(characters) {return nodeString(characters.join(''))}; + var peg$f26 = function(digits) { return nodeInteger(parseInt(text()))}; + var peg$f27 = function() { return nodeFloat(parseFloat(text()))}; + var peg$f28 = function() { return nodeBoolean(text() === 'true')}; + var peg$f29 = function(args, statements, finalExpression) { statements.push(finalExpression) + return nodeLambda(args, nodeBlock(statements)) }; + var peg$f30 = function(args, finalExpression) { return nodeLambda(args, nodeBlock([finalExpression])) }; + var peg$f31 = function() { return makeFunctionCall('$constructArray', [nodeExpression([])])}; + var peg$f32 = function(args) { return makeFunctionCall('$constructArray', [nodeExpression(args)])}; + var peg$f33 = function(args) { return makeFunctionCall('$constructRecord', [nodeExpression(args)])}; + var peg$f34 = function(key, value) { return nodeKeyValue(key, value)}; + + var peg$currPos = 0; + var peg$savedPos = 0; + var peg$posDetailsCache = [{ line: 1, column: 1 }]; + var peg$maxFailPos = 0; + var peg$maxFailExpected = []; + var peg$silentFails = 0; + + var peg$resultsCache = {}; + + var peg$result; + + if ("startRule" in options) { + if (!(options.startRule in peg$startRuleFunctions)) { + throw new Error("Can't start parsing from rule \"" + options.startRule + "\"."); + } + + peg$startRuleFunction = peg$startRuleFunctions[options.startRule]; + } + + function text() { + return input.substring(peg$savedPos, peg$currPos); + } + + function offset() { + return peg$savedPos; + } + + function range() { + return { + source: peg$source, + start: peg$savedPos, + end: peg$currPos + }; + } + + function location() { + return peg$computeLocation(peg$savedPos, peg$currPos); + } + + function expected(description, location) { + location = location !== undefined + ? location + : peg$computeLocation(peg$savedPos, peg$currPos); + + throw peg$buildStructuredError( + [peg$otherExpectation(description)], + input.substring(peg$savedPos, peg$currPos), + location + ); + } + + function error(message, location) { + location = location !== undefined + ? location + : peg$computeLocation(peg$savedPos, peg$currPos); + + throw peg$buildSimpleError(message, location); + } + + function peg$literalExpectation(text, ignoreCase) { + return { type: "literal", text: text, ignoreCase: ignoreCase }; + } + + function peg$classExpectation(parts, inverted, ignoreCase) { + return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase }; + } + + function peg$anyExpectation() { + return { type: "any" }; + } + + function peg$endExpectation() { + return { type: "end" }; + } + + function peg$otherExpectation(description) { + return { type: "other", description: description }; + } + + function peg$computePosDetails(pos) { + var details = peg$posDetailsCache[pos]; + var p; + + if (details) { + return details; + } else { + p = pos - 1; + while (!peg$posDetailsCache[p]) { + p--; + } + + details = peg$posDetailsCache[p]; + details = { + line: details.line, + column: details.column + }; + + while (p < pos) { + if (input.charCodeAt(p) === 10) { + details.line++; + details.column = 1; + } else { + details.column++; + } + + p++; + } + + peg$posDetailsCache[pos] = details; + + return details; + } + } + + function peg$computeLocation(startPos, endPos) { + var startPosDetails = peg$computePosDetails(startPos); + var endPosDetails = peg$computePosDetails(endPos); + + return { + source: peg$source, + start: { + offset: startPos, + line: startPosDetails.line, + column: startPosDetails.column + }, + end: { + offset: endPos, + line: endPosDetails.line, + column: endPosDetails.column + } + }; + } + + function peg$fail(expected) { + if (peg$currPos < peg$maxFailPos) { return; } + + if (peg$currPos > peg$maxFailPos) { + peg$maxFailPos = peg$currPos; + peg$maxFailExpected = []; + } + + peg$maxFailExpected.push(expected); + } + + function peg$buildSimpleError(message, location) { + return new peg$SyntaxError(message, null, null, location); + } + + function peg$buildStructuredError(expected, found, location) { + return new peg$SyntaxError( + peg$SyntaxError.buildMessage(expected, found), + expected, + found, + location + ); + } + + function peg$parsestart() { + var s0, s1, s2, s3, s4; + + var key = peg$currPos * 55 + 0; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parse_nl(); + s2 = peg$parseouterBlock(); + if (s2 !== peg$FAILED) { + s3 = peg$parse_nl(); + s4 = peg$parsefinalComment(); + if (s4 === peg$FAILED) { + s4 = null; + } + peg$savedPos = s0; + s0 = peg$f0(s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsezeroOMoreArgumentsBlock() { + var s0; + + var key = peg$currPos * 55 + 1; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$parseinnerBlock(); + if (s0 === peg$FAILED) { + s0 = peg$parselambda(); + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseouterBlock() { + var s0, s1, s2, s3, s4; + + var key = peg$currPos * 55 + 2; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parsearray_statements(); + if (s1 !== peg$FAILED) { + s2 = peg$currPos; + s3 = peg$parsestatementSeparator(); + if (s3 !== peg$FAILED) { + s4 = peg$parseexpression(); + if (s4 !== peg$FAILED) { + s2 = s4; + } else { + peg$currPos = s2; + s2 = peg$FAILED; + } + } else { + peg$currPos = s2; + s2 = peg$FAILED; + } + if (s2 === peg$FAILED) { + s2 = null; + } + peg$savedPos = s0; + s0 = peg$f1(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = peg$parseexpression(); + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f2(s1); + } + s0 = s1; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseinnerBlock() { + var s0, s1, s2, s3, s4, s5, s6; + + var key = peg$currPos * 55 + 3; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 123) { + s1 = peg$c0; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e0); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse_(); + s3 = peg$parsearray_statements(); + if (s3 !== peg$FAILED) { + s4 = peg$currPos; + s5 = peg$parsestatementSeparator(); + if (s5 !== peg$FAILED) { + s6 = peg$parseexpression(); + if (s6 !== peg$FAILED) { + s4 = s6; + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + if (s4 !== peg$FAILED) { + s5 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 125) { + s6 = peg$c1; + peg$currPos++; + } else { + s6 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e1); } + } + if (s6 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f3(s3, s4); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 123) { + s1 = peg$c0; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e0); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse_(); + s3 = peg$parseexpression(); + if (s3 !== peg$FAILED) { + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 125) { + s5 = peg$c1; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e1); } + } + if (s5 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f4(s3); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = peg$parseexpression(); + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f2(s1); + } + s0 = s1; + } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsearray_statements() { + var s0, s1, s2, s3, s4; + + var key = peg$currPos * 55 + 4; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parsestatement(); + if (s1 !== peg$FAILED) { + s2 = peg$currPos; + s3 = peg$parsestatementSeparator(); + if (s3 !== peg$FAILED) { + s4 = peg$parsearray_statements(); + if (s4 !== peg$FAILED) { + s2 = s4; + } else { + peg$currPos = s2; + s2 = peg$FAILED; + } + } else { + peg$currPos = s2; + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f5(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = peg$parsestatement(); + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f6(s1); + } + s0 = s1; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsestatement() { + var s0; + + var key = peg$currPos * 55 + 5; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$parseletStatement(); + if (s0 === peg$FAILED) { + s0 = peg$parsedefunStatement(); + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseletStatement() { + var s0, s1, s2, s3, s4, s5; + + var key = peg$currPos * 55 + 6; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseidentifier(); + if (s1 !== peg$FAILED) { + s2 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 61) { + s3 = peg$c2; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e2); } + } + if (s3 !== peg$FAILED) { + s4 = peg$parse_nl(); + s5 = peg$parsezeroOMoreArgumentsBlock(); + if (s5 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f7(s1, s5); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsedefunStatement() { + var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; + + var key = peg$currPos * 55 + 7; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseidentifier(); + if (s1 !== peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 40) { + s2 = peg$c3; + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e3); } + } + if (s2 !== peg$FAILED) { + s3 = peg$parse_nl(); + s4 = peg$parsearray_parameters(); + if (s4 !== peg$FAILED) { + s5 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 41) { + s6 = peg$c4; + peg$currPos++; + } else { + s6 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e4); } + } + if (s6 !== peg$FAILED) { + s7 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 61) { + s8 = peg$c2; + peg$currPos++; + } else { + s8 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e2); } + } + if (s8 !== peg$FAILED) { + s9 = peg$parse_nl(); + s10 = peg$parseinnerBlock(); + if (s10 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f8(s1, s4, s10); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsearray_parameters() { + var s0, s1, s2, s3, s4, s5, s6, s7; + + var key = peg$currPos * 55 + 8; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseidentifier(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 44) { + s5 = peg$c5; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e5); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parseidentifier(); + if (s7 !== peg$FAILED) { + s3 = s7; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 44) { + s5 = peg$c5; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e5); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parseidentifier(); + if (s7 !== peg$FAILED) { + s3 = s7; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f9(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseexpression() { + var s0; + + var key = peg$currPos * 55 + 9; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$parseifthenelse(); + if (s0 === peg$FAILED) { + s0 = peg$parseternary(); + if (s0 === peg$FAILED) { + s0 = peg$parselogicalAdditive(); + } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseifthenelse() { + var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11; + + var key = peg$currPos * 55 + 10; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + if (input.substr(peg$currPos, 2) === peg$c6) { + s1 = peg$c6; + peg$currPos += 2; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e6); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse__nl(); + if (s2 !== peg$FAILED) { + s3 = peg$parselogicalAdditive(); + if (s3 !== peg$FAILED) { + s4 = peg$parse__nl(); + if (s4 !== peg$FAILED) { + if (input.substr(peg$currPos, 4) === peg$c7) { + s5 = peg$c7; + peg$currPos += 4; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e7); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse__nl(); + if (s6 !== peg$FAILED) { + s7 = peg$parseinnerBlock(); + if (s7 !== peg$FAILED) { + s8 = peg$parse__nl(); + if (s8 !== peg$FAILED) { + if (input.substr(peg$currPos, 4) === peg$c8) { + s9 = peg$c8; + peg$currPos += 4; + } else { + s9 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e8); } + } + if (s9 !== peg$FAILED) { + s10 = peg$parse__nl(); + if (s10 !== peg$FAILED) { + s11 = peg$parseifthenelse(); + if (s11 === peg$FAILED) { + s11 = peg$parseinnerBlock(); + } + if (s11 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f10(s3, s7, s11); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseternary() { + var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; + + var key = peg$currPos * 55 + 11; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parselogicalAdditive(); + if (s1 !== peg$FAILED) { + s2 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 63) { + s3 = peg$c9; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e9); } + } + if (s3 !== peg$FAILED) { + s4 = peg$parse_nl(); + s5 = peg$parselogicalAdditive(); + if (s5 !== peg$FAILED) { + s6 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 58) { + s7 = peg$c10; + peg$currPos++; + } else { + s7 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e10); } + } + if (s7 !== peg$FAILED) { + s8 = peg$parse_nl(); + s9 = peg$parseternary(); + if (s9 === peg$FAILED) { + s9 = peg$parselogicalAdditive(); + } + if (s9 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f10(s1, s5, s9); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parselogicalAdditive() { + var s0, s1, s2, s3, s4, s5, s6, s7; + + var key = peg$currPos * 55 + 12; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parselogicalMultiplicative(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.substr(peg$currPos, 2) === peg$c11) { + s5 = peg$c11; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e11); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parselogicalMultiplicative(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.substr(peg$currPos, 2) === peg$c11) { + s5 = peg$c11; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e11); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parselogicalMultiplicative(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f12(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parselogicalMultiplicative() { + var s0, s1, s2, s3, s4, s5, s6, s7; + + var key = peg$currPos * 55 + 13; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseequality(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.substr(peg$currPos, 2) === peg$c12) { + s5 = peg$c12; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parseequality(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.substr(peg$currPos, 2) === peg$c12) { + s5 = peg$c12; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parseequality(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f12(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseequality() { + var s0, s1, s2, s3, s4, s5; + + var key = peg$currPos * 55 + 14; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parserelational(); + if (s1 !== peg$FAILED) { + s2 = peg$parse_(); + if (input.substr(peg$currPos, 2) === peg$c13) { + s3 = peg$c13; + peg$currPos += 2; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e13); } + } + if (s3 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c14) { + s3 = peg$c14; + peg$currPos += 2; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e14); } + } + } + if (s3 !== peg$FAILED) { + s4 = peg$parse_nl(); + s5 = peg$parserelational(); + if (s5 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f13(s1, s3, s5); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$parserelational(); + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parserelational() { + var s0, s1, s2, s3, s4, s5; + + var key = peg$currPos * 55 + 15; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseadditive(); + if (s1 !== peg$FAILED) { + s2 = peg$parse_(); + if (input.substr(peg$currPos, 2) === peg$c15) { + s3 = peg$c15; + peg$currPos += 2; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e15); } + } + if (s3 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 60) { + s3 = peg$c16; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e16); } + } + if (s3 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c17) { + s3 = peg$c17; + peg$currPos += 2; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e17); } + } + if (s3 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 62) { + s3 = peg$c18; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e18); } + } + } + } + } + if (s3 !== peg$FAILED) { + s4 = peg$parse_nl(); + s5 = peg$parseadditive(); + if (s5 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f13(s1, s3, s5); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$parseadditive(); + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseadditive() { + var s0, s1, s2, s3, s4, s5, s6, s7; + + var key = peg$currPos * 55 + 16; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parsemultiplicative(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 43) { + s5 = peg$c19; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e19); } + } + if (s5 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 45) { + s5 = peg$c20; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e20); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c21) { + s5 = peg$c21; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e21); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c22) { + s5 = peg$c22; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e22); } + } + } + } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parsemultiplicative(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 43) { + s5 = peg$c19; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e19); } + } + if (s5 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 45) { + s5 = peg$c20; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e20); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c21) { + s5 = peg$c21; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e21); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c22) { + s5 = peg$c22; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e22); } + } + } + } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parsemultiplicative(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f12(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsemultiplicative() { + var s0, s1, s2, s3, s4, s5, s6, s7; + + var key = peg$currPos * 55 + 17; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parsepower(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 42) { + s5 = peg$c23; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e23); } + } + if (s5 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 47) { + s5 = peg$c24; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e24); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c25) { + s5 = peg$c25; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e25); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c26) { + s5 = peg$c26; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e26); } + } + } + } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parsepower(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 42) { + s5 = peg$c23; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e23); } + } + if (s5 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 47) { + s5 = peg$c24; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e24); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c25) { + s5 = peg$c25; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e25); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c26) { + s5 = peg$c26; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e26); } + } + } + } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parsepower(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f12(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsepower() { + var s0, s1, s2, s3, s4, s5, s6, s7; + + var key = peg$currPos * 55 + 18; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parsecredibleInterval(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 94) { + s5 = peg$c27; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e27); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c28) { + s5 = peg$c28; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e28); } + } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parsecredibleInterval(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 94) { + s5 = peg$c27; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e27); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c28) { + s5 = peg$c28; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e28); } + } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parsecredibleInterval(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f12(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsecredibleInterval() { + var s0, s1, s2, s3, s4, s5, s6, s7; + + var key = peg$currPos * 55 + 19; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parsechainFunctionCall(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse__(); + if (s4 !== peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c29) { + s5 = peg$c29; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e29); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse__nl(); + if (s6 !== peg$FAILED) { + s7 = peg$parsechainFunctionCall(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse__(); + if (s4 !== peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c29) { + s5 = peg$c29; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e29); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse__nl(); + if (s6 !== peg$FAILED) { + s7 = peg$parsechainFunctionCall(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f11(s1, s5, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f12(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsechainFunctionCall() { + var s0, s1, s2, s3, s4, s5, s6, s7; + + var key = peg$currPos * 55 + 20; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseunary(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.substr(peg$currPos, 2) === peg$c30) { + s5 = peg$c30; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e30); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c31) { + s5 = peg$c31; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e31); } + } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parsechainedFunction(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f14(s1, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.substr(peg$currPos, 2) === peg$c30) { + s5 = peg$c30; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e30); } + } + if (s5 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c31) { + s5 = peg$c31; + peg$currPos += 2; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e31); } + } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parsechainedFunction(); + if (s7 !== peg$FAILED) { + peg$savedPos = s3; + s3 = peg$f14(s1, s7); + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f15(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsechainedFunction() { + var s0, s1, s2, s3, s4, s5, s6; + + var key = peg$currPos * 55 + 21; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseidentifier(); + if (s1 !== peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 40) { + s2 = peg$c3; + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e3); } + } + if (s2 !== peg$FAILED) { + s3 = peg$parse_nl(); + s4 = peg$parsearray_functionArguments(); + if (s4 !== peg$FAILED) { + s5 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 41) { + s6 = peg$c4; + peg$currPos++; + } else { + s6 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e4); } + } + if (s6 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f16(s1, s4); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = peg$parseidentifier(); + if (s1 !== peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 40) { + s2 = peg$c3; + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e3); } + } + if (s2 !== peg$FAILED) { + s3 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 41) { + s4 = peg$c4; + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e4); } + } + if (s4 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f17(s1); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = peg$parseidentifier(); + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f17(s1); + } + s0 = s1; + } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseunary() { + var s0, s1, s2, s3; + + var key = peg$currPos * 55 + 22; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseunaryOperator(); + if (s1 !== peg$FAILED) { + s2 = peg$parse_nl(); + s3 = peg$parseunary(); + if (s3 === peg$FAILED) { + s3 = peg$parseindexedValue(); + } + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f18(s1, s3); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$parseindexedValue(); + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseunaryOperator() { + var s0; + + var key = peg$currPos * 55 + 23; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + if (input.charCodeAt(peg$currPos) === 45) { + s0 = peg$c20; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e20); } + } + if (s0 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c22) { + s0 = peg$c22; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e22); } + } + if (s0 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 33) { + s0 = peg$c32; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e32); } + } + } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseindexedValue() { + var s0; + + var key = peg$currPos * 55 + 24; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$parsecollectionElement(); + if (s0 === peg$FAILED) { + s0 = peg$parsemaybeRecordElement(); + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsecollectionElement() { + var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; + + var key = peg$currPos * 55 + 25; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parsemaybeRecordElement(); + if (s1 !== peg$FAILED) { + s2 = peg$currPos; + peg$silentFails++; + if (input.charCodeAt(peg$currPos) === 91) { + s3 = peg$c33; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e33); } + } + if (s3 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 40) { + s3 = peg$c3; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e3); } + } + } + peg$silentFails--; + if (s3 !== peg$FAILED) { + peg$currPos = s2; + s2 = undefined; + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = []; + s4 = peg$currPos; + s5 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 91) { + s6 = peg$c33; + peg$currPos++; + } else { + s6 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e33); } + } + if (s6 !== peg$FAILED) { + s7 = peg$parse_nl(); + s8 = peg$parseexpression(); + if (s8 !== peg$FAILED) { + s9 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 93) { + s10 = peg$c34; + peg$currPos++; + } else { + s10 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e34); } + } + if (s10 !== peg$FAILED) { + peg$savedPos = s4; + s4 = peg$f19(s1, s8); + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + if (s4 === peg$FAILED) { + s4 = peg$currPos; + s5 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 40) { + s6 = peg$c3; + peg$currPos++; + } else { + s6 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e3); } + } + if (s6 !== peg$FAILED) { + s7 = peg$parse_nl(); + s8 = peg$parsearray_functionArguments(); + if (s8 !== peg$FAILED) { + s9 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 41) { + s10 = peg$c4; + peg$currPos++; + } else { + s10 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e4); } + } + if (s10 !== peg$FAILED) { + peg$savedPos = s4; + s4 = peg$f20(s1, s8); + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } + while (s4 !== peg$FAILED) { + s3.push(s4); + s4 = peg$currPos; + s5 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 91) { + s6 = peg$c33; + peg$currPos++; + } else { + s6 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e33); } + } + if (s6 !== peg$FAILED) { + s7 = peg$parse_nl(); + s8 = peg$parseexpression(); + if (s8 !== peg$FAILED) { + s9 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 93) { + s10 = peg$c34; + peg$currPos++; + } else { + s10 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e34); } + } + if (s10 !== peg$FAILED) { + peg$savedPos = s4; + s4 = peg$f19(s1, s8); + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + if (s4 === peg$FAILED) { + s4 = peg$currPos; + s5 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 40) { + s6 = peg$c3; + peg$currPos++; + } else { + s6 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e3); } + } + if (s6 !== peg$FAILED) { + s7 = peg$parse_nl(); + s8 = peg$parsearray_functionArguments(); + if (s8 !== peg$FAILED) { + s9 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 41) { + s10 = peg$c4; + peg$currPos++; + } else { + s10 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e4); } + } + if (s10 !== peg$FAILED) { + peg$savedPos = s4; + s4 = peg$f20(s1, s8); + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } + } + peg$savedPos = s0; + s0 = peg$f21(s1, s3); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsearray_functionArguments() { + var s0, s1, s2, s3, s4, s5, s6, s7; + + var key = peg$currPos * 55 + 26; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseexpression(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 44) { + s5 = peg$c5; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e5); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parseexpression(); + if (s7 !== peg$FAILED) { + s3 = s7; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 44) { + s5 = peg$c5; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e5); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parseexpression(); + if (s7 !== peg$FAILED) { + s3 = s7; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f9(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsemaybeRecordElement() { + var s0; + + var key = peg$currPos * 55 + 27; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$parserecordElement(); + if (s0 === peg$FAILED) { + s0 = peg$parseatom(); + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parserecordElement() { + var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; + + var key = peg$currPos * 55 + 28; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseidentifier(); + if (s1 !== peg$FAILED) { + s2 = peg$currPos; + peg$silentFails++; + if (input.charCodeAt(peg$currPos) === 46) { + s3 = peg$c35; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e35); } + } + peg$silentFails--; + if (s3 !== peg$FAILED) { + peg$currPos = s2; + s2 = undefined; + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = []; + s4 = peg$currPos; + s5 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 46) { + s6 = peg$c35; + peg$currPos++; + } else { + s6 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e35); } + } + if (s6 !== peg$FAILED) { + s7 = peg$parse_nl(); + s8 = peg$currPos; + s9 = peg$parseidentifier(); + if (s9 !== peg$FAILED) { + s8 = input.substring(s8, peg$currPos); + } else { + s8 = s9; + } + if (s8 !== peg$FAILED) { + peg$savedPos = s4; + s4 = peg$f22(s1, s8); + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + while (s4 !== peg$FAILED) { + s3.push(s4); + s4 = peg$currPos; + s5 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 46) { + s6 = peg$c35; + peg$currPos++; + } else { + s6 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e35); } + } + if (s6 !== peg$FAILED) { + s7 = peg$parse_nl(); + s8 = peg$currPos; + s9 = peg$parseidentifier(); + if (s9 !== peg$FAILED) { + s8 = input.substring(s8, peg$currPos); + } else { + s8 = s9; + } + if (s8 !== peg$FAILED) { + peg$savedPos = s4; + s4 = peg$f22(s1, s8); + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f21(s1, s3); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseatom() { + var s0, s1, s2, s3, s4, s5; + + var key = peg$currPos * 55 + 29; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 40) { + s1 = peg$c3; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e3); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse_nl(); + s3 = peg$parseexpression(); + if (s3 !== peg$FAILED) { + s4 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 41) { + s5 = peg$c4; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e4); } + } + if (s5 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f23(s3); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$parsebasicValue(); + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsebasicValue() { + var s0; + + var key = peg$currPos * 55 + 30; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$parsevalueConstructor(); + if (s0 === peg$FAILED) { + s0 = peg$parsebasicLiteral(); + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsebasicLiteral() { + var s0; + + var key = peg$currPos * 55 + 31; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$parsestring(); + if (s0 === peg$FAILED) { + s0 = peg$parsefloat(); + if (s0 === peg$FAILED) { + s0 = peg$parseinteger(); + if (s0 === peg$FAILED) { + s0 = peg$parseboolean(); + if (s0 === peg$FAILED) { + s0 = peg$parseidentifier(); + } + } + } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseidentifier() { + var s0, s1, s2, s3, s4; + + var key = peg$currPos * 55 + 32; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + s1 = peg$currPos; + s2 = []; + if (peg$r0.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e37); } + } + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + if (peg$r0.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e37); } + } + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = []; + if (peg$r1.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e38); } + } + while (s4 !== peg$FAILED) { + s3.push(s4); + if (peg$r1.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e38); } + } + } + s2 = [s2, s3]; + s1 = s2; + } else { + peg$currPos = s1; + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f24(s1); + } + s0 = s1; + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e36); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsestring() { + var s0, s1, s2, s3, s4; + + var key = peg$currPos * 55 + 33; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + s1 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 39) { + s2 = peg$c36; + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e40); } + } + if (s2 !== peg$FAILED) { + s3 = []; + if (peg$r2.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e41); } + } + while (s4 !== peg$FAILED) { + s3.push(s4); + if (peg$r2.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e41); } + } + } + if (input.charCodeAt(peg$currPos) === 39) { + s4 = peg$c36; + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e40); } + } + if (s4 !== peg$FAILED) { + s1 = s3; + } else { + peg$currPos = s1; + s1 = peg$FAILED; + } + } else { + peg$currPos = s1; + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f25(s1); + } + s0 = s1; + if (s0 === peg$FAILED) { + s0 = peg$currPos; + s1 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 34) { + s2 = peg$c37; + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e42); } + } + if (s2 !== peg$FAILED) { + s3 = []; + if (peg$r3.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e43); } + } + while (s4 !== peg$FAILED) { + s3.push(s4); + if (peg$r3.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e43); } + } + } + if (input.charCodeAt(peg$currPos) === 34) { + s4 = peg$c37; + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e42); } + } + if (s4 !== peg$FAILED) { + s1 = s3; + } else { + peg$currPos = s1; + s1 = peg$FAILED; + } + } else { + peg$currPos = s1; + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f25(s1); + } + s0 = s1; + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e39); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseinteger() { + var s0, s1, s2, s3; + + var key = peg$currPos * 55 + 34; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + s1 = []; + if (peg$r4.test(input.charAt(peg$currPos))) { + s2 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e45); } + } + if (s2 !== peg$FAILED) { + while (s2 !== peg$FAILED) { + s1.push(s2); + if (peg$r4.test(input.charAt(peg$currPos))) { + s2 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e45); } + } + } + } else { + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + s2 = peg$currPos; + peg$silentFails++; + if (peg$r5.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e46); } + } + peg$silentFails--; + if (s3 === peg$FAILED) { + s2 = undefined; + } else { + peg$currPos = s2; + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f26(s1); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e44); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsefloat() { + var s0, s1, s2, s3, s4, s5; + + var key = peg$currPos * 55 + 35; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + s1 = peg$currPos; + s2 = []; + if (peg$r4.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e45); } + } + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + if (peg$r4.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e45); } + } + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + if (peg$r5.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e46); } + } + if (s3 !== peg$FAILED) { + s4 = []; + if (peg$r4.test(input.charAt(peg$currPos))) { + s5 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e45); } + } + while (s5 !== peg$FAILED) { + s4.push(s5); + if (peg$r4.test(input.charAt(peg$currPos))) { + s5 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e45); } + } + } + s2 = [s2, s3, s4]; + s1 = s2; + } else { + peg$currPos = s1; + s1 = peg$FAILED; + } + } else { + peg$currPos = s1; + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f27(); + } + s0 = s1; + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e47); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parseboolean() { + var s0, s1; + + var key = peg$currPos * 55 + 36; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + if (input.substr(peg$currPos, 4) === peg$c38) { + s1 = peg$c38; + peg$currPos += 4; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e49); } + } + if (s1 === peg$FAILED) { + if (input.substr(peg$currPos, 5) === peg$c39) { + s1 = peg$c39; + peg$currPos += 5; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e50); } + } + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f28(); + } + s0 = s1; + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e48); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsevalueConstructor() { + var s0; + + var key = peg$currPos * 55 + 37; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$parserecordConstructor(); + if (s0 === peg$FAILED) { + s0 = peg$parsearrayConstructor(); + if (s0 === peg$FAILED) { + s0 = peg$parselambda(); + } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parselambda() { + var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12; + + var key = peg$currPos * 55 + 38; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 123) { + s1 = peg$c0; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e0); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 124) { + s3 = peg$c40; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e51); } + } + if (s3 !== peg$FAILED) { + s4 = peg$parse_nl(); + s5 = peg$parsearray_parameters(); + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 124) { + s7 = peg$c40; + peg$currPos++; + } else { + s7 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e51); } + } + if (s7 !== peg$FAILED) { + s8 = peg$parse_nl(); + s9 = peg$parsearray_statements(); + if (s9 !== peg$FAILED) { + s10 = peg$currPos; + s11 = peg$parsestatementSeparator(); + if (s11 !== peg$FAILED) { + s12 = peg$parseexpression(); + if (s12 !== peg$FAILED) { + s10 = s12; + } else { + peg$currPos = s10; + s10 = peg$FAILED; + } + } else { + peg$currPos = s10; + s10 = peg$FAILED; + } + if (s10 !== peg$FAILED) { + s11 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 125) { + s12 = peg$c1; + peg$currPos++; + } else { + s12 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e1); } + } + if (s12 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f29(s5, s9, s10); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 123) { + s1 = peg$c0; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e0); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 124) { + s3 = peg$c40; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e51); } + } + if (s3 !== peg$FAILED) { + s4 = peg$parse_nl(); + s5 = peg$parsearray_parameters(); + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 124) { + s7 = peg$c40; + peg$currPos++; + } else { + s7 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e51); } + } + if (s7 !== peg$FAILED) { + s8 = peg$parse_nl(); + s9 = peg$parseexpression(); + if (s9 !== peg$FAILED) { + s10 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 125) { + s11 = peg$c1; + peg$currPos++; + } else { + s11 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e1); } + } + if (s11 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f30(s5, s9); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsearrayConstructor() { + var s0, s1, s2, s3, s4, s5; + + var key = peg$currPos * 55 + 39; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 91) { + s1 = peg$c33; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e33); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 93) { + s3 = peg$c34; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e34); } + } + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f31(); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 91) { + s1 = peg$c33; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e33); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse_nl(); + s3 = peg$parsearray_elements(); + if (s3 !== peg$FAILED) { + s4 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 93) { + s5 = peg$c34; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e34); } + } + if (s5 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f32(s3); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e52); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsearray_elements() { + var s0, s1, s2, s3, s4, s5, s6, s7; + + var key = peg$currPos * 55 + 40; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseexpression(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 44) { + s5 = peg$c5; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e5); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parseexpression(); + if (s7 !== peg$FAILED) { + s3 = s7; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 44) { + s5 = peg$c5; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e5); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parseexpression(); + if (s7 !== peg$FAILED) { + s3 = s7; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f9(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parserecordConstructor() { + var s0, s1, s2, s3, s4, s5; + + var key = peg$currPos * 55 + 41; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 123) { + s1 = peg$c0; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e0); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse_nl(); + s3 = peg$parsearray_recordArguments(); + if (s3 !== peg$FAILED) { + s4 = peg$parse_nl(); + if (input.charCodeAt(peg$currPos) === 125) { + s5 = peg$c1; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e1); } + } + if (s5 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f33(s3); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e53); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsearray_recordArguments() { + var s0, s1, s2, s3, s4, s5, s6, s7; + + var key = peg$currPos * 55 + 42; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parsekeyValuePair(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 44) { + s5 = peg$c5; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e5); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parsekeyValuePair(); + if (s7 !== peg$FAILED) { + s3 = s7; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 44) { + s5 = peg$c5; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e5); } + } + if (s5 !== peg$FAILED) { + s6 = peg$parse_nl(); + s7 = peg$parsekeyValuePair(); + if (s7 !== peg$FAILED) { + s3 = s7; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f9(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsekeyValuePair() { + var s0, s1, s2, s3, s4, s5; + + var key = peg$currPos * 55 + 43; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parseexpression(); + if (s1 !== peg$FAILED) { + s2 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 58) { + s3 = peg$c10; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e10); } + } + if (s3 !== peg$FAILED) { + s4 = peg$parse_nl(); + s5 = peg$parseexpression(); + if (s5 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f34(s1, s5); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parse_() { + var s0, s1; + + var key = peg$currPos * 55 + 44; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = []; + s1 = peg$parsewhiteSpaceCharactersOrComment(); + while (s1 !== peg$FAILED) { + s0.push(s1); + s1 = peg$parsewhiteSpaceCharactersOrComment(); + } + peg$silentFails--; + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e54); } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parse_nl() { + var s0, s1; + + var key = peg$currPos * 55 + 45; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = []; + s1 = peg$parsewhiteSpaceCharactersOrComment(); + if (s1 === peg$FAILED) { + s1 = peg$parsecommentOrNewLine(); + } + while (s1 !== peg$FAILED) { + s0.push(s1); + s1 = peg$parsewhiteSpaceCharactersOrComment(); + if (s1 === peg$FAILED) { + s1 = peg$parsecommentOrNewLine(); + } + } + peg$silentFails--; + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e55); } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parse__() { + var s0, s1; + + var key = peg$currPos * 55 + 46; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = []; + s1 = peg$parsewhiteSpaceCharactersOrComment(); + if (s1 !== peg$FAILED) { + while (s1 !== peg$FAILED) { + s0.push(s1); + s1 = peg$parsewhiteSpaceCharactersOrComment(); + } + } else { + s0 = peg$FAILED; + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e56); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parse__nl() { + var s0, s1; + + var key = peg$currPos * 55 + 47; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = []; + s1 = peg$parsewhiteSpaceCharactersOrComment(); + if (s1 === peg$FAILED) { + s1 = peg$parsecommentOrNewLine(); + } + if (s1 !== peg$FAILED) { + while (s1 !== peg$FAILED) { + s0.push(s1); + s1 = peg$parsewhiteSpaceCharactersOrComment(); + if (s1 === peg$FAILED) { + s1 = peg$parsecommentOrNewLine(); + } + } + } else { + s0 = peg$FAILED; + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e57); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsestatementSeparator() { + var s0, s1, s2, s3; + + var key = peg$currPos * 55 + 48; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + s1 = peg$parse_(); + s2 = []; + if (input.charCodeAt(peg$currPos) === 59) { + s3 = peg$c41; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e59); } + } + if (s3 === peg$FAILED) { + s3 = peg$parsecommentOrNewLine(); + } + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + if (input.charCodeAt(peg$currPos) === 59) { + s3 = peg$c41; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e59); } + } + if (s3 === peg$FAILED) { + s3 = peg$parsecommentOrNewLine(); + } + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = peg$parse_(); + s1 = [s1, s2, s3]; + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e58); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsecommentOrNewLine() { + var s0, s1, s2; + + var key = peg$currPos * 55 + 49; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parsefinalComment(); + if (s1 === peg$FAILED) { + s1 = null; + } + s2 = peg$parsenewLine(); + if (s2 !== peg$FAILED) { + s1 = [s1, s2]; + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsefinalComment() { + var s0, s1, s2, s3, s4; + + var key = peg$currPos * 55 + 50; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + s1 = peg$parse_(); + if (input.substr(peg$currPos, 2) === peg$c42) { + s2 = peg$c42; + peg$currPos += 2; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e61); } + } + if (s2 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 35) { + s2 = peg$c43; + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e62); } + } + } + if (s2 !== peg$FAILED) { + s3 = []; + if (peg$r6.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e63); } + } + while (s4 !== peg$FAILED) { + s3.push(s4); + if (peg$r6.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e63); } + } + } + s0 = s3; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e60); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsewhiteSpaceCharactersOrComment() { + var s0; + + var key = peg$currPos * 55 + 51; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$parsewhiteSpaceCharacters(); + if (s0 === peg$FAILED) { + s0 = peg$parsedelimitedComment(); + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsedelimitedComment() { + var s0, s1, s2, s3; + + var key = peg$currPos * 55 + 52; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + if (input.substr(peg$currPos, 2) === peg$c44) { + s1 = peg$c44; + peg$currPos += 2; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e65); } + } + if (s1 !== peg$FAILED) { + s2 = []; + if (peg$r7.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e66); } + } + while (s3 !== peg$FAILED) { + s2.push(s3); + if (peg$r7.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e66); } + } + } + if (input.substr(peg$currPos, 2) === peg$c45) { + s3 = peg$c45; + peg$currPos += 2; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e67); } + } + if (s3 !== peg$FAILED) { + s0 = s2; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e64); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsewhiteSpaceCharacters() { + var s0; + + var key = peg$currPos * 55 + 53; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + if (peg$r8.test(input.charAt(peg$currPos))) { + s0 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e68); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsenewLine() { + var s0, s1; + + var key = peg$currPos * 55 + 54; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + if (peg$r9.test(input.charAt(peg$currPos))) { + s0 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e70); } + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e69); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + peg$result = peg$startRuleFunction(); + + if (peg$result !== peg$FAILED && peg$currPos === input.length) { + return peg$result; + } else { + if (peg$result !== peg$FAILED && peg$currPos < input.length) { + peg$fail(peg$endExpectation()); + } + + throw peg$buildStructuredError( + peg$maxFailExpected, + peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null, + peg$maxFailPos < input.length + ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1) + : peg$computeLocation(peg$maxFailPos, peg$maxFailPos) + ); + } +} + +module.exports = { + SyntaxError: peg$SyntaxError, + parse: peg$parse +}; diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs new file mode 100644 index 00000000..242d9814 --- /dev/null +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs @@ -0,0 +1,321 @@ +// Try in https://peggyjs.org/online + +{{ + var toFunction = { + '-': 'subtract', + '->': 'pipe', + '!=': 'unequal', + '.-': 'dotSubtract', + '.*': 'dotMultiply', + './': 'dotDivide', + '.^': 'dotPow', + '.+': 'dotAdd', + '*': 'multiply', + '/': 'divide', + '&&': 'and', + '^': 'pow', // or xor + '+': 'add', + '<': 'smaller', + '<=': 'smallerEq', + '==': 'equal', + '>': 'larger', + '>=': 'largerEq', + '||': 'or', + 'to': 'credibleIntervalToDistribution', + } + + var unaryToFunction = { + '-': 'unaryMinus', + '!': 'not', + '.-': 'unaryDotMinus', + } + + var postOperatorToFunction = { + '.': '$atIndex', + '()': '$$applyAll', + '[]': '$atIndex', + } + + function nodeBlock(statements) {return{type: 'Block', statements: statements}} + function nodeBoolean(value) {return {type: 'Boolean', value: value}} + function nodeCallIndentifier(value) {return {type: 'CallIdentifier', value: value}} + function nodeExpression(args) {return {type: 'Expression', nodes: args}} + function nodeFloat(value) {return {type: 'Float', value: value}} + function makeFunctionCall(fn, args) { + if (fn === '$$applyAll') { + // Any list of values is applied from left to right anyway. + // Like in Haskell and Lisp. + // So we remove the redundant $$applyAll. + if (args[0].type === "Identifier") {args[0].type = "CallIdentifier"} + return nodeExpression(args) + } else { + return nodeExpression([nodeCallIndentifier(fn), ...args]) + } + } + function nodeIdentifier(value) {return {type: 'Identifier', value: value}} + function nodeInteger(value) {return {type: 'Integer', value: value}} + function nodeKeyValue(key, value) { + if (key.type === 'Identifier') {key.type = 'String'} + return {type: 'KeyValue', key: key, value: value}} + function nodeLambda(args, body) {return {type: 'Lambda', args: args, body: body}} + function nodeLetStatment(variable, value) {return {type: 'LetStatement', variable: variable, value: value}} + function nodeString(value) {return {type: 'String', value: value}} + function nodeTernary(condition, trueExpression, falseExpression) {return {type: 'Ternary', condition: condition, trueExpression: trueExpression, falseExpression: falseExpression}} +}} + +start + = _nl start:outerBlock _nl finalComment? {return start} + +zeroOMoreArgumentsBlock = innerBlock / lambda + +outerBlock + = statements:array_statements finalExpression: (statementSeparator @expression)? + { if (finalExpression != null) { statements.push(finalExpression) } + return nodeBlock(statements) } + / finalExpression: expression + { return nodeBlock([finalExpression])} + +innerBlock + = '{' _ statements:array_statements finalExpression: (statementSeparator @expression) _ '}' + { statements.push(finalExpression) + return nodeBlock(statements) } + / '{' _ finalExpression: expression _ '}' + { return nodeBlock([finalExpression]) } + / finalExpression: expression + { return nodeBlock([finalExpression])} + +array_statements + = head:statement tail:(statementSeparator @array_statements ) + { return [head, ...tail] } + / head:statement + { return [head] } + +statement + = letStatement + / defunStatement + +letStatement + = variable:identifier _ '=' _nl value:zeroOMoreArgumentsBlock + + { return nodeLetStatment(variable, value) } + +defunStatement + = variable:identifier '(' _nl args:array_parameters _nl ')' _ '=' _nl body:innerBlock + { var value = nodeLambda(args, body) + return nodeLetStatment(variable, value) } + +array_parameters + = head:identifier tail:(_ ',' _nl @identifier)* + { return [head, ...tail]; } + +expression = ifthenelse / ternary / logicalAdditive + +ifthenelse + = 'if' __nl condition:logicalAdditive + __nl 'then' __nl trueExpression:innerBlock + __nl 'else' __nl falseExpression:(ifthenelse/innerBlock) + { return nodeTernary(condition, trueExpression, falseExpression) } + +ternary + = condition:logicalAdditive _ '?' _nl trueExpression:logicalAdditive _ ':' _nl falseExpression:(ternary/logicalAdditive) + { return nodeTernary(condition, trueExpression, falseExpression) } + +logicalAdditive + = head:logicalMultiplicative tail:(_ operator:'&&' _nl arg:logicalMultiplicative {return {operator: operator, right: arg}})* + { return tail.reduce(function(result, element) { + return makeFunctionCall(toFunction[element.operator], [result, element.right]) + }, head)} + +// start binary operators +logicalMultiplicative + = head:equality tail:(_ operator:'||' _nl arg:equality {return {operator: operator, right: arg}})* + { return tail.reduce(function(result, element) { + return makeFunctionCall(toFunction[element.operator], [result, element.right]) + }, head)} + +equality + = left:relational _ operator:('=='/'!=') _nl right:relational + { return makeFunctionCall(toFunction[operator], [left, right])} + / relational + +relational + = left:additive _ operator:('<='/'<'/'>='/'>') _nl right:additive + { return makeFunctionCall(toFunction[operator], [left, right])} + / additive + +additive + = head:multiplicative tail:(_ operator:('+' / '-' / '.+' / '.-') _nl arg:multiplicative {return {operator: operator, right: arg}})* + { return tail.reduce(function(result, element) { + return makeFunctionCall(toFunction[element.operator], [result, element.right]) + }, head)} + +multiplicative + = head:power tail:(_ operator:('*' / '/' / '.*' / './') _nl arg:power {return {operator: operator, right: arg}})* + { return tail.reduce(function(result, element) { + return makeFunctionCall(toFunction[element.operator], [result, element.right]) + }, head)} + +power + = head:credibleInterval tail:(_ operator:('^' / '.^') _nl arg:credibleInterval {return {operator: operator, right: arg}})* + { return tail.reduce(function(result, element) { + return makeFunctionCall(toFunction[element.operator], [result, element.right]) + }, head)} + +credibleInterval + = head:chainFunctionCall tail:(__ operator:('to') __nl arg:chainFunctionCall {return {operator: operator, right: arg}})* + { return tail.reduce(function(result, element) { + return makeFunctionCall(toFunction[element.operator], [result, element.right]) + }, head)} + +chainFunctionCall + = head:unary tail:(_ ('->'/'|>') _nl chained:chainedFunction {return chained})* + { return tail.reduce(function(result, element) { + return makeFunctionCall(element.fnName, [result, ...element.args]) + }, head)} + + chainedFunction + = fn:identifier '(' _nl args:array_functionArguments _nl ')' + { return {fnName: fn.value, args: args}} + / fn:identifier '(' _nl ')' + { return {fnName: fn.value, args: []}} + / fn:identifier + { return {fnName: fn.value, args: []}} + +// end of binary operators + +unary + = unaryOperator:unaryOperator _nl right:(unary/postOperator) + { return makeFunctionCall(unaryToFunction[unaryOperator], [right])} + / postOperator + + unaryOperator + = ('-' / '.-' / '!' ) + +postOperator = indexedValue + +indexedValue + = collectionElement + / maybeRecordElement + + collectionElement + = head:maybeRecordElement &('['/'(') + tail:( + _ '[' _nl arg:expression _nl ']' {return {fn: postOperatorToFunction['[]'], args: [arg]}} + / _ '(' _nl args:array_functionArguments _nl ')' {return {fn: postOperatorToFunction['()'], args: args}} + )* + { return tail.reduce(function(result, element) { + return makeFunctionCall(element.fn, [result, ...element.args]) + }, head)} + + array_functionArguments + = head:expression tail:(_ ',' _nl @expression)* + { return [head, ...tail]; } + +maybeRecordElement + = recordElement + / atom + + recordElement + = head:identifier &'.' + tail:(_ '.' _nl arg:$identifier {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}})* + { return tail.reduce(function(result, element) { + return makeFunctionCall(element.fn, [result, ...element.args]) + }, head)} + +atom + = '(' _nl expression:expression _nl ')' {return expression} + / basicValue + +basicValue = valueConstructor / basicLiteral + +basicLiteral + = string + / float + / integer + / boolean + / identifier + +identifier 'identifier' + = identifier:([_a-z]+[_a-z0-9]i*) {return nodeIdentifier(text())} + +string 'string' + = characters:("'" @([^'])* "'") {return nodeString(characters.join(''))} + / characters:('"' @([^"])* '"') {return nodeString(characters.join(''))} + +integer 'integer' + = digits:[0-9]+![.] + { return nodeInteger(parseInt(text()))} + +float 'float' + = ([0-9]+[.][0-9]*) + { return nodeFloat(parseFloat(text()))} + +boolean 'boolean' + = ('true'/'false') + { return nodeBoolean(text() === 'true')} + +valueConstructor + = recordConstructor + / arrayConstructor + / lambda + +lambda + = '{' _nl '|' _nl args:array_parameters _nl '|' _nl statements:array_statements finalExpression: (statementSeparator @expression) _nl '}' + { statements.push(finalExpression) + return nodeLambda(args, nodeBlock(statements)) } + / '{' _nl '|' _nl args:array_parameters _nl '|' _nl finalExpression: expression _nl '}' + { return nodeLambda(args, nodeBlock([finalExpression])) } + +arrayConstructor 'array' + = '[' _nl ']' + { return makeFunctionCall('$constructArray', [nodeExpression([])])} + / '[' _nl args:array_elements _nl ']' + { return makeFunctionCall('$constructArray', [nodeExpression(args)])} + + array_elements + = head:expression tail:(_ ',' _nl @expression)* + { return [head, ...tail]; } + +recordConstructor 'record' + = '{' _nl args:array_recordArguments _nl '}' + { return makeFunctionCall('$constructRecord', [nodeExpression(args)])} + + array_recordArguments + = head:keyValuePair tail:(_ ',' _nl @keyValuePair)* + { return [head, ...tail]; } + + keyValuePair + = key:expression _ ':' _nl value:expression + { return nodeKeyValue(key, value)} + +_ 'optional whitespace' + = whiteSpaceCharactersOrComment* + +_nl 'optional whitespace or newline' + = (whiteSpaceCharactersOrComment / commentOrNewLine)* + +__ 'whitespace' + = whiteSpaceCharactersOrComment+ + +__nl 'whitespace or newline' + = (whiteSpaceCharactersOrComment / commentOrNewLine )+ + +statementSeparator 'statement separator' + = _ (';'/ commentOrNewLine)+ _ + + commentOrNewLine = finalComment? newLine + + finalComment "line comment" + = _ ('//'/'#') @([^\r\n]*) + + whiteSpaceCharactersOrComment = whiteSpaceCharacters / delimitedComment + + delimitedComment "comment" + = '/*' @([^*]*) '*/' + + whiteSpaceCharacters = [ \t] + + newLine "newline" + = [\n\r] + + \ No newline at end of file diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_Parse.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_Parse.res new file mode 100644 index 00000000..22b0142f --- /dev/null +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_Parse.res @@ -0,0 +1,109 @@ +module Extra = Reducer_Extra +open Reducer_ErrorValue + +type node = {"type": string} + +@module("./Reducer_Peggy_GeneratedParser.js") external parse__: string => node = "parse" + +let parse = (expr: string): result => + try { + Ok(parse__(expr)) + } catch { + | Js.Exn.Error(obj) => REJavaScriptExn(Js.Exn.message(obj), Js.Exn.name(obj))->Error + } + +type nodeBlock = {...node, "statements": array} +type nodeBoolean = {...node, "value": bool} +type nodeCallIdentifier = {...node, "value": string} +type nodeExpression = {...node, "nodes": array} +type nodeFloat = {...node, "value": float} +type nodeIdentifier = {...node, "value": string} +type nodeInteger = {...node, "value": int} +type nodeKeyValue = {...node, "key": node, "value": node} +type nodeLambda = {...node, "args": array, "body": nodeBlock} +type nodeLetStatement = {...node, "variable": nodeIdentifier, "value": node} +type nodeString = {...node, "value": string} +type nodeTernary = {...node, "condition": node, "trueExpression": node, "falseExpression": node} + +type peggyNode = + | PgNodeBlock(nodeBlock) + | PgNodeBoolean(nodeBoolean) + | PgNodeCallIdentifier(nodeCallIdentifier) + | PgNodeExpression(nodeExpression) + | PgNodeFloat(nodeFloat) + | PgNodeIdentifier(nodeIdentifier) + | PgNodeInteger(nodeInteger) + | PgNodeKeyValue(nodeKeyValue) + | PgNodeLambda(nodeLambda) + | PgNodeLetStatement(nodeLetStatement) + | PgNodeString(nodeString) + | PgNodeTernary(nodeTernary) + +external castNodeBlock: node => nodeBlock = "%identity" +external castNodeBoolean: node => nodeBoolean = "%identity" +external castNodeCallIdentifier: node => nodeCallIdentifier = "%identity" +external castNodeExpression: node => nodeExpression = "%identity" +external castNodeFloat: node => nodeFloat = "%identity" +external castNodeIdentifier: node => nodeIdentifier = "%identity" +external castNodeInteger: node => nodeInteger = "%identity" +external castNodeKeyValue: node => nodeKeyValue = "%identity" +external castNodeLambda: node => nodeLambda = "%identity" +external castNodeLetStatement: node => nodeLetStatement = "%identity" +external castNodeString: node => nodeString = "%identity" +external castNodeTernary: node => nodeTernary = "%identity" + +exception UnsupportedPeggyNodeType(string) // This should never happen; programming error +let castNodeType = (node: node) => + switch node["type"] { + | "Block" => node->castNodeBlock->PgNodeBlock + | "Boolean" => node->castNodeBoolean->PgNodeBoolean + | "CallIdentifier" => node->castNodeCallIdentifier->PgNodeCallIdentifier + | "Expression" => node->castNodeExpression->PgNodeExpression + | "Float" => node->castNodeFloat->PgNodeFloat + | "Identifier" => node->castNodeIdentifier->PgNodeIdentifier + | "Integer" => node->castNodeInteger->PgNodeInteger + | "KeyValue" => node->castNodeKeyValue->PgNodeKeyValue + | "Lambda" => node->castNodeLambda->PgNodeLambda + | "LetStatement" => node->castNodeLetStatement->PgNodeLetStatement + | "String" => node->castNodeString->PgNodeString + | "Ternary" => node->castNodeTernary->PgNodeTernary + | _ => raise(UnsupportedPeggyNodeType(node["type"])) + } + +let rec pgToString = (peggyNode: peggyNode): string => { + let argsToString = (args: array): string => + args->Js.Array2.map(arg => PgNodeIdentifier(arg)->pgToString)->Js.Array2.toString + + let nodesToStringUsingSeparator = (nodes: array, separator: string): string => + nodes->Js.Array2.map(toString)->Extra.Array.interperse(separator)->Js.String.concatMany("") + + switch peggyNode { + | PgNodeBlock(node) => "{" ++ node["statements"]->nodesToStringUsingSeparator("; ") ++ "}" + | PgNodeBoolean(node) => node["value"]->Js.String.make + | PgNodeCallIdentifier(node) => `::${Js.String.make(node["value"])}` // This is an identifier also but for function names + | PgNodeExpression(node) => "(" ++ node["nodes"]->nodesToStringUsingSeparator(" ") ++ ")" + | PgNodeFloat(node) => node["value"]->Js.String.make + | PgNodeIdentifier(node) => `:${node["value"]}` + | PgNodeInteger(node) => node["value"]->Js.String.make + | PgNodeKeyValue(node) => toString(node["key"]) ++ ": " ++ toString(node["value"]) + | PgNodeLambda(node) => + "{|" ++ node["args"]->argsToString ++ "| " ++ pgToString(PgNodeBlock(node["body"])) ++ "}" + | PgNodeLetStatement(node) => + pgToString(PgNodeIdentifier(node["variable"])) ++ " = " ++ toString(node["value"]) + | PgNodeString(node) => `'${node["value"]->Js.String.make}'` + | PgNodeTernary(node) => + "(::$$ternary " ++ + toString(node["condition"]) ++ + " " ++ + toString(node["trueExpression"]) ++ + " " ++ + toString(node["falseExpression"]) ++ ")" + } +} +and toString = (node: node): string => node->castNodeType->pgToString + +let toStringResult = (rNode: result): string => + switch rNode { + | Ok(node) => toString(node) + | Error(error) => `Error(${errorToString(error)})` + } diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res new file mode 100644 index 00000000..651d4111 --- /dev/null +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res @@ -0,0 +1,49 @@ +module ExpressionBuilder = Reducer_Expression_ExpressionBuilder +module ExpressionT = Reducer_Expression_T +module Parse = Reducer_Peggy_Parse + +type expression = ExpressionT.expression + +let rec fromNode = (node: Parse.node): expression => { + + let caseBlock = nodeBlock => + ExpressionBuilder.eBlock(nodeBlock["statements"]->Js.Array2.map(fromNode)->Belt.List.fromArray) + + let caseLambda = (nodeLambda: Parse.nodeLambda): expression => { + let args = + nodeLambda["args"] + ->Js.Array2.map((argNode: Parse.nodeIdentifier) => argNode["value"]) + ->ExpressionBuilder.eArrayString + let body = nodeLambda["body"]->caseBlock + ExpressionBuilder.eFunction("$$lambda", list{args, body}) + } + + switch Parse.castNodeType(node) { + | PgNodeBlock(nodeBlock) => caseBlock(nodeBlock) + | PgNodeBoolean(nodeBoolean) => ExpressionBuilder.eBool(nodeBoolean["value"]) + | PgNodeCallIdentifier(nodeCallIdentifier) => ExpressionBuilder.eCall(nodeCallIdentifier["value"]) + | PgNodeExpression(nodeExpression) => + ExpressionT.EList(nodeExpression["nodes"]->Js.Array2.map(fromNode)->Belt.List.fromArray) + | PgNodeFloat(nodeFloat) => ExpressionBuilder.eNumber(nodeFloat["value"]) + | PgNodeIdentifier(nodeIdentifier) => ExpressionBuilder.eSymbol(nodeIdentifier["value"]) + | PgNodeInteger(nodeInteger) => ExpressionBuilder.eNumber(Belt.Int.toFloat(nodeInteger["value"])) + | PgNodeKeyValue(nodeKeyValue) => + ExpressionT.EList(list{fromNode(nodeKeyValue["key"]), fromNode(nodeKeyValue["value"])}) + | PgNodeLambda(nodeLambda) => caseLambda(nodeLambda) + | PgNodeLetStatement(nodeLetStatement) => + ExpressionBuilder.eLetStatement( + nodeLetStatement["variable"]["value"], + fromNode(nodeLetStatement["value"]), + ) + | PgNodeString(nodeString) => ExpressionBuilder.eString(nodeString["value"]) + | PgNodeTernary(nodeTernary) => + ExpressionBuilder.eFunction( + "$$ternary", + list{ + fromNode(nodeTernary["condition"]), + fromNode(nodeTernary["trueExpression"]), + fromNode(nodeTernary["falseExpression"]), + }, + ) + } +} diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res index 5c9ee4b7..0fa76304 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res @@ -87,6 +87,12 @@ let toStringResult = x => | Error(m) => `Error(${ErrorValue.errorToString(m)})` } +let toStringResultOkless = codeResult => + switch codeResult { + | Ok(a) => toString(a) + | Error(m) => `Error(${ErrorValue.errorToString(m)})` + } + let toStringResultRecord = x => switch x { | Ok(a) => `Ok(${toStringRecord(a)})` From 4ce1ab1172fd3b243b19eaee5b72efc1f033b03e Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 15:21:49 +0200 Subject: [PATCH 141/340] added subtract test --- .../Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 1553b6df..c6e94643 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -95,6 +95,9 @@ describe("Peggy parse", () => { testParse("1 -> add(2)", "{(::add 1 2)}") testParse("-1 -> add(2)", "{(::add (::unaryMinus 1) 2)}") testParse("1 -> add(2) * 3", "{(::multiply (::add 1 2) 3)}") + testParse("1 -> subtract(2)", "{(::subtract 1 2)}") + testParse("-1 -> subtract(2)", "{(::subtract (::unaryMinus 1) 2)}") + testParse("1 -> subtract(2) * 3", "{(::multiply (::subtract 1 2) 3)}") }) describe("elixir pipe", () => { From 50a5ef2498256a9c7a56bfe55328a5e9f4238860 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 19 May 2022 09:25:34 -0400 Subject: [PATCH 142/340] Touchups for FunctionRegistry distTwo --- .../rescript/Distributions/GenericDist.res | 3 + .../rescript/Distributions/GenericDist.resi | 1 + .../src/rescript/FunctionRegistry.res | 83 +++++++++++++++---- .../src/rescript/Utility/Operation.res | 2 + 4 files changed, 73 insertions(+), 16 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res index 1df10240..dc50833e 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res @@ -24,6 +24,7 @@ let isSymbolic = (t: t) => | _ => false } + let sampleN = (t: t, n) => switch t { | PointSet(r) => PointSetDist.sampleNRendered(n, r) @@ -31,6 +32,8 @@ let sampleN = (t: t, n) => | SampleSet(r) => SampleSetDist.sampleN(r, n) } +let sample = (t: t) => sampleN(t, 1) -> E.A.first |> E.O.toExn("Should not have happened") + let toSampleSetDist = (t: t, n) => SampleSetDist.make(sampleN(t, n))->E.R2.errMap(DistributionTypes.Error.sampleErrorToDistErr) diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi index 79fb54ab..fd9afa58 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.resi @@ -6,6 +6,7 @@ type scaleMultiplyFn = (t, float) => result type pointwiseAddFn = (t, t) => result let sampleN: (t, int) => array +let sample: t => float let toSampleSetDist: (t, int) => Belt.Result.t diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index 7a74ed0c..df04cef9 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -34,6 +34,7 @@ let rec matchInput = (input: itype, r: expressionValue): option => switch (input, r) { | (I_Number, EvNumber(f)) => Some(Number(f)) | (I_DistOrNumber, EvNumber(f)) => Some(DistOrNumber(Number(f))) + | (I_DistOrNumber, EvDistribution(Symbolic(#Float(f)))) => Some(DistOrNumber(Number(f))) | (I_DistOrNumber, EvDistribution(f)) => Some(DistOrNumber(Dist(f))) | (I_Numeric, EvNumber(f)) => Some(Number(f)) | (I_Numeric, EvDistribution(Symbolic(#Float(f)))) => Some(Number(f)) @@ -236,17 +237,19 @@ module Registry = { } } +let impossibleError = "Wrong inputs / Logically impossible" + let twoNumberInputs = (inputs: array) => { switch inputs { | [Number(n1), Number(n2)] => Ok(n1, n2) - | _ => Error("Wrong inputs / Logically impossible") + | _ => Error(impossibleError) } } let twoNumberInputsRecord = (v1, v2, inputs: array) => switch inputs { | [Record([(name1, n1), (name2, n2)])] if name1 == v1 && name2 == v2 => twoNumberInputs([n1, n2]) - | _ => Error("Wrong inputs / Logically impossible") + | _ => Error(impossibleError) } let contain = r => ReducerInterface_ExpressionValue.EvDistribution(Symbolic(r)) @@ -258,24 +261,72 @@ let p5and95 = (p5, p95) => contain(SymbolicDist.Normal.from90PercentCI(p5, p95)) let convertTwoInputs = (inputs: array): result => twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev)) -// let twoDistOrStdev = (a1:distOrNumber, a2:distOrNumber, fn) => { -// switch (a1, a2) { -// | (Number(a1), Number(a2)) => fn(a1, a2) -// | (Dist(a1), Number(a2)) => toSampleSetDist(a1, 1000)->sampleMap(r => fn(r, a2) |> sample) -// | (Number(a1), Dist(a2)) => toSampleSetDist(a2, 1000)->sampleMap(r => fn(a1, r) |> sample) -// | (Dist(a1), Dist(a2)) => SampleSetDist.map2(a1, a2, (m, s) => fn(m, s) |> sample) -// } -// } +let twoDistOrStdev = (a1: value, a2: value) => { + switch (a1, a2) { + | (DistOrNumber(a1), DistOrNumber(a2)) => Ok(a1, a2) + | _ => Error(impossibleError) + } +} + +let distTwo = ( + ~fn: (float, float) => result, + a1: value, + a2: value, +) => { + let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000) + let sampleSetToExpressionValue = ( + b: Belt.Result.t, + ) => + switch b { + | Ok(r) => Ok(ReducerInterface_ExpressionValue.EvDistribution(SampleSet(r))) + | Error(d) => Error(DistributionTypes.Error.toString(d)) + } + + let mapFnResult = r => + switch r { + | Ok(r) => Ok(GenericDist.sample(r)) + | Error(r) => Error(Operation.Other(r)) + } + + let singleVarSample = (a, fn) => { + let sampleSetResult = + toSampleSet(a) |> E.R2.bind(dist => + SampleSetDist.samplesMap( + ~fn=f => fn(f)->mapFnResult, + dist, + )->E.R2.errMap(r => DistributionTypes.SampleSetError(r)) + ) + sampleSetResult->sampleSetToExpressionValue + } + + switch (a1, a2) { + | (DistOrNumber(Number(a1)), DistOrNumber(Number(a2))) => + fn(a1, a2)->E.R2.fmap(r => ReducerInterface_ExpressionValue.EvDistribution(r)) + | (DistOrNumber(Dist(a1)), DistOrNumber(Number(a2))) => singleVarSample(a1, r => fn(r, a2)) + | (DistOrNumber(Number(a1)), DistOrNumber(Dist(a2))) => singleVarSample(a2, r => fn(a1, r)) + | (DistOrNumber(Dist(a1)), DistOrNumber(Dist(a2))) => { + let altFn = (a, b) => fn(a, b)->mapFnResult + let sampleSetResult = + E.R.merge(toSampleSet(a1), toSampleSet(a2)) + ->E.R2.errMap(DistributionTypes.Error.toString) + ->E.R.bind(((t1, t2)) => { + SampleSetDist.map2(~fn=altFn, ~t1, ~t2)->E.R2.errMap(Operation.Error.toString) + }) + ->E.R2.errMap(r => DistributionTypes.OtherError(r)) + sampleSetResult->sampleSetToExpressionValue + } + | _ => Error(impossibleError) + } +} let normal = Function.make( "Normal", [ - Function.makeDefinition("normal", [I_Numeric, I_Numeric], inputs => - twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev)) - ), - Function.makeDefinition("normal", [I_DistOrNumber, I_DistOrNumber], inputs => - twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev)) - ), + Function.makeDefinition("normal", [I_DistOrNumber, I_DistOrNumber], inputs => { + let combine = (a1: float, a2: float) => + SymbolicDist.Normal.make(a1, a2)->E.R2.fmap(r => DistributionTypes.Symbolic(r)) + distTwo(~fn=combine, inputs[0], inputs[1]) + }), Function.makeDefinition( "normal", [I_Record([("mean", I_Numeric), ("stdev", I_Numeric)])], diff --git a/packages/squiggle-lang/src/rescript/Utility/Operation.res b/packages/squiggle-lang/src/rescript/Utility/Operation.res index 7972b2fa..6476850d 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Operation.res +++ b/packages/squiggle-lang/src/rescript/Utility/Operation.res @@ -58,6 +58,7 @@ type operationError = | SampleMapNeedsNtoNFunction | PdfInvalidError | NotYetImplemented // should be removed when `klDivergence` for mixed and discrete is implemented. + | Other(string) @genType module Error = { @@ -73,6 +74,7 @@ module Error = { | SampleMapNeedsNtoNFunction => "SampleMap needs a function that converts a number to a number" | PdfInvalidError => "This Pdf is invalid" | NotYetImplemented => "This pathway is not yet implemented" + | Other(t) => t } } From f547db9d0ad52f0a579bbd821ffaa28b5e917e1b Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 16:35:12 +0200 Subject: [PATCH 143/340] multi line problem due to block and lambda ambiguity --- .../Reducer_Peggy_GeneratedParser.js | 242 +++++++++++++----- .../Reducer_Peggy_GeneratedParser.pegjs | 26 +- 2 files changed, 194 insertions(+), 74 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index fa2d84ec..54367909 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -570,7 +570,7 @@ function peg$parse(input, options) { function peg$parsestart() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 55 + 0; + var key = peg$currPos * 56 + 0; var cached = peg$resultsCache[key]; if (cached) { @@ -600,10 +600,10 @@ function peg$parse(input, options) { return s0; } - function peg$parsezeroOMoreArgumentsBlock() { + function peg$parsezeroOMoreArgumentsBlockOrExpression() { var s0; - var key = peg$currPos * 55 + 1; + var key = peg$currPos * 56 + 1; var cached = peg$resultsCache[key]; if (cached) { @@ -612,7 +612,7 @@ function peg$parse(input, options) { return cached.result; } - s0 = peg$parseinnerBlock(); + s0 = peg$parseinnerBlockOrExpression(); if (s0 === peg$FAILED) { s0 = peg$parselambda(); } @@ -625,7 +625,7 @@ function peg$parse(input, options) { function peg$parseouterBlock() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 55 + 2; + var key = peg$currPos * 56 + 2; var cached = peg$resultsCache[key]; if (cached) { @@ -675,10 +675,10 @@ function peg$parse(input, options) { return s0; } - function peg$parseinnerBlock() { + function peg$parseinnerBlockOrExpression() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 55 + 3; + var key = peg$currPos * 56 + 3; var cached = peg$resultsCache[key]; if (cached) { @@ -696,7 +696,7 @@ function peg$parse(input, options) { if (peg$silentFails === 0) { peg$fail(peg$e0); } } if (s1 !== peg$FAILED) { - s2 = peg$parse_(); + s2 = peg$parse_nl(); s3 = peg$parsearray_statements(); if (s3 !== peg$FAILED) { s4 = peg$currPos; @@ -751,7 +751,7 @@ function peg$parse(input, options) { if (peg$silentFails === 0) { peg$fail(peg$e0); } } if (s1 !== peg$FAILED) { - s2 = peg$parse_(); + s2 = peg$parse_nl(); s3 = peg$parseexpression(); if (s3 !== peg$FAILED) { s4 = peg$parse_(); @@ -793,10 +793,119 @@ function peg$parse(input, options) { return s0; } + function peg$parsequotedInnerBlock() { + var s0, s1, s2, s3, s4, s5, s6; + + var key = peg$currPos * 56 + 4; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 123) { + s1 = peg$c0; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e0); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse_nl(); + s3 = peg$parsearray_statements(); + if (s3 !== peg$FAILED) { + s4 = peg$currPos; + s5 = peg$parsestatementSeparator(); + if (s5 !== peg$FAILED) { + s6 = peg$parseexpression(); + if (s6 !== peg$FAILED) { + s4 = s6; + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + if (s4 !== peg$FAILED) { + s5 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 125) { + s6 = peg$c1; + peg$currPos++; + } else { + s6 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e1); } + } + if (s6 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f3(s3, s4); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + if (s0 === peg$FAILED) { + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 123) { + s1 = peg$c0; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e0); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse_nl(); + s3 = peg$parseexpression(); + if (s3 !== peg$FAILED) { + s4 = peg$parse_(); + if (input.charCodeAt(peg$currPos) === 125) { + s5 = peg$c1; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e1); } + } + if (s5 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f4(s3); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parsearray_statements() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 55 + 4; + var key = peg$currPos * 56 + 5; var cached = peg$resultsCache[key]; if (cached) { @@ -851,7 +960,7 @@ function peg$parse(input, options) { function peg$parsestatement() { var s0; - var key = peg$currPos * 55 + 5; + var key = peg$currPos * 56 + 6; var cached = peg$resultsCache[key]; if (cached) { @@ -873,7 +982,7 @@ function peg$parse(input, options) { function peg$parseletStatement() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 55 + 6; + var key = peg$currPos * 56 + 7; var cached = peg$resultsCache[key]; if (cached) { @@ -895,7 +1004,7 @@ function peg$parse(input, options) { } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); - s5 = peg$parsezeroOMoreArgumentsBlock(); + s5 = peg$parsezeroOMoreArgumentsBlockOrExpression(); if (s5 !== peg$FAILED) { peg$savedPos = s0; s0 = peg$f7(s1, s5); @@ -920,7 +1029,7 @@ function peg$parse(input, options) { function peg$parsedefunStatement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 55 + 7; + var key = peg$currPos * 56 + 8; var cached = peg$resultsCache[key]; if (cached) { @@ -962,7 +1071,7 @@ function peg$parse(input, options) { } if (s8 !== peg$FAILED) { s9 = peg$parse_nl(); - s10 = peg$parseinnerBlock(); + s10 = peg$parseinnerBlockOrExpression(); if (s10 !== peg$FAILED) { peg$savedPos = s0; s0 = peg$f8(s1, s4, s10); @@ -999,7 +1108,7 @@ function peg$parse(input, options) { function peg$parsearray_parameters() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 55 + 8; + var key = peg$currPos * 56 + 9; var cached = peg$resultsCache[key]; if (cached) { @@ -1074,7 +1183,7 @@ function peg$parse(input, options) { function peg$parseexpression() { var s0; - var key = peg$currPos * 55 + 9; + var key = peg$currPos * 56 + 10; var cached = peg$resultsCache[key]; if (cached) { @@ -1099,7 +1208,7 @@ function peg$parse(input, options) { function peg$parseifthenelse() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11; - var key = peg$currPos * 55 + 10; + var key = peg$currPos * 56 + 11; var cached = peg$resultsCache[key]; if (cached) { @@ -1133,7 +1242,7 @@ function peg$parse(input, options) { if (s5 !== peg$FAILED) { s6 = peg$parse__nl(); if (s6 !== peg$FAILED) { - s7 = peg$parseinnerBlock(); + s7 = peg$parseinnerBlockOrExpression(); if (s7 !== peg$FAILED) { s8 = peg$parse__nl(); if (s8 !== peg$FAILED) { @@ -1149,7 +1258,7 @@ function peg$parse(input, options) { if (s10 !== peg$FAILED) { s11 = peg$parseifthenelse(); if (s11 === peg$FAILED) { - s11 = peg$parseinnerBlock(); + s11 = peg$parseinnerBlockOrExpression(); } if (s11 !== peg$FAILED) { peg$savedPos = s0; @@ -1207,7 +1316,7 @@ function peg$parse(input, options) { function peg$parseternary() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 55 + 11; + var key = peg$currPos * 56 + 12; var cached = peg$resultsCache[key]; if (cached) { @@ -1277,7 +1386,7 @@ function peg$parse(input, options) { function peg$parselogicalAdditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 55 + 12; + var key = peg$currPos * 56 + 13; var cached = peg$resultsCache[key]; if (cached) { @@ -1354,7 +1463,7 @@ function peg$parse(input, options) { function peg$parselogicalMultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 55 + 13; + var key = peg$currPos * 56 + 14; var cached = peg$resultsCache[key]; if (cached) { @@ -1431,7 +1540,7 @@ function peg$parse(input, options) { function peg$parseequality() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 55 + 14; + var key = peg$currPos * 56 + 15; var cached = peg$resultsCache[key]; if (cached) { @@ -1490,7 +1599,7 @@ function peg$parse(input, options) { function peg$parserelational() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 55 + 15; + var key = peg$currPos * 56 + 16; var cached = peg$resultsCache[key]; if (cached) { @@ -1567,7 +1676,7 @@ function peg$parse(input, options) { function peg$parseadditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 55 + 16; + var key = peg$currPos * 56 + 17; var cached = peg$resultsCache[key]; if (cached) { @@ -1698,7 +1807,7 @@ function peg$parse(input, options) { function peg$parsemultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 55 + 17; + var key = peg$currPos * 56 + 18; var cached = peg$resultsCache[key]; if (cached) { @@ -1829,7 +1938,7 @@ function peg$parse(input, options) { function peg$parsepower() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 55 + 18; + var key = peg$currPos * 56 + 19; var cached = peg$resultsCache[key]; if (cached) { @@ -1924,7 +2033,7 @@ function peg$parse(input, options) { function peg$parsecredibleInterval() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 55 + 19; + var key = peg$currPos * 56 + 20; var cached = peg$resultsCache[key]; if (cached) { @@ -2021,7 +2130,7 @@ function peg$parse(input, options) { function peg$parsechainFunctionCall() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 55 + 20; + var key = peg$currPos * 56 + 21; var cached = peg$resultsCache[key]; if (cached) { @@ -2116,7 +2225,7 @@ function peg$parse(input, options) { function peg$parsechainedFunction() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 55 + 21; + var key = peg$currPos * 56 + 22; var cached = peg$resultsCache[key]; if (cached) { @@ -2220,7 +2329,7 @@ function peg$parse(input, options) { function peg$parseunary() { var s0, s1, s2, s3; - var key = peg$currPos * 55 + 22; + var key = peg$currPos * 56 + 23; var cached = peg$resultsCache[key]; if (cached) { @@ -2260,7 +2369,7 @@ function peg$parse(input, options) { function peg$parseunaryOperator() { var s0; - var key = peg$currPos * 55 + 23; + var key = peg$currPos * 56 + 24; var cached = peg$resultsCache[key]; if (cached) { @@ -2303,7 +2412,7 @@ function peg$parse(input, options) { function peg$parseindexedValue() { var s0; - var key = peg$currPos * 55 + 24; + var key = peg$currPos * 56 + 25; var cached = peg$resultsCache[key]; if (cached) { @@ -2325,7 +2434,7 @@ function peg$parse(input, options) { function peg$parsecollectionElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 55 + 25; + var key = peg$currPos * 56 + 26; var cached = peg$resultsCache[key]; if (cached) { @@ -2534,7 +2643,7 @@ function peg$parse(input, options) { function peg$parsearray_functionArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 55 + 26; + var key = peg$currPos * 56 + 27; var cached = peg$resultsCache[key]; if (cached) { @@ -2609,7 +2718,7 @@ function peg$parse(input, options) { function peg$parsemaybeRecordElement() { var s0; - var key = peg$currPos * 55 + 27; + var key = peg$currPos * 56 + 28; var cached = peg$resultsCache[key]; if (cached) { @@ -2631,7 +2740,7 @@ function peg$parse(input, options) { function peg$parserecordElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 55 + 28; + var key = peg$currPos * 56 + 29; var cached = peg$resultsCache[key]; if (cached) { @@ -2741,7 +2850,7 @@ function peg$parse(input, options) { function peg$parseatom() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 55 + 29; + var key = peg$currPos * 56 + 30; var cached = peg$resultsCache[key]; if (cached) { @@ -2797,7 +2906,7 @@ function peg$parse(input, options) { function peg$parsebasicValue() { var s0; - var key = peg$currPos * 55 + 30; + var key = peg$currPos * 56 + 31; var cached = peg$resultsCache[key]; if (cached) { @@ -2819,7 +2928,7 @@ function peg$parse(input, options) { function peg$parsebasicLiteral() { var s0; - var key = peg$currPos * 55 + 31; + var key = peg$currPos * 56 + 32; var cached = peg$resultsCache[key]; if (cached) { @@ -2850,7 +2959,7 @@ function peg$parse(input, options) { function peg$parseidentifier() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 55 + 32; + var key = peg$currPos * 56 + 33; var cached = peg$resultsCache[key]; if (cached) { @@ -2928,7 +3037,7 @@ function peg$parse(input, options) { function peg$parsestring() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 55 + 33; + var key = peg$currPos * 56 + 34; var cached = peg$resultsCache[key]; if (cached) { @@ -3054,7 +3163,7 @@ function peg$parse(input, options) { function peg$parseinteger() { var s0, s1, s2, s3; - var key = peg$currPos * 55 + 34; + var key = peg$currPos * 56 + 35; var cached = peg$resultsCache[key]; if (cached) { @@ -3129,7 +3238,7 @@ function peg$parse(input, options) { function peg$parsefloat() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 55 + 35; + var key = peg$currPos * 56 + 36; var cached = peg$resultsCache[key]; if (cached) { @@ -3219,7 +3328,7 @@ function peg$parse(input, options) { function peg$parseboolean() { var s0, s1; - var key = peg$currPos * 55 + 36; + var key = peg$currPos * 56 + 37; var cached = peg$resultsCache[key]; if (cached) { @@ -3265,7 +3374,7 @@ function peg$parse(input, options) { function peg$parsevalueConstructor() { var s0; - var key = peg$currPos * 55 + 37; + var key = peg$currPos * 56 + 38; var cached = peg$resultsCache[key]; if (cached) { @@ -3279,6 +3388,9 @@ function peg$parse(input, options) { s0 = peg$parsearrayConstructor(); if (s0 === peg$FAILED) { s0 = peg$parselambda(); + if (s0 === peg$FAILED) { + s0 = peg$parsequotedInnerBlock(); + } } } @@ -3290,7 +3402,7 @@ function peg$parse(input, options) { function peg$parselambda() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12; - var key = peg$currPos * 55 + 38; + var key = peg$currPos * 56 + 39; var cached = peg$resultsCache[key]; if (cached) { @@ -3465,7 +3577,7 @@ function peg$parse(input, options) { function peg$parsearrayConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 55 + 39; + var key = peg$currPos * 56 + 40; var cached = peg$resultsCache[key]; if (cached) { @@ -3554,7 +3666,7 @@ function peg$parse(input, options) { function peg$parsearray_elements() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 55 + 40; + var key = peg$currPos * 56 + 41; var cached = peg$resultsCache[key]; if (cached) { @@ -3629,7 +3741,7 @@ function peg$parse(input, options) { function peg$parserecordConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 55 + 41; + var key = peg$currPos * 56 + 42; var cached = peg$resultsCache[key]; if (cached) { @@ -3688,7 +3800,7 @@ function peg$parse(input, options) { function peg$parsearray_recordArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 55 + 42; + var key = peg$currPos * 56 + 43; var cached = peg$resultsCache[key]; if (cached) { @@ -3763,7 +3875,7 @@ function peg$parse(input, options) { function peg$parsekeyValuePair() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 55 + 43; + var key = peg$currPos * 56 + 44; var cached = peg$resultsCache[key]; if (cached) { @@ -3810,7 +3922,7 @@ function peg$parse(input, options) { function peg$parse_() { var s0, s1; - var key = peg$currPos * 55 + 44; + var key = peg$currPos * 56 + 45; var cached = peg$resultsCache[key]; if (cached) { @@ -3838,7 +3950,7 @@ function peg$parse(input, options) { function peg$parse_nl() { var s0, s1; - var key = peg$currPos * 55 + 45; + var key = peg$currPos * 56 + 46; var cached = peg$resultsCache[key]; if (cached) { @@ -3872,7 +3984,7 @@ function peg$parse(input, options) { function peg$parse__() { var s0, s1; - var key = peg$currPos * 55 + 46; + var key = peg$currPos * 56 + 47; var cached = peg$resultsCache[key]; if (cached) { @@ -3906,7 +4018,7 @@ function peg$parse(input, options) { function peg$parse__nl() { var s0, s1; - var key = peg$currPos * 55 + 47; + var key = peg$currPos * 56 + 48; var cached = peg$resultsCache[key]; if (cached) { @@ -3946,7 +4058,7 @@ function peg$parse(input, options) { function peg$parsestatementSeparator() { var s0, s1, s2, s3; - var key = peg$currPos * 55 + 48; + var key = peg$currPos * 56 + 49; var cached = peg$resultsCache[key]; if (cached) { @@ -3987,7 +4099,7 @@ function peg$parse(input, options) { s2 = peg$FAILED; } if (s2 !== peg$FAILED) { - s3 = peg$parse_(); + s3 = peg$parse_nl(); s1 = [s1, s2, s3]; s0 = s1; } else { @@ -4008,7 +4120,7 @@ function peg$parse(input, options) { function peg$parsecommentOrNewLine() { var s0, s1, s2; - var key = peg$currPos * 55 + 49; + var key = peg$currPos * 56 + 50; var cached = peg$resultsCache[key]; if (cached) { @@ -4039,7 +4151,7 @@ function peg$parse(input, options) { function peg$parsefinalComment() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 55 + 50; + var key = peg$currPos * 56 + 51; var cached = peg$resultsCache[key]; if (cached) { @@ -4105,7 +4217,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharactersOrComment() { var s0; - var key = peg$currPos * 55 + 51; + var key = peg$currPos * 56 + 52; var cached = peg$resultsCache[key]; if (cached) { @@ -4127,7 +4239,7 @@ function peg$parse(input, options) { function peg$parsedelimitedComment() { var s0, s1, s2, s3; - var key = peg$currPos * 55 + 52; + var key = peg$currPos * 56 + 53; var cached = peg$resultsCache[key]; if (cached) { @@ -4195,7 +4307,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharacters() { var s0; - var key = peg$currPos * 55 + 53; + var key = peg$currPos * 56 + 54; var cached = peg$resultsCache[key]; if (cached) { @@ -4220,7 +4332,7 @@ function peg$parse(input, options) { function peg$parsenewLine() { var s0, s1; - var key = peg$currPos * 55 + 54; + var key = peg$currPos * 56 + 55; var cached = peg$resultsCache[key]; if (cached) { diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs index 242d9814..5ad59be8 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs @@ -66,7 +66,7 @@ start = _nl start:outerBlock _nl finalComment? {return start} -zeroOMoreArgumentsBlock = innerBlock / lambda +zeroOMoreArgumentsBlockOrExpression = innerBlockOrExpression / lambda outerBlock = statements:array_statements finalExpression: (statementSeparator @expression)? @@ -75,15 +75,22 @@ outerBlock / finalExpression: expression { return nodeBlock([finalExpression])} -innerBlock - = '{' _ statements:array_statements finalExpression: (statementSeparator @expression) _ '}' +innerBlockOrExpression + = '{' _nl statements:array_statements finalExpression: (statementSeparator @expression) _ '}' { statements.push(finalExpression) return nodeBlock(statements) } - / '{' _ finalExpression: expression _ '}' + / '{' _nl finalExpression: expression _ '}' { return nodeBlock([finalExpression]) } / finalExpression: expression { return nodeBlock([finalExpression])} +quotedInnerBlock + = '{' _nl statements:array_statements finalExpression: (statementSeparator @expression) _ '}' + { statements.push(finalExpression) + return nodeBlock(statements) } + / '{' _nl finalExpression: expression _ '}' + { return nodeBlock([finalExpression]) } + array_statements = head:statement tail:(statementSeparator @array_statements ) { return [head, ...tail] } @@ -95,12 +102,12 @@ statement / defunStatement letStatement - = variable:identifier _ '=' _nl value:zeroOMoreArgumentsBlock + = variable:identifier _ '=' _nl value:zeroOMoreArgumentsBlockOrExpression { return nodeLetStatment(variable, value) } defunStatement - = variable:identifier '(' _nl args:array_parameters _nl ')' _ '=' _nl body:innerBlock + = variable:identifier '(' _nl args:array_parameters _nl ')' _ '=' _nl body:innerBlockOrExpression { var value = nodeLambda(args, body) return nodeLetStatment(variable, value) } @@ -112,8 +119,8 @@ expression = ifthenelse / ternary / logicalAdditive ifthenelse = 'if' __nl condition:logicalAdditive - __nl 'then' __nl trueExpression:innerBlock - __nl 'else' __nl falseExpression:(ifthenelse/innerBlock) + __nl 'then' __nl trueExpression:innerBlockOrExpression + __nl 'else' __nl falseExpression:(ifthenelse/innerBlockOrExpression) { return nodeTernary(condition, trueExpression, falseExpression) } ternary @@ -258,6 +265,7 @@ valueConstructor = recordConstructor / arrayConstructor / lambda + / quotedInnerBlock lambda = '{' _nl '|' _nl args:array_parameters _nl '|' _nl statements:array_statements finalExpression: (statementSeparator @expression) _nl '}' @@ -301,7 +309,7 @@ __nl 'whitespace or newline' = (whiteSpaceCharactersOrComment / commentOrNewLine )+ statementSeparator 'statement separator' - = _ (';'/ commentOrNewLine)+ _ + = _ (';'/ commentOrNewLine)+ _nl commentOrNewLine = finalComment? newLine From 0526629d948a4b7016b983dc39d090d9e6b047db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 14:37:32 +0000 Subject: [PATCH 144/340] :arrow_up: Bump @storybook/react from 6.4.22 to 6.5.2 Bumps [@storybook/react](https://github.com/storybookjs/storybook/tree/HEAD/app/react) from 6.4.22 to 6.5.2. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.2/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.2/app/react) --- updated-dependencies: - dependency-name: "@storybook/react" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 658 +++++++++++++++++++++++++++++-- 2 files changed, 621 insertions(+), 39 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 8a1a6b62..bcd08f70 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -25,7 +25,7 @@ "@storybook/manager-webpack5": "^6.4.22", "@storybook/node-logger": "^6.4.22", "@storybook/preset-create-react-app": "^4.1.0", - "@storybook/react": "^6.4.22", + "@storybook/react": "^6.5.2", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^14.2.0", diff --git a/yarn.lock b/yarn.lock index 9666fb0e..54f81ab4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -147,6 +147,11 @@ jsonpointer "^5.0.0" leven "^3.1.0" +"@aw-web-design/x-default-browser@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@aw-web-design/x-default-browser/-/x-default-browser-1.4.0.tgz#3f9be9d5f5ce7a3b6a0298870717e79bec5acb10" + integrity sha512-F20Xs2yCgeXuU6+Q8DzlRp2jdLB3roJ2qlgDxg6EgTJ8mX8LilGjdViMXFvR7LOdCmNgPMNBnUiamsrf6esP6g== + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" @@ -607,7 +612,7 @@ "@babel/helper-create-class-features-plugin" "^7.16.10" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-private-property-in-object@^7.16.7", "@babel/plugin-proposal-private-property-in-object@^7.17.12": +"@babel/plugin-proposal-private-property-in-object@^7.12.1", "@babel/plugin-proposal-private-property-in-object@^7.16.7", "@babel/plugin-proposal-private-property-in-object@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d" integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg== @@ -3058,6 +3063,23 @@ global "^4.4.0" regenerator-runtime "^0.13.7" +"@storybook/addons@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.5.2.tgz#59ec479e3cb714e61adc08732ffad388e59c14ba" + integrity sha512-v7odkqaZUrQJQF1QRQ/amFgtklj972NoSsqOSA3D6rjc3J8qZfrtNxqN54vW7B+xl+Uu08cUjvSp34uWMs3xfg== + dependencies: + "@storybook/api" "6.5.2" + "@storybook/channels" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/router" "6.5.2" + "@storybook/theming" "6.5.2" + "@types/webpack-env" "^1.16.0" + core-js "^3.8.2" + global "^4.4.0" + regenerator-runtime "^0.13.7" + "@storybook/api@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.4.22.tgz#d63f7ad3ffdd74af01ae35099bff4c39702cf793" @@ -3081,6 +3103,29 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/api@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.2.tgz#e5b61b26c5d2d1c15876e281917e2f91cbc59a52" + integrity sha512-i3no64ULdnTt6kdacrRF1SVz03QGtj2yggXYG0e0agz6tB1D/THeDs0o1+J30jUFm0oF+XL204JjNKio31kSYQ== + dependencies: + "@storybook/channels" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/router" "6.5.2" + "@storybook/semver" "^7.3.2" + "@storybook/theming" "6.5.2" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + regenerator-runtime "^0.13.7" + store2 "^2.12.0" + telejson "^6.0.8" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/builder-webpack4@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.4.22.tgz#d3384b146e97a2b3a6357c6eb8279ff0f1c7f8f5" @@ -3156,6 +3201,59 @@ webpack-hot-middleware "^2.25.1" webpack-virtual-modules "^0.2.2" +"@storybook/builder-webpack4@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.2.tgz#5779ad29aacfd8784896b738e33c9d548ff16821" + integrity sha512-+Vch4u+gbC0ZA54zPl3zfufocxP/cmO9a3OLD51ujdqe/6ke8eT61yD5D4UCRFfsMcwWEgtLYwcguWIhW4RKUg== + dependencies: + "@babel/core" "^7.12.10" + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/channel-postmessage" "6.5.2" + "@storybook/channels" "6.5.2" + "@storybook/client-api" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/components" "6.5.2" + "@storybook/core-common" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/node-logger" "6.5.2" + "@storybook/preview-web" "6.5.2" + "@storybook/router" "6.5.2" + "@storybook/semver" "^7.3.2" + "@storybook/store" "6.5.2" + "@storybook/theming" "6.5.2" + "@storybook/ui" "6.5.2" + "@types/node" "^14.0.10 || ^16.0.0" + "@types/webpack" "^4.41.26" + autoprefixer "^9.8.6" + babel-loader "^8.0.0" + case-sensitive-paths-webpack-plugin "^2.3.0" + core-js "^3.8.2" + css-loader "^3.6.0" + file-loader "^6.2.0" + find-up "^5.0.0" + fork-ts-checker-webpack-plugin "^4.1.6" + glob "^7.1.6" + glob-promise "^3.4.0" + global "^4.4.0" + html-webpack-plugin "^4.0.0" + pnp-webpack-plugin "1.6.4" + postcss "^7.0.36" + postcss-flexbugs-fixes "^4.2.1" + postcss-loader "^4.2.0" + raw-loader "^4.0.2" + stable "^0.1.8" + style-loader "^1.3.0" + terser-webpack-plugin "^4.2.3" + ts-dedent "^2.0.0" + url-loader "^4.1.1" + util-deprecate "^1.0.2" + webpack "4" + webpack-dev-middleware "^3.7.3" + webpack-filter-warnings-plugin "^1.2.1" + webpack-hot-middleware "^2.25.1" + webpack-virtual-modules "^0.2.2" + "@storybook/builder-webpack5@^6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.4.22.tgz#cd10b3b307f4a6f9c474d3b72ba5555055395681" @@ -3232,6 +3330,19 @@ qs "^6.10.0" telejson "^5.3.2" +"@storybook/channel-postmessage@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.5.2.tgz#1ce4e417229a4f3772f2a8a9a357dd3fd0a3797e" + integrity sha512-qIbkESElK5oO12zDZCQpqfIe5ceInkoSoT0F1ZfQTjZpc4cO65pJEDDfR8TN7gXD9CNeu5cCJKE0heQ/+TFIbw== + dependencies: + "@storybook/channels" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/core-events" "6.5.2" + core-js "^3.8.2" + global "^4.4.0" + qs "^6.10.0" + telejson "^6.0.8" + "@storybook/channel-websocket@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.4.22.tgz#d541f69125873123c453757e2b879a75a9266c65" @@ -3243,6 +3354,17 @@ global "^4.4.0" telejson "^5.3.2" +"@storybook/channel-websocket@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.2.tgz#cc7b1d1a592ccf953f99cec18fb7846445eea34d" + integrity sha512-lNIOWm15CKUxLc/Ak7/OHSCCsE6Up6rL5Nl0SUUir1cZEW4yF+JR27UBYiZtwJdLkDojkdCQmyFNTPW2+pTfuQ== + dependencies: + "@storybook/channels" "6.5.2" + "@storybook/client-logger" "6.5.2" + core-js "^3.8.2" + global "^4.4.0" + telejson "^6.0.8" + "@storybook/channels@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.4.22.tgz#710f732763d63f063f615898ab1afbe74e309596" @@ -3252,6 +3374,15 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/channels@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.2.tgz#ca964ee7d39874f4a7e450345a432c1681007995" + integrity sha512-gdKOKIpG+PYmfofukbTGbTPV5XxMip5ZgqclbGdUCNDOjR/yUrBTnKLGoO+S7SbT2JlgNqBb/TifMobA3dqD2w== + dependencies: + core-js "^3.8.2" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/client-api@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.4.22.tgz#df14f85e7900b94354c26c584bab53a67c47eae9" @@ -3278,6 +3409,32 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/client-api@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.2.tgz#f1cabf78d1f522610c8393affd10d016898ce1d0" + integrity sha512-boMUUuT9wxPBREoC1NfucSYu5rjQkPc7F4RlAr5OvUG/BwxauwQmg8QMcBv73MfjY6+6OGeSd5Bp/ELKkTC0zg== + dependencies: + "@storybook/addons" "6.5.2" + "@storybook/channel-postmessage" "6.5.2" + "@storybook/channels" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.2" + "@types/qs" "^6.9.5" + "@types/webpack-env" "^1.16.0" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + store2 "^2.12.0" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/client-logger@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.4.22.tgz#51abedb7d3c9bc21921aeb153ac8a19abc625cd6" @@ -3286,6 +3443,14 @@ core-js "^3.8.2" global "^4.4.0" +"@storybook/client-logger@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.2.tgz#1dcd7810649586bddef7997e5501d8a225a457f3" + integrity sha512-KT7SrLvf1k2S4jUFiYefSn1h6yXyC8WbPvvYPpnfCN3eVpGYNYYe4Mn4XmKYCOY3QcLUsQWaKXRY5Mz3SzcA0g== + dependencies: + core-js "^3.8.2" + global "^4.4.0" + "@storybook/components@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.4.22.tgz#4d425280240702883225b6a1f1abde7dc1a0e945" @@ -3316,6 +3481,21 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/components@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.2.tgz#185bf0d75585fe1299c51a001ace405872aa42cd" + integrity sha512-Zulmcm2qLvkF0whP2YV5WDrPi8q/P+GVt9cGD53XqvqxVGtIO7QvqZ/RDKJn8LNpvfEnxyAzX1JOxUe5o2wFjA== + dependencies: + "@storybook/client-logger" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/theming" "6.5.2" + "@types/react-syntax-highlighter" "11.0.5" + core-js "^3.8.2" + qs "^6.10.0" + react-syntax-highlighter "^15.4.5" + regenerator-runtime "^0.13.7" + util-deprecate "^1.0.2" + "@storybook/core-client@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.4.22.tgz#9079eda8a9c8e6ba24b84962a749b1c99668cb2a" @@ -3342,6 +3522,32 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" +"@storybook/core-client@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.2.tgz#98063ba6eec19b18c71d0f478060aeb3a0a6a07a" + integrity sha512-NlgNbEL9arcrxBoGxX8TR8CH29r4rsO9fDQEE+z39gCeWvPi+3aDV8+8NQxaenfWTuEU9lSgwNje7Pd14KDe0w== + dependencies: + "@storybook/addons" "6.5.2" + "@storybook/channel-postmessage" "6.5.2" + "@storybook/channel-websocket" "6.5.2" + "@storybook/client-api" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/preview-web" "6.5.2" + "@storybook/store" "6.5.2" + "@storybook/ui" "6.5.2" + airbnb-js-shims "^2.2.1" + ansi-to-html "^0.6.11" + core-js "^3.8.2" + global "^4.4.0" + lodash "^4.17.21" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + ts-dedent "^2.0.0" + unfetch "^4.2.0" + util-deprecate "^1.0.2" + "@storybook/core-common@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.4.22.tgz#b00fa3c0625e074222a50be3196cb8052dd7f3bf" @@ -3397,6 +3603,62 @@ util-deprecate "^1.0.2" webpack "4" +"@storybook/core-common@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.2.tgz#3248510f4d80c8159dfbad2fa28c257677247ede" + integrity sha512-mZC7wFgmVIKdItb1PkklAP6mLbFHQltCe58TToP2aZ2cbZGfOo9nWG4bZaM/Or9dvKmxRaKPxA5efkK7VcKxiw== + dependencies: + "@babel/core" "^7.12.10" + "@babel/plugin-proposal-class-properties" "^7.12.1" + "@babel/plugin-proposal-decorators" "^7.12.12" + "@babel/plugin-proposal-export-default-from" "^7.12.1" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" + "@babel/plugin-proposal-object-rest-spread" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.12.7" + "@babel/plugin-proposal-private-methods" "^7.12.1" + "@babel/plugin-proposal-private-property-in-object" "^7.12.1" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-transform-arrow-functions" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.12" + "@babel/plugin-transform-classes" "^7.12.1" + "@babel/plugin-transform-destructuring" "^7.12.1" + "@babel/plugin-transform-for-of" "^7.12.1" + "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/plugin-transform-shorthand-properties" "^7.12.1" + "@babel/plugin-transform-spread" "^7.12.1" + "@babel/preset-env" "^7.12.11" + "@babel/preset-react" "^7.12.10" + "@babel/preset-typescript" "^7.12.7" + "@babel/register" "^7.12.1" + "@storybook/node-logger" "6.5.2" + "@storybook/semver" "^7.3.2" + "@types/node" "^14.0.10 || ^16.0.0" + "@types/pretty-hrtime" "^1.0.0" + babel-loader "^8.0.0" + babel-plugin-macros "^3.0.1" + babel-plugin-polyfill-corejs3 "^0.1.0" + chalk "^4.1.0" + core-js "^3.8.2" + express "^4.17.1" + file-system-cache "^1.0.5" + find-up "^5.0.0" + fork-ts-checker-webpack-plugin "^6.0.4" + fs-extra "^9.0.1" + glob "^7.1.6" + handlebars "^4.7.7" + interpret "^2.2.0" + json5 "^2.1.3" + lazy-universal-dotenv "^3.0.1" + picomatch "^2.3.0" + pkg-dir "^5.0.0" + pretty-hrtime "^1.0.3" + resolve-from "^5.0.0" + slash "^3.0.0" + telejson "^6.0.8" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + webpack "4" + "@storybook/core-events@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.4.22.tgz#c09b0571951affd4254028b8958a4d8652700989" @@ -3404,6 +3666,13 @@ dependencies: core-js "^3.8.2" +"@storybook/core-events@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.2.tgz#639d6b1183a72829a035dbae5a06c6ff94aa8c59" + integrity sha512-RPxPmfW8fPRV8EV+9O1jS0jH/fBw4SC7gJ7M36fRwbI2kHTyr1mI3Rr0sBOfxagx5nyHwfd6q89TQYNnn5YaQw== + dependencies: + core-js "^3.8.2" + "@storybook/core-server@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.4.22.tgz#254409ec2ba49a78b23f5e4a4c0faea5a570a32b" @@ -3452,6 +3721,57 @@ webpack "4" ws "^8.2.3" +"@storybook/core-server@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.2.tgz#96d5d105c8cf24a06c41823a9ebfa68d45c4106f" + integrity sha512-xRUBvR4Q2YMCxLuWjM3PfsINr503swclW9F/Zwi7cvtSqMJgkavmVtENnWb9/Cq0mvjA/wKbjfUpGt4rEsZCbQ== + dependencies: + "@aw-web-design/x-default-browser" "1.4.0" + "@discoveryjs/json-ext" "^0.5.3" + "@storybook/builder-webpack4" "6.5.2" + "@storybook/core-client" "6.5.2" + "@storybook/core-common" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/csf-tools" "6.5.2" + "@storybook/manager-webpack4" "6.5.2" + "@storybook/node-logger" "6.5.2" + "@storybook/semver" "^7.3.2" + "@storybook/store" "6.5.2" + "@storybook/telemetry" "6.5.2" + "@types/node" "^14.0.10 || ^16.0.0" + "@types/node-fetch" "^2.5.7" + "@types/pretty-hrtime" "^1.0.0" + "@types/webpack" "^4.41.26" + better-opn "^2.1.1" + boxen "^5.1.2" + chalk "^4.1.0" + cli-table3 "^0.6.1" + commander "^6.2.1" + compression "^1.7.4" + core-js "^3.8.2" + cpy "^8.1.2" + detect-port "^1.3.0" + express "^4.17.1" + fs-extra "^9.0.1" + global "^4.4.0" + globby "^11.0.2" + ip "^1.1.5" + lodash "^4.17.21" + node-fetch "^2.6.7" + open "^8.4.0" + pretty-hrtime "^1.0.3" + prompts "^2.4.0" + regenerator-runtime "^0.13.7" + serve-favicon "^2.5.0" + slash "^3.0.0" + telejson "^6.0.8" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + watchpack "^2.2.0" + webpack "4" + ws "^8.2.3" + "@storybook/core@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.4.22.tgz#cf14280d7831b41d5dea78f76b414bdfde5918f0" @@ -3460,6 +3780,14 @@ "@storybook/core-client" "6.4.22" "@storybook/core-server" "6.4.22" +"@storybook/core@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.5.2.tgz#6d61d449c74ee87d108d4708bbb5309ff3701d66" + integrity sha512-EXBU+kRLDecZ+L58PTkD1Sv+AzkKA5fOcKMcDqRBWCH/QLCOC6eY6/5SlsFVi4LtMssGj8UEzngopaieJq7RjA== + dependencies: + "@storybook/core-client" "6.5.2" + "@storybook/core-server" "6.5.2" + "@storybook/csf-tools@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.4.22.tgz#f6d64bcea1b36114555972acae66a1dbe9e34b5c" @@ -3483,6 +3811,33 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" +"@storybook/csf-tools@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.5.2.tgz#54b5767bbb329037fb0f663910ed0ac2ac6b5444" + integrity sha512-5qXnXNTtsnTx7L6COlcEThZN1KHm9aL88z4xU9t4E83Dh+UziPSHZ8PTK/Phne1lHzIc7fNtntwr8xRQECyjEA== + dependencies: + "@babel/core" "^7.12.10" + "@babel/generator" "^7.12.11" + "@babel/parser" "^7.12.11" + "@babel/plugin-transform-react-jsx" "^7.12.12" + "@babel/preset-env" "^7.12.11" + "@babel/traverse" "^7.12.11" + "@babel/types" "^7.12.11" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/mdx1-csf" canary + core-js "^3.8.2" + fs-extra "^9.0.1" + global "^4.4.0" + regenerator-runtime "^0.13.7" + ts-dedent "^2.0.0" + +"@storybook/csf@0.0.2--canary.4566f4d.1": + version "0.0.2--canary.4566f4d.1" + resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.0.2--canary.4566f4d.1.tgz#dac52a21c40ef198554e71fe4d20d61e17f65327" + integrity sha512-9OVvMVh3t9znYZwb0Svf/YQoxX2gVOeQTGe2bses2yj+a3+OJnCrUF3/hGv6Em7KujtOdL2LL+JnG49oMVGFgQ== + dependencies: + lodash "^4.17.15" + "@storybook/csf@0.0.2--canary.87bc651.0": version "0.0.2--canary.87bc651.0" resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.0.2--canary.87bc651.0.tgz#c7b99b3a344117ef67b10137b6477a3d2750cf44" @@ -3490,6 +3845,19 @@ dependencies: lodash "^4.17.15" +"@storybook/docs-tools@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.2.tgz#220f6239d5ea13b9b87f8cf8d9f8beaf6ad6144b" + integrity sha512-7yaKv/gBa+nM5IlZF94grkBF8mnNp0aS6SnP1aO0ANiQZ58Uso4fLiFF4Gf/VrSwHEG+hPVrFIsLXnM4T+eZhg== + dependencies: + "@babel/core" "^7.12.10" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.2" + core-js "^3.8.2" + doctrine "^3.0.0" + lodash "^4.17.21" + regenerator-runtime "^0.13.7" + "@storybook/manager-webpack4@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.4.22.tgz#eabd674beee901c7f755d9b679e9f969cbab636d" @@ -3532,6 +3900,47 @@ webpack-dev-middleware "^3.7.3" webpack-virtual-modules "^0.2.2" +"@storybook/manager-webpack4@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.2.tgz#8af1b1f3689d6ccc2e71674ea0da93e55845336f" + integrity sha512-s9NfCMHE9cECK03dbKh235tsjA7/v6Vq/I0D+l5sXLZFVzTlV0e0x5fmXepXPebTpsk002UaT7BQReHWpkLRKw== + dependencies: + "@babel/core" "^7.12.10" + "@babel/plugin-transform-template-literals" "^7.12.1" + "@babel/preset-react" "^7.12.10" + "@storybook/addons" "6.5.2" + "@storybook/core-client" "6.5.2" + "@storybook/core-common" "6.5.2" + "@storybook/node-logger" "6.5.2" + "@storybook/theming" "6.5.2" + "@storybook/ui" "6.5.2" + "@types/node" "^14.0.10 || ^16.0.0" + "@types/webpack" "^4.41.26" + babel-loader "^8.0.0" + case-sensitive-paths-webpack-plugin "^2.3.0" + chalk "^4.1.0" + core-js "^3.8.2" + css-loader "^3.6.0" + express "^4.17.1" + file-loader "^6.2.0" + find-up "^5.0.0" + fs-extra "^9.0.1" + html-webpack-plugin "^4.0.0" + node-fetch "^2.6.7" + pnp-webpack-plugin "1.6.4" + read-pkg-up "^7.0.1" + regenerator-runtime "^0.13.7" + resolve-from "^5.0.0" + style-loader "^1.3.0" + telejson "^6.0.8" + terser-webpack-plugin "^4.2.3" + ts-dedent "^2.0.0" + url-loader "^4.1.1" + util-deprecate "^1.0.2" + webpack "4" + webpack-dev-middleware "^3.7.3" + webpack-virtual-modules "^0.2.2" + "@storybook/manager-webpack5@^6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/manager-webpack5/-/manager-webpack5-6.4.22.tgz#14b6c564692324e25084f699d599cd202659fe21" @@ -3571,7 +3980,24 @@ webpack-dev-middleware "^4.1.0" webpack-virtual-modules "^0.4.1" -"@storybook/node-logger@6.4.22", "@storybook/node-logger@^6.4.22": +"@storybook/mdx1-csf@canary": + version "0.0.1-canary.1.867dcd5.0" + resolved "https://registry.yarnpkg.com/@storybook/mdx1-csf/-/mdx1-csf-0.0.1-canary.1.867dcd5.0.tgz#e8739a7451a557292977d83bfb7475986a8013b6" + integrity sha512-VnlE825M9SpjyJCPLCXbo+RbvqllsqXqRDCouzHKSpCE3Q79KR7MMURBsJo/vrTG1zeNG68Z4TZrLAu6IoyYaA== + dependencies: + "@babel/generator" "^7.12.11" + "@babel/parser" "^7.12.11" + "@babel/preset-env" "^7.12.11" + "@babel/types" "^7.12.11" + "@mdx-js/mdx" "^1.6.22" + "@types/lodash" "^4.14.167" + js-string-escape "^1.0.1" + loader-utils "^2.0.0" + lodash "^4.17.21" + prettier ">=2.2.1 <=2.3.0" + ts-dedent "^2.0.0" + +"@storybook/node-logger@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.4.22.tgz#c4ec00f8714505f44eda7671bc88bb44abf7ae59" integrity sha512-sUXYFqPxiqM7gGH7gBXvO89YEO42nA4gBicJKZjj9e+W4QQLrftjF9l+mAw2K0mVE10Bn7r4pfs5oEZ0aruyyA== @@ -3582,6 +4008,17 @@ npmlog "^5.0.1" pretty-hrtime "^1.0.3" +"@storybook/node-logger@6.5.2", "@storybook/node-logger@^6.4.22": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.2.tgz#b8a54209b4c53aa2022c45888ce54c9abaa8fea0" + integrity sha512-p7ICWapQYrk1i+wUZUa9thfgrataMPf9iX5QUn/rWj2CtBL0W63qk1E+X6PL49gsww8clGhOU/rFQcylzNodcQ== + dependencies: + "@types/npmlog" "^4.1.2" + chalk "^4.1.0" + core-js "^3.8.2" + npmlog "^5.0.1" + pretty-hrtime "^1.0.3" + "@storybook/postinstall@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.4.22.tgz#592c7406f197fd25a5644c3db7a87d9b5da77e85" @@ -3623,20 +4060,29 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" -"@storybook/react-docgen-typescript-plugin@1.0.2-canary.253f8c1.0": - version "1.0.2-canary.253f8c1.0" - resolved "https://registry.yarnpkg.com/@storybook/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-1.0.2-canary.253f8c1.0.tgz#f2da40e6aae4aa586c2fb284a4a1744602c3c7fa" - integrity sha512-mmoRG/rNzAiTbh+vGP8d57dfcR2aP+5/Ll03KKFyfy5FqWFm/Gh7u27ikx1I3LmVMI8n6jh5SdWMkMKon7/tDw== +"@storybook/preview-web@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.5.2.tgz#d02e84d34b086ff0960c18ce7fb623481ba39829" + integrity sha512-vRi0GXU3CKTYQjuWkAypktCPyLIDd45oJbwfqc/Fpmi3vK28BS1sB4WW5OJargeC6RSBCV4QKe6so2R/saIQOw== dependencies: - debug "^4.1.1" - endent "^2.0.1" - find-cache-dir "^3.3.1" - flat-cache "^3.0.4" - micromatch "^4.0.2" - react-docgen-typescript "^2.0.0" - tslib "^2.0.0" + "@storybook/addons" "6.5.2" + "@storybook/channel-postmessage" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.2" + ansi-to-html "^0.6.11" + core-js "^3.8.2" + global "^4.4.0" + lodash "^4.17.21" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + unfetch "^4.2.0" + util-deprecate "^1.0.2" -"@storybook/react-docgen-typescript-plugin@canary": +"@storybook/react-docgen-typescript-plugin@1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0", "@storybook/react-docgen-typescript-plugin@canary": version "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0" resolved "https://registry.yarnpkg.com/@storybook/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0.tgz#3103532ff494fb7dc3cf835f10740ecf6a26c0f9" integrity sha512-eVg3BxlOm2P+chijHBTByr90IZVUtgRW56qEOLX7xlww2NBuKrcavBlcmn+HH7GIUktquWkMPtvy6e0W0NgA5w== @@ -3649,35 +4095,46 @@ react-docgen-typescript "^2.1.1" tslib "^2.0.0" -"@storybook/react@^6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.4.22.tgz#5940e5492bc87268555b47f12aff4be4b67eae54" - integrity sha512-5BFxtiguOcePS5Ty/UoH7C6odmvBYIZutfiy4R3Ua6FYmtxac5vP9r5KjCz1IzZKT8mCf4X+PuK1YvDrPPROgQ== +"@storybook/react@^6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.5.2.tgz#b10a630090a20470fc0471532bf4e0c48eccbc66" + integrity sha512-RXSsi3jCV5CpPsdPEPKkmfEO0zdT5AIxHLlt94V0deIs45o3PpXJWIDLdUUvEGwisjwBGBWKk8HkZltweIhFdg== dependencies: "@babel/preset-flow" "^7.12.1" "@babel/preset-react" "^7.12.10" - "@pmmmwh/react-refresh-webpack-plugin" "^0.5.1" - "@storybook/addons" "6.4.22" - "@storybook/core" "6.4.22" - "@storybook/core-common" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/node-logger" "6.4.22" - "@storybook/react-docgen-typescript-plugin" "1.0.2-canary.253f8c1.0" + "@pmmmwh/react-refresh-webpack-plugin" "^0.5.3" + "@storybook/addons" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/core" "6.5.2" + "@storybook/core-common" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/docs-tools" "6.5.2" + "@storybook/node-logger" "6.5.2" + "@storybook/react-docgen-typescript-plugin" "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.4.22" + "@storybook/store" "6.5.2" + "@types/estree" "^0.0.51" + "@types/node" "^14.14.20 || ^16.0.0" "@types/webpack-env" "^1.16.0" + acorn "^7.4.1" + acorn-jsx "^5.3.1" + acorn-walk "^7.2.0" babel-plugin-add-react-displayname "^0.0.5" - babel-plugin-named-asset-import "^0.3.1" babel-plugin-react-docgen "^4.2.1" core-js "^3.8.2" + escodegen "^2.0.0" + fs-extra "^9.0.1" global "^4.4.0" + html-tags "^3.1.0" lodash "^4.17.21" prop-types "^15.7.2" + react-element-to-jsx-string "^14.3.4" react-refresh "^0.11.0" read-pkg-up "^7.0.1" regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" - webpack "4" + util-deprecate "^1.0.2" + webpack ">=4.43.0 <6.0.0" "@storybook/router@6.4.22": version "6.4.22" @@ -3696,6 +4153,15 @@ react-router-dom "^6.0.0" ts-dedent "^2.0.0" +"@storybook/router@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.5.2.tgz#bdcee8771c48da947719e547b8ca1c0a31e3ebf9" + integrity sha512-OtLCXCuDzYa1LyXBcd5iIVT8fnIZJfuIFA7OUWyu/seaTzZaOPqf6Vx9i0cvhdDbir9PQZGPzK1tFLESoG4yVg== + dependencies: + "@storybook/client-logger" "6.5.2" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + "@storybook/semver@^7.3.2": version "7.3.2" resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0" @@ -3741,6 +4207,45 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/store@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.5.2.tgz#9fa55361da041b0dfdcb12999689f23d6f2a6736" + integrity sha512-kRN2ITTcBKEg34DRD935FGvgu/8xgqS/BdiWpOmAjRZzl5AQMyjBPCLKsn4BYtwSnFGuIodOD+TO/E9rFU79qg== + dependencies: + "@storybook/addons" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + regenerator-runtime "^0.13.7" + slash "^3.0.0" + stable "^0.1.8" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + +"@storybook/telemetry@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.2.tgz#26b7351b75dadfefb829f8077c8b3a0c1ec29e68" + integrity sha512-c41iJI0hdhPUvVG+uCo9Vt/Akzxbrg6KvAtzJyDKsWIwdSJRawSGcBJjeYIpFgzCzd4oOcLMIIBIhDAF9LogfQ== + dependencies: + "@storybook/client-logger" "6.5.2" + "@storybook/core-common" "6.5.2" + chalk "^4.1.0" + core-js "^3.8.2" + detect-package-manager "^2.0.1" + fetch-retry "^5.0.2" + fs-extra "^9.0.1" + global "^4.4.0" + isomorphic-unfetch "^3.1.0" + nanoid "^3.3.1" + read-pkg-up "^7.0.1" + regenerator-runtime "^0.13.7" + "@storybook/theming@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.4.22.tgz#19097eec0366447ddd0d6917b0e0f81d0ec5e51e" @@ -3759,6 +4264,15 @@ resolve-from "^5.0.0" ts-dedent "^2.0.0" +"@storybook/theming@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.5.2.tgz#aeff68c156607bb6b0d28ab99219d7242efcc6f0" + integrity sha512-f9f7kFvVWF+ttlNoWT4FRr42TV7rEcTGosXBQ7AMT/s7YJu2w7xbWDxlg6mrGrsdRhcyJZroqqp+zMnfNlsI1A== + dependencies: + "@storybook/client-logger" "6.5.2" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + "@storybook/ui@6.4.22": version "6.4.22" resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.4.22.tgz#49badd7994465d78d984ca4c42533c1c22201c46" @@ -3793,6 +4307,24 @@ resolve-from "^5.0.0" store2 "^2.12.0" +"@storybook/ui@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.2.tgz#034a180604df28d0d1b1d38324bab93de5da8db4" + integrity sha512-CxFYdqFoxHl20l/D5P1eU9exG9xPvFF3ulKe0C5Rdk2/ZL4p77Q2AYL8btvgBloYMBsT5gdSBBNnMsDOFvpbew== + dependencies: + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/channels" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/components" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/router" "6.5.2" + "@storybook/semver" "^7.3.2" + "@storybook/theming" "6.5.2" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + resolve-from "^5.0.0" + "@surma/rollup-plugin-off-main-thread@^2.2.3": version "2.2.3" resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053" @@ -4337,7 +4869,7 @@ resolved "https://registry.yarnpkg.com/@types/katex/-/katex-0.11.1.tgz#34de04477dcf79e2ef6c8d23b41a3d81f9ebeaf5" integrity sha512-DUlIj2nk0YnJdlWgsFuVKcX27MLW0KbKmGVoUHmFr+74FYYNUDAaj9ZqTADvsbE8rfxuVmSFc7KczYn5Y09ozg== -"@types/lodash@^4.14.182": +"@types/lodash@^4.14.167", "@types/lodash@^4.14.182": version "4.14.182" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2" integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q== @@ -4377,6 +4909,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.16.tgz#878f670ba3f00482bf859b6550b6010610fc54b5" integrity sha512-X3bUMdK/VmvrWdoTkz+VCn6nwKwrKCFTHtqwBIaQJNx4RUIBBUFXM00bqPz/DsDd+Icjmzm6/tyYZzeGVqb6/Q== +"@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0": + version "16.11.36" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.36.tgz#9ab9f8276987132ed2b225cace2218ba794fc751" + integrity sha512-FR5QJe+TaoZ2GsMHkjuwoNabr+UrJNRr2HNOo+r/7vhcuntM6Ee/pRPOnRhhL2XE9OOvX9VLEq+BcXl3VjNoWA== + "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -5731,7 +6268,7 @@ babel-plugin-macros@^3.0.1, babel-plugin-macros@^3.1.0: cosmiconfig "^7.0.0" resolve "^1.19.0" -babel-plugin-named-asset-import@^0.3.1, babel-plugin-named-asset-import@^0.3.8: +babel-plugin-named-asset-import@^0.3.8: version "0.3.8" resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz#6b7fa43c59229685368683c28bc9734f24524cc2" integrity sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q== @@ -7841,6 +8378,13 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== +detect-package-manager@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-package-manager/-/detect-package-manager-2.0.1.tgz#6b182e3ae5e1826752bfef1de9a7b828cffa50d8" + integrity sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A== + dependencies: + execa "^5.1.1" + detect-port-alt@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275" @@ -8719,7 +9263,7 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^5.0.0: +execa@^5.0.0, execa@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== @@ -8970,6 +9514,11 @@ feed@^4.2.2: dependencies: xml-js "^1.6.11" +fetch-retry@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-5.0.2.tgz#4c55663a7c056cb45f182394e479464f0ff8f3e3" + integrity sha512-57Hmu+1kc6pKFUGVIobT7qw3NeAzY/uNN26bSevERLVvf6VGFR/ooDCOFBHMNDgAxBiU2YJq1D0vFzc6U1DcPw== + figgy-pudding@^3.5.1: version "3.5.2" resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" @@ -9855,7 +10404,7 @@ he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -highlight.js@^10.1.1, highlight.js@~10.7.0: +highlight.js@^10.1.1, highlight.js@^10.4.1, highlight.js@~10.7.0: version "10.7.3" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== @@ -10781,6 +11330,14 @@ isobject@^4.0.0: resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0" integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA== +isomorphic-unfetch@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f" + integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q== + dependencies: + node-fetch "^2.6.1" + unfetch "^4.2.0" + istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.0.0-alpha.1, istanbul-lib-coverage@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" @@ -11902,7 +12459,7 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== -lowlight@^1.14.0: +lowlight@^1.14.0, lowlight@^1.17.0: version "1.20.0" resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.20.0.tgz#ddb197d33462ad0d93bf19d17b6c301aa3941888" integrity sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw== @@ -12433,7 +12990,7 @@ nano-css@^5.3.1: stacktrace-js "^2.0.2" stylis "^4.0.6" -nanoid@^3.1.23, nanoid@^3.3.3: +nanoid@^3.1.23, nanoid@^3.3.1, nanoid@^3.3.3: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== @@ -14012,7 +14569,7 @@ prism-react-renderer@^1.3.1, prism-react-renderer@^1.3.3: resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.3.tgz#9b5a4211a6756eee3c96fee9a05733abc0b0805c" integrity sha512-Viur/7tBTCH2HmYzwCHmt2rEFn+rdIWNIINXyg0StiISbDiIhHKhrFuEK8eMkKgvsIYSjgGqy/hNyucHp6FpoQ== -prismjs@^1.21.0, prismjs@^1.28.0: +prismjs@^1.21.0, prismjs@^1.27.0, prismjs@^1.28.0: version "1.28.0" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6" integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw== @@ -14372,7 +14929,7 @@ react-dev-utils@^12.0.1: strip-ansi "^6.0.1" text-table "^0.2.0" -react-docgen-typescript@^2.0.0, react-docgen-typescript@^2.1.1: +react-docgen-typescript@^2.1.1: version "2.2.2" resolved "https://registry.yarnpkg.com/react-docgen-typescript/-/react-docgen-typescript-2.2.2.tgz#4611055e569edc071204aadb20e1c93e1ab1659c" integrity sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg== @@ -14634,6 +15191,17 @@ react-syntax-highlighter@^13.5.3: prismjs "^1.21.0" refractor "^3.1.0" +react-syntax-highlighter@^15.4.5: + version "15.5.0" + resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-15.5.0.tgz#4b3eccc2325fa2ec8eff1e2d6c18fa4a9e07ab20" + integrity sha512-+zq2myprEnQmH5yw6Gqc8lD55QHnpKaU8TOcFeC/Lg/MQSs8UknEA0JC4nTZGFAXC2J2Hyj/ijJ7NlabyPi2gg== + dependencies: + "@babel/runtime" "^7.3.1" + highlight.js "^10.4.1" + lowlight "^1.17.0" + prismjs "^1.27.0" + refractor "^3.6.0" + react-textarea-autosize@^8.3.0, react-textarea-autosize@^8.3.2: version "8.3.3" resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8" @@ -14781,7 +15349,7 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -refractor@^3.1.0: +refractor@^3.1.0, refractor@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.6.0.tgz#ac318f5a0715ead790fcfb0c71f4dd83d977935a" integrity sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA== @@ -16450,6 +17018,20 @@ telejson@^5.3.2, telejson@^5.3.3: lodash "^4.17.21" memoizerific "^1.11.3" +telejson@^6.0.8: + version "6.0.8" + resolved "https://registry.yarnpkg.com/telejson/-/telejson-6.0.8.tgz#1c432db7e7a9212c1fbd941c3e5174ec385148f7" + integrity sha512-nerNXi+j8NK1QEfBHtZUN/aLdDcyupA//9kAboYLrtzZlPLpUfqbVGWb9zz91f/mIjRbAYhbgtnJHY8I1b5MBg== + dependencies: + "@types/is-function" "^1.0.0" + global "^4.4.0" + is-function "^1.0.2" + is-regex "^1.1.2" + is-symbol "^1.0.3" + isobject "^4.0.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + temp-dir@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" @@ -18019,7 +18601,7 @@ webpack@4: watchpack "^1.7.4" webpack-sources "^1.4.1" -webpack@^5, webpack@^5.64.4, webpack@^5.72.0, webpack@^5.72.1, webpack@^5.9.0: +"webpack@>=4.43.0 <6.0.0", webpack@^5, webpack@^5.64.4, webpack@^5.72.0, webpack@^5.72.1, webpack@^5.9.0: version "5.72.1" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.1.tgz#3500fc834b4e9ba573b9f430b2c0a61e1bb57d13" integrity sha512-dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung== From c3984a0caa1d2790d86604382be54a8bee89b6e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 14:45:08 +0000 Subject: [PATCH 145/340] :arrow_up: Bump @storybook/addon-essentials from 6.4.22 to 6.5.2 Bumps [@storybook/addon-essentials](https://github.com/storybookjs/storybook/tree/HEAD/addons/essentials) from 6.4.22 to 6.5.2. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.2/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.2/addons/essentials) --- updated-dependencies: - dependency-name: "@storybook/addon-essentials" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 487 ++++++++----------------------- 2 files changed, 130 insertions(+), 359 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index bcd08f70..ec7dd26e 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.17.12", "@storybook/addon-actions": "^6.4.22", - "@storybook/addon-essentials": "^6.4.22", + "@storybook/addon-essentials": "^6.5.2", "@storybook/addon-links": "^6.4.22", "@storybook/builder-webpack5": "^6.4.22", "@storybook/manager-webpack5": "^6.4.22", diff --git a/yarn.lock b/yarn.lock index 54f81ab4..18cfc624 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2261,16 +2261,7 @@ resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== -"@mdx-js/loader@^1.6.22": - version "1.6.22" - resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.22.tgz#d9e8fe7f8185ff13c9c8639c048b123e30d322c4" - integrity sha512-9CjGwy595NaxAYp0hF9B/A0lH6C8Rms97e2JS9d3jVUtILn6pT5i5IV965ra3lIWc7Rs1GG1tBdVF7dCowYe6Q== - dependencies: - "@mdx-js/mdx" "1.6.22" - "@mdx-js/react" "1.6.22" - loader-utils "2.0.0" - -"@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.6.22": +"@mdx-js/mdx@^1.6.22": version "1.6.22" resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" integrity sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA== @@ -2295,7 +2286,7 @@ unist-builder "2.0.3" unist-util-visit "2.0.3" -"@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.22": +"@mdx-js/react@^1.6.22": version "1.6.22" resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" integrity sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg== @@ -2836,42 +2827,43 @@ "@stdlib/types" "^0.0.x" debug "^2.6.9" -"@storybook/addon-actions@6.4.22", "@storybook/addon-actions@^6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.4.22.tgz#ec1b4332e76a8021dc0a1375dfd71a0760457588" - integrity sha512-t2w3iLXFul+R/1ekYxIEzUOZZmvEa7EzUAVAuCHP4i6x0jBnTTZ7sAIUVRaxVREPguH5IqI/2OklYhKanty2Yw== +"@storybook/addon-actions@6.5.2", "@storybook/addon-actions@^6.4.22": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.2.tgz#081ff620fd9d8896d4c387cd2262bee7326d8f8c" + integrity sha512-oBKQveXRwCr7M3U3dESVJe2nP6QlhTn99r2GTmn07L0yJ12NnB7o519uoMcAbYKZbewrH6GWe82PbUDC5O5uAw== dependencies: - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/components" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/theming" "6.4.22" + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/components" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/theming" "6.5.2" core-js "^3.8.2" fast-deep-equal "^3.1.3" global "^4.4.0" lodash "^4.17.21" - polished "^4.0.5" + polished "^4.2.2" prop-types "^15.7.2" react-inspector "^5.1.0" regenerator-runtime "^0.13.7" - telejson "^5.3.2" + telejson "^6.0.8" ts-dedent "^2.0.0" util-deprecate "^1.0.2" uuid-browser "^3.1.0" -"@storybook/addon-backgrounds@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.4.22.tgz#5d9dbff051eefc1ca6e6c7973c01d17fbef4c2f5" - integrity sha512-xQIV1SsjjRXP7P5tUoGKv+pul1EY8lsV7iBXQb5eGbp4AffBj3qoYBSZbX4uiazl21o0MQiQoeIhhaPVaFIIGg== +"@storybook/addon-backgrounds@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.5.2.tgz#98619679a18429884f6e03cf8728e203af701a34" + integrity sha512-+2TtH5rzlTy5kPcDZ0FQ1eMFqg6RFM/fLEdsN90+AdI5TmBgO40rBErYAbM3Y82WjvvjpnUDSxg4Ru41H5GAzQ== dependencies: - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/components" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/theming" "6.4.22" + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/components" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/theming" "6.5.2" core-js "^3.8.2" global "^4.4.0" memoizerific "^1.11.3" @@ -2879,92 +2871,75 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/addon-controls@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.4.22.tgz#42c7f426eb7ba6d335e8e14369d6d13401878665" - integrity sha512-f/M/W+7UTEUnr/L6scBMvksq+ZA8GTfh3bomE5FtWyOyaFppq9k8daKAvdYNlzXAOrUUsoZVJDgpb20Z2VBiSQ== +"@storybook/addon-controls@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.5.2.tgz#9293fc03da3d36dee34cc2e6388fcdd9ee318c38" + integrity sha512-R2HCmuetOAN4nIIbBijdCq4pxtyT6NthCHy1jmtElF8q3C8j1dhn6ULr8+imWQaW+lKZGWESLN/ey7s4FZ9tyw== dependencies: - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/components" "6.4.22" - "@storybook/core-common" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/node-logger" "6.4.22" - "@storybook/store" "6.4.22" - "@storybook/theming" "6.4.22" + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/components" "6.5.2" + "@storybook/core-common" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/node-logger" "6.5.2" + "@storybook/store" "6.5.2" + "@storybook/theming" "6.5.2" core-js "^3.8.2" lodash "^4.17.21" ts-dedent "^2.0.0" -"@storybook/addon-docs@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.4.22.tgz#19f22ede8ae31291069af7ab5abbc23fa269012b" - integrity sha512-9j+i+W+BGHJuRe4jUrqk6ubCzP4fc1xgFS2o8pakRiZgPn5kUQPdkticmsyh1XeEJifwhqjKJvkEDrcsleytDA== +"@storybook/addon-docs@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.5.2.tgz#715afbf7aa7dc451a558d6f32a651c4fb94cfc10" + integrity sha512-W1OBxNQ6wFNRNPnVMI2a4u0XsPdnoeJ4qBIOxzLjeucgpjyAtQi/gjdABI0Y/gw/AIt89HXJsZDrG/jYvHN6Sw== dependencies: - "@babel/core" "^7.12.10" - "@babel/generator" "^7.12.11" - "@babel/parser" "^7.12.11" "@babel/plugin-transform-react-jsx" "^7.12.12" "@babel/preset-env" "^7.12.11" "@jest/transform" "^26.6.2" - "@mdx-js/loader" "^1.6.22" - "@mdx-js/mdx" "^1.6.22" "@mdx-js/react" "^1.6.22" - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/builder-webpack4" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/components" "6.4.22" - "@storybook/core" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/csf-tools" "6.4.22" - "@storybook/node-logger" "6.4.22" - "@storybook/postinstall" "6.4.22" - "@storybook/preview-web" "6.4.22" - "@storybook/source-loader" "6.4.22" - "@storybook/store" "6.4.22" - "@storybook/theming" "6.4.22" - acorn "^7.4.1" - acorn-jsx "^5.3.1" - acorn-walk "^7.2.0" + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/components" "6.5.2" + "@storybook/core-common" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/docs-tools" "6.5.2" + "@storybook/mdx1-csf" canary + "@storybook/node-logger" "6.5.2" + "@storybook/postinstall" "6.5.2" + "@storybook/preview-web" "6.5.2" + "@storybook/source-loader" "6.5.2" + "@storybook/store" "6.5.2" + "@storybook/theming" "6.5.2" + babel-loader "^8.0.0" core-js "^3.8.2" - doctrine "^3.0.0" - escodegen "^2.0.0" fast-deep-equal "^3.1.3" global "^4.4.0" - html-tags "^3.1.0" - js-string-escape "^1.0.1" - loader-utils "^2.0.0" lodash "^4.17.21" - nanoid "^3.1.23" - p-limit "^3.1.0" - prettier ">=2.2.1 <=2.3.0" - prop-types "^15.7.2" - react-element-to-jsx-string "^14.3.4" regenerator-runtime "^0.13.7" remark-external-links "^8.0.0" remark-slug "^6.0.0" ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/addon-essentials@^6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.4.22.tgz#6981c89e8b315cda7ce93b9bf74e98ca80aec00a" - integrity sha512-GTv291fqvWq2wzm7MruBvCGuWaCUiuf7Ca3kzbQ/WqWtve7Y/1PDsqRNQLGZrQxkXU0clXCqY1XtkTrtA3WGFQ== +"@storybook/addon-essentials@^6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.5.2.tgz#4850e878bc1b5b9c73dd4090176c4fef25fc259e" + integrity sha512-BB4exm5rZYC2KnmsaW46HdO7SO3Q/7JrSjOV2Kg0DxWie1Qd5wKYAVcPBwHg6QI4pCHIY3rF9dM3REJU2m3nEg== dependencies: - "@storybook/addon-actions" "6.4.22" - "@storybook/addon-backgrounds" "6.4.22" - "@storybook/addon-controls" "6.4.22" - "@storybook/addon-docs" "6.4.22" - "@storybook/addon-measure" "6.4.22" - "@storybook/addon-outline" "6.4.22" - "@storybook/addon-toolbars" "6.4.22" - "@storybook/addon-viewport" "6.4.22" - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/node-logger" "6.4.22" + "@storybook/addon-actions" "6.5.2" + "@storybook/addon-backgrounds" "6.5.2" + "@storybook/addon-controls" "6.5.2" + "@storybook/addon-docs" "6.5.2" + "@storybook/addon-measure" "6.5.2" + "@storybook/addon-outline" "6.5.2" + "@storybook/addon-toolbars" "6.5.2" + "@storybook/addon-viewport" "6.5.2" + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/core-common" "6.5.2" + "@storybook/node-logger" "6.5.2" core-js "^3.8.2" regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" @@ -2987,59 +2962,60 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-measure@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-6.4.22.tgz#5e2daac4184a4870b6b38ff71536109b7811a12a" - integrity sha512-CjDXoCNIXxNfXfgyJXPc0McjCcwN1scVNtHa9Ckr+zMjiQ8pPHY7wDZCQsG69KTqcWHiVfxKilI82456bcHYhQ== +"@storybook/addon-measure@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-6.5.2.tgz#7362dcb198b0c4274a6ee97b2c5fee93175929e0" + integrity sha512-XSoyvcGJpLBFFVQRHGWMZM1OKxxPJFMAldyDdt+Rbjj8vsnomwZeMVlkKnoG5qwEAFDBvFlntOXRXrYy2319Gg== dependencies: - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/components" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/components" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" global "^4.4.0" -"@storybook/addon-outline@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-6.4.22.tgz#7a2776344785f7deab83338fbefbefd5e6cfc8cf" - integrity sha512-VIMEzvBBRbNnupGU7NV0ahpFFb6nKVRGYWGREjtABdFn2fdKr1YicOHFe/3U7hRGjb5gd+VazSvyUvhaKX9T7Q== +"@storybook/addon-outline@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-6.5.2.tgz#0ccd3d6d1f3f20f25c18ff7e8a46bdc77b9066f6" + integrity sha512-g4V7YdNAs/YIFRVbVAlnhDERl9xeufvtcnMoI5pINzQRrGxlz7BqRpqhbtreC5mbWgrNQsQnI77HjS3zF4Jwww== dependencies: - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/components" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/components" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" global "^4.4.0" regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-toolbars@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.4.22.tgz#858a4e5939987c188c96ed374ebeea88bdd9e8de" - integrity sha512-FFyj6XDYpBBjcUu6Eyng7R805LUbVclEfydZjNiByAoDVyCde9Hb4sngFxn/T4fKAfBz/32HKVXd5iq4AHYtLg== +"@storybook/addon-toolbars@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.5.2.tgz#e569d86424e65b5016b6333d5d65b20e46c8d990" + integrity sha512-DveAfyfo/qXDD//kReby+TBerL1kfwcbAA0IEByDChelImAgGC7s614jbpHQKwTJqaljZPsb+wHhcE8I/CPxfA== dependencies: - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/components" "6.4.22" - "@storybook/theming" "6.4.22" + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/components" "6.5.2" + "@storybook/theming" "6.5.2" core-js "^3.8.2" regenerator-runtime "^0.13.7" -"@storybook/addon-viewport@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.4.22.tgz#381a2fc4764fe0851889994a5ba36c3121300c11" - integrity sha512-6jk0z49LemeTblez5u2bYXYr6U+xIdLbywe3G283+PZCBbEDE6eNYy2d2HDL+LbCLbezJBLYPHPalElphjJIcw== +"@storybook/addon-viewport@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.5.2.tgz#5f24169c2eaff9245c6855698da74a2f6b8c7ddb" + integrity sha512-I02dAefFennQrNrF5+xPWl9aQj0k/J9rxKslkZrbTyJvqbd24701NE9iWJ441/SR1Y/p3MKuOMvtjRKNtUCWgw== dependencies: - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/components" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/theming" "6.4.22" + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/components" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/theming" "6.5.2" core-js "^3.8.2" global "^4.4.0" memoizerific "^1.11.3" @@ -3126,81 +3102,6 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/builder-webpack4@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.4.22.tgz#d3384b146e97a2b3a6357c6eb8279ff0f1c7f8f5" - integrity sha512-A+GgGtKGnBneRFSFkDarUIgUTI8pYFdLmUVKEAGdh2hL+vLXAz9A46sEY7C8LQ85XWa8TKy3OTDxqR4+4iWj3A== - dependencies: - "@babel/core" "^7.12.10" - "@babel/plugin-proposal-class-properties" "^7.12.1" - "@babel/plugin-proposal-decorators" "^7.12.12" - "@babel/plugin-proposal-export-default-from" "^7.12.1" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-object-rest-spread" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" - "@babel/plugin-proposal-private-methods" "^7.12.1" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-transform-arrow-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.12" - "@babel/plugin-transform-classes" "^7.12.1" - "@babel/plugin-transform-destructuring" "^7.12.1" - "@babel/plugin-transform-for-of" "^7.12.1" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-transform-shorthand-properties" "^7.12.1" - "@babel/plugin-transform-spread" "^7.12.1" - "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/preset-env" "^7.12.11" - "@babel/preset-react" "^7.12.10" - "@babel/preset-typescript" "^7.12.7" - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/channel-postmessage" "6.4.22" - "@storybook/channels" "6.4.22" - "@storybook/client-api" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/components" "6.4.22" - "@storybook/core-common" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/node-logger" "6.4.22" - "@storybook/preview-web" "6.4.22" - "@storybook/router" "6.4.22" - "@storybook/semver" "^7.3.2" - "@storybook/store" "6.4.22" - "@storybook/theming" "6.4.22" - "@storybook/ui" "6.4.22" - "@types/node" "^14.0.10" - "@types/webpack" "^4.41.26" - autoprefixer "^9.8.6" - babel-loader "^8.0.0" - babel-plugin-macros "^2.8.0" - babel-plugin-polyfill-corejs3 "^0.1.0" - case-sensitive-paths-webpack-plugin "^2.3.0" - core-js "^3.8.2" - css-loader "^3.6.0" - file-loader "^6.2.0" - find-up "^5.0.0" - fork-ts-checker-webpack-plugin "^4.1.6" - glob "^7.1.6" - glob-promise "^3.4.0" - global "^4.4.0" - html-webpack-plugin "^4.0.0" - pnp-webpack-plugin "1.6.4" - postcss "^7.0.36" - postcss-flexbugs-fixes "^4.2.1" - postcss-loader "^4.2.0" - raw-loader "^4.0.2" - stable "^0.1.8" - style-loader "^1.3.0" - terser-webpack-plugin "^4.2.3" - ts-dedent "^2.0.0" - url-loader "^4.1.1" - util-deprecate "^1.0.2" - webpack "4" - webpack-dev-middleware "^3.7.3" - webpack-filter-warnings-plugin "^1.2.1" - webpack-hot-middleware "^2.25.1" - webpack-virtual-modules "^0.2.2" - "@storybook/builder-webpack4@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.2.tgz#5779ad29aacfd8784896b738e33c9d548ff16821" @@ -3673,54 +3574,6 @@ dependencies: core-js "^3.8.2" -"@storybook/core-server@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.4.22.tgz#254409ec2ba49a78b23f5e4a4c0faea5a570a32b" - integrity sha512-wFh3e2fa0un1d4+BJP+nd3FVWUO7uHTqv3OGBfOmzQMKp4NU1zaBNdSQG7Hz6mw0fYPBPZgBjPfsJRwIYLLZyw== - dependencies: - "@discoveryjs/json-ext" "^0.5.3" - "@storybook/builder-webpack4" "6.4.22" - "@storybook/core-client" "6.4.22" - "@storybook/core-common" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/csf-tools" "6.4.22" - "@storybook/manager-webpack4" "6.4.22" - "@storybook/node-logger" "6.4.22" - "@storybook/semver" "^7.3.2" - "@storybook/store" "6.4.22" - "@types/node" "^14.0.10" - "@types/node-fetch" "^2.5.7" - "@types/pretty-hrtime" "^1.0.0" - "@types/webpack" "^4.41.26" - better-opn "^2.1.1" - boxen "^5.1.2" - chalk "^4.1.0" - cli-table3 "^0.6.1" - commander "^6.2.1" - compression "^1.7.4" - core-js "^3.8.2" - cpy "^8.1.2" - detect-port "^1.3.0" - express "^4.17.1" - file-system-cache "^1.0.5" - fs-extra "^9.0.1" - globby "^11.0.2" - ip "^1.1.5" - lodash "^4.17.21" - node-fetch "^2.6.1" - pretty-hrtime "^1.0.3" - prompts "^2.4.0" - regenerator-runtime "^0.13.7" - serve-favicon "^2.5.0" - slash "^3.0.0" - telejson "^5.3.3" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - watchpack "^2.2.0" - webpack "4" - ws "^8.2.3" - "@storybook/core-server@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.2.tgz#96d5d105c8cf24a06c41823a9ebfa68d45c4106f" @@ -3772,14 +3625,6 @@ webpack "4" ws "^8.2.3" -"@storybook/core@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.4.22.tgz#cf14280d7831b41d5dea78f76b414bdfde5918f0" - integrity sha512-KZYJt7GM5NgKFXbPRZZZPEONZ5u/tE/cRbMdkn/zWN3He8+VP+65/tz8hbriI/6m91AWVWkBKrODSkeq59NgRA== - dependencies: - "@storybook/core-client" "6.4.22" - "@storybook/core-server" "6.4.22" - "@storybook/core@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.5.2.tgz#6d61d449c74ee87d108d4708bbb5309ff3701d66" @@ -3788,29 +3633,6 @@ "@storybook/core-client" "6.5.2" "@storybook/core-server" "6.5.2" -"@storybook/csf-tools@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.4.22.tgz#f6d64bcea1b36114555972acae66a1dbe9e34b5c" - integrity sha512-LMu8MZAiQspJAtMBLU2zitsIkqQv7jOwX7ih5JrXlyaDticH7l2j6Q+1mCZNWUOiMTizj0ivulmUsSaYbpToSw== - dependencies: - "@babel/core" "^7.12.10" - "@babel/generator" "^7.12.11" - "@babel/parser" "^7.12.11" - "@babel/plugin-transform-react-jsx" "^7.12.12" - "@babel/preset-env" "^7.12.11" - "@babel/traverse" "^7.12.11" - "@babel/types" "^7.12.11" - "@mdx-js/mdx" "^1.6.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - core-js "^3.8.2" - fs-extra "^9.0.1" - global "^4.4.0" - js-string-escape "^1.0.1" - lodash "^4.17.21" - prettier ">=2.2.1 <=2.3.0" - regenerator-runtime "^0.13.7" - ts-dedent "^2.0.0" - "@storybook/csf-tools@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.5.2.tgz#54b5767bbb329037fb0f663910ed0ac2ac6b5444" @@ -3858,48 +3680,6 @@ lodash "^4.17.21" regenerator-runtime "^0.13.7" -"@storybook/manager-webpack4@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.4.22.tgz#eabd674beee901c7f755d9b679e9f969cbab636d" - integrity sha512-nzhDMJYg0vXdcG0ctwE6YFZBX71+5NYaTGkxg3xT7gbgnP1YFXn9gVODvgq3tPb3gcRapjyOIxUa20rV+r8edA== - dependencies: - "@babel/core" "^7.12.10" - "@babel/plugin-transform-template-literals" "^7.12.1" - "@babel/preset-react" "^7.12.10" - "@storybook/addons" "6.4.22" - "@storybook/core-client" "6.4.22" - "@storybook/core-common" "6.4.22" - "@storybook/node-logger" "6.4.22" - "@storybook/theming" "6.4.22" - "@storybook/ui" "6.4.22" - "@types/node" "^14.0.10" - "@types/webpack" "^4.41.26" - babel-loader "^8.0.0" - case-sensitive-paths-webpack-plugin "^2.3.0" - chalk "^4.1.0" - core-js "^3.8.2" - css-loader "^3.6.0" - express "^4.17.1" - file-loader "^6.2.0" - file-system-cache "^1.0.5" - find-up "^5.0.0" - fs-extra "^9.0.1" - html-webpack-plugin "^4.0.0" - node-fetch "^2.6.1" - pnp-webpack-plugin "1.6.4" - read-pkg-up "^7.0.1" - regenerator-runtime "^0.13.7" - resolve-from "^5.0.0" - style-loader "^1.3.0" - telejson "^5.3.2" - terser-webpack-plugin "^4.2.3" - ts-dedent "^2.0.0" - url-loader "^4.1.1" - util-deprecate "^1.0.2" - webpack "4" - webpack-dev-middleware "^3.7.3" - webpack-virtual-modules "^0.2.2" - "@storybook/manager-webpack4@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.2.tgz#8af1b1f3689d6ccc2e71674ea0da93e55845336f" @@ -4019,10 +3799,10 @@ npmlog "^5.0.1" pretty-hrtime "^1.0.3" -"@storybook/postinstall@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.4.22.tgz#592c7406f197fd25a5644c3db7a87d9b5da77e85" - integrity sha512-LdIvA+l70Mp5FSkawOC16uKocefc+MZLYRHqjTjgr7anubdi6y7W4n9A7/Yw4IstZHoknfL88qDj/uK5N+Ahzw== +"@storybook/postinstall@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.2.tgz#b3b99bad5b21006461cc5ff070b675c8c8b36704" + integrity sha512-AKgTN1cqjspnZP1eOyKBJ0TLC0kyt/41FrBKPZYepofUWD7/NyI8XKNTJZcZIfu5tmV3c7ES7miYDFsq5zCotA== dependencies: core-js "^3.8.2" @@ -4170,14 +3950,14 @@ core-js "^3.6.5" find-up "^4.1.0" -"@storybook/source-loader@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.4.22.tgz#c931b81cf1bd63f79b51bfa9311de7f5a04a7b77" - integrity sha512-O4RxqPgRyOgAhssS6q1Rtc8LiOvPBpC1EqhCYWRV3K+D2EjFarfQMpjgPj18hC+QzpUSfzoBZYqsMECewEuLNw== +"@storybook/source-loader@6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.5.2.tgz#d37fac2707eb622d99da38ae22928efe4b77f6f8" + integrity sha512-SU0b0aA31rszvf3mxl5X75McPrdf0SxKam9aE10D0RkKFgdz/MU0RQGSgBofUw+VT31UZy2Xq0BHy1/LvlqP+w== dependencies: - "@storybook/addons" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" + "@storybook/addons" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" estraverse "^5.2.0" global "^4.4.0" @@ -6250,7 +6030,7 @@ babel-plugin-jest-hoist@^27.5.1: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-plugin-macros@^2.0.0, babel-plugin-macros@^2.8.0: +babel-plugin-macros@^2.0.0: version "2.8.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== @@ -12263,15 +12043,6 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== -loader-utils@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" - integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" - loader-utils@^1.2.3: version "1.4.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" @@ -12990,7 +12761,7 @@ nano-css@^5.3.1: stacktrace-js "^2.0.2" stylis "^4.0.6" -nanoid@^3.1.23, nanoid@^3.3.1, nanoid@^3.3.3: +nanoid@^3.3.1, nanoid@^3.3.3: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== @@ -13486,7 +13257,7 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-limit@^3.0.2, p-limit@^3.1.0: +p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== @@ -13859,7 +13630,7 @@ pnp-webpack-plugin@^1.7.0: dependencies: ts-pnp "^1.1.6" -polished@^4.0.5: +polished@^4.0.5, polished@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/polished/-/polished-4.2.2.tgz#2529bb7c3198945373c52e34618c8fe7b1aa84d1" integrity sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ== @@ -17004,7 +16775,7 @@ teeny-request@7.1.1: stream-events "^1.0.5" uuid "^8.0.0" -telejson@^5.3.2, telejson@^5.3.3: +telejson@^5.3.2: version "5.3.3" resolved "https://registry.yarnpkg.com/telejson/-/telejson-5.3.3.tgz#fa8ca84543e336576d8734123876a9f02bf41d2e" integrity sha512-PjqkJZpzEggA9TBpVtJi1LVptP7tYtXB6rEubwlHap76AMjzvOdKX41CxyaW7ahhzDU1aftXnMCx5kAPDZTQBA== From 470a6add42f84ee13a22e0fb1204c11906fb3682 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 16:45:50 +0200 Subject: [PATCH 146/340] update ternary --- .../Reducer_Peggy/Reducer_Peggy_Parse_test.res | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index c6e94643..d4b69729 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -78,16 +78,16 @@ describe("Peggy parse", () => { }) describe("ternary operator", () => { - testParse("1 ? 2 : 3", "{(::$$ternary 1 2 3)}") - testParse("1 ? 2 : 3 ? 4 : 5", "{(::$$ternary 1 2 (::$$ternary 3 4 5))}") // nested ternary + testParse("true ? 2 : 3", "{(::$$ternary true 2 3)}") + testParse("false ? 2 : false ? 4 : 5", "{(::$$ternary false 2 (::$$ternary false 4 5))}") // nested ternary }) describe("if then else", () => { - testParse("if 1 then 2 else 3", "{(::$$ternary 1 {2} {3})}") - testParse("if 1 then {2} else {3}", "{(::$$ternary 1 {2} {3})}") + testParse("if true then 2 else 3", "{(::$$ternary true {2} {3})}") + testParse("if false then {2} else {3}", "{(::$$ternary false {2} {3})}") testParse( - "if 1 then {2} else if 3 then {4} else {5}", - "{(::$$ternary 1 {2} (::$$ternary 3 {4} {5}))}", + "if false then {2} else if false then {4} else {5}", + "{(::$$ternary false {2} (::$$ternary false {4} {5}))}", ) //nested if }) From 98a95d4a78ee4acd9a55ee0c00fb6506dff1150c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 15:01:57 +0000 Subject: [PATCH 147/340] :arrow_up: Bump @storybook/manager-webpack5 from 6.4.22 to 6.5.2 Bumps [@storybook/manager-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.4.22 to 6.5.2. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.2/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.2/lib/core) --- updated-dependencies: - dependency-name: "@storybook/manager-webpack5" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 159 ++++--------------------------- 2 files changed, 19 insertions(+), 142 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index ec7dd26e..f536a4af 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -22,7 +22,7 @@ "@storybook/addon-essentials": "^6.5.2", "@storybook/addon-links": "^6.4.22", "@storybook/builder-webpack5": "^6.4.22", - "@storybook/manager-webpack5": "^6.4.22", + "@storybook/manager-webpack5": "^6.5.2", "@storybook/node-logger": "^6.4.22", "@storybook/preset-create-react-app": "^4.1.0", "@storybook/react": "^6.5.2", diff --git a/yarn.lock b/yarn.lock index 18cfc624..3c060497 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1243,7 +1243,7 @@ core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.8", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== @@ -3244,17 +3244,6 @@ qs "^6.10.0" telejson "^6.0.8" -"@storybook/channel-websocket@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.4.22.tgz#d541f69125873123c453757e2b879a75a9266c65" - integrity sha512-Bm/FcZ4Su4SAK5DmhyKKfHkr7HiHBui6PNutmFkASJInrL9wBduBfN8YQYaV7ztr8ezoHqnYRx8sj28jpwa6NA== - dependencies: - "@storybook/channels" "6.4.22" - "@storybook/client-logger" "6.4.22" - core-js "^3.8.2" - global "^4.4.0" - telejson "^5.3.2" - "@storybook/channel-websocket@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.2.tgz#cc7b1d1a592ccf953f99cec18fb7846445eea34d" @@ -3397,32 +3386,6 @@ regenerator-runtime "^0.13.7" util-deprecate "^1.0.2" -"@storybook/core-client@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.4.22.tgz#9079eda8a9c8e6ba24b84962a749b1c99668cb2a" - integrity sha512-uHg4yfCBeM6eASSVxStWRVTZrAnb4FT6X6v/xDqr4uXCpCttZLlBzrSDwPBLNNLtCa7ntRicHM8eGKIOD5lMYQ== - dependencies: - "@storybook/addons" "6.4.22" - "@storybook/channel-postmessage" "6.4.22" - "@storybook/channel-websocket" "6.4.22" - "@storybook/client-api" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/preview-web" "6.4.22" - "@storybook/store" "6.4.22" - "@storybook/ui" "6.4.22" - airbnb-js-shims "^2.2.1" - ansi-to-html "^0.6.11" - core-js "^3.8.2" - global "^4.4.0" - lodash "^4.17.21" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - ts-dedent "^2.0.0" - unfetch "^4.2.0" - util-deprecate "^1.0.2" - "@storybook/core-client@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.2.tgz#98063ba6eec19b18c71d0f478060aeb3a0a6a07a" @@ -3721,38 +3684,37 @@ webpack-dev-middleware "^3.7.3" webpack-virtual-modules "^0.2.2" -"@storybook/manager-webpack5@^6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/manager-webpack5/-/manager-webpack5-6.4.22.tgz#14b6c564692324e25084f699d599cd202659fe21" - integrity sha512-BMkOMselT4jOn7EQGt748FurM5ewtDfZtOQPCVK8MZX+HYE2AgjNOzm562TYODIxk12Fkhgj3EIz7GGMe1U3RA== +"@storybook/manager-webpack5@^6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/manager-webpack5/-/manager-webpack5-6.5.2.tgz#053a48a06560cdd4a3f3e4dcec3ef8e8737846dd" + integrity sha512-aCk7THztQG2Qo2b+0J2KcR2C6leeQw0XHbodlpRiTr6woXfs4q9xZX88Ujl40q1oZQhb19LMBrac90Es1e2I5w== dependencies: "@babel/core" "^7.12.10" "@babel/plugin-transform-template-literals" "^7.12.1" "@babel/preset-react" "^7.12.10" - "@storybook/addons" "6.4.22" - "@storybook/core-client" "6.4.22" - "@storybook/core-common" "6.4.22" - "@storybook/node-logger" "6.4.22" - "@storybook/theming" "6.4.22" - "@storybook/ui" "6.4.22" - "@types/node" "^14.0.10" + "@storybook/addons" "6.5.2" + "@storybook/core-client" "6.5.2" + "@storybook/core-common" "6.5.2" + "@storybook/node-logger" "6.5.2" + "@storybook/theming" "6.5.2" + "@storybook/ui" "6.5.2" + "@types/node" "^14.0.10 || ^16.0.0" babel-loader "^8.0.0" case-sensitive-paths-webpack-plugin "^2.3.0" chalk "^4.1.0" core-js "^3.8.2" css-loader "^5.0.1" express "^4.17.1" - file-system-cache "^1.0.5" find-up "^5.0.0" fs-extra "^9.0.1" html-webpack-plugin "^5.0.0" - node-fetch "^2.6.1" + node-fetch "^2.6.7" process "^0.11.10" read-pkg-up "^7.0.1" regenerator-runtime "^0.13.7" resolve-from "^5.0.0" style-loader "^2.0.0" - telejson "^5.3.2" + telejson "^6.0.8" terser-webpack-plugin "^5.0.3" ts-dedent "^2.0.0" util-deprecate "^1.0.2" @@ -4053,40 +4015,6 @@ core-js "^3.8.2" regenerator-runtime "^0.13.7" -"@storybook/ui@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.4.22.tgz#49badd7994465d78d984ca4c42533c1c22201c46" - integrity sha512-UVjMoyVsqPr+mkS1L7m30O/xrdIEgZ5SCWsvqhmyMUok3F3tRB+6M+OA5Yy+cIVfvObpA7MhxirUT1elCGXsWQ== - dependencies: - "@emotion/core" "^10.1.1" - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/channels" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/components" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/router" "6.4.22" - "@storybook/semver" "^7.3.2" - "@storybook/theming" "6.4.22" - copy-to-clipboard "^3.3.1" - core-js "^3.8.2" - core-js-pure "^3.8.2" - downshift "^6.0.15" - emotion-theming "^10.0.27" - fuse.js "^3.6.1" - global "^4.4.0" - lodash "^4.17.21" - markdown-to-jsx "^7.1.3" - memoizerific "^1.11.3" - polished "^4.0.5" - qs "^6.10.0" - react-draggable "^4.4.3" - react-helmet-async "^1.0.7" - react-sizeme "^3.0.1" - regenerator-runtime "^0.13.7" - resolve-from "^5.0.0" - store2 "^2.12.0" - "@storybook/ui@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.2.tgz#034a180604df28d0d1b1d38324bab93de5da8db4" @@ -6263,11 +6191,6 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" -batch-processor@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8" - integrity sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg= - batch@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" @@ -7210,11 +7133,6 @@ compression@^1.7.4: safe-buffer "5.1.2" vary "~1.1.2" -compute-scroll-into-view@^1.0.17: - version "1.0.17" - resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab" - integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg== - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -7355,7 +7273,7 @@ core-js-compat@^3.21.0, core-js-compat@^3.22.1, core-js-compat@^3.8.1: browserslist "^4.20.3" semver "7.0.0" -core-js-pure@^3.20.2, core-js-pure@^3.8.1, core-js-pure@^3.8.2: +core-js-pure@^3.20.2, core-js-pure@^3.8.1: version "3.22.5" resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.5.tgz#bdee0ed2f9b78f2862cda4338a07b13a49b6c9a9" integrity sha512-8xo9R00iYD7TcV7OrC98GwxiUEAabVWO3dix+uyWjnYrx9fyASLlIX+f/3p5dW5qByaP2bcZ8X/T47s55et/tA== @@ -8397,17 +8315,6 @@ dotenv@^8.0.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== -downshift@^6.0.15: - version "6.1.7" - resolved "https://registry.yarnpkg.com/downshift/-/downshift-6.1.7.tgz#fdb4c4e4f1d11587985cd76e21e8b4b3fa72e44c" - integrity sha512-cVprZg/9Lvj/uhYRxELzlu1aezRcgPWBjTvspiGTVEU64gF5pRdSRKFVLcxqsZC637cLAGMbL40JavEfWnqgNg== - dependencies: - "@babel/runtime" "^7.14.8" - compute-scroll-into-view "^1.0.17" - prop-types "^15.7.2" - react-is "^17.0.2" - tslib "^2.3.0" - duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" @@ -8450,13 +8357,6 @@ electron-to-chromium@^1.4.118: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f" integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA== -element-resize-detector@^1.2.2: - version "1.2.4" - resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.4.tgz#3e6c5982dd77508b5fa7e6d5c02170e26325c9b1" - integrity sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg== - dependencies: - batch-processor "1.0.0" - elliptic@^6.5.3: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" @@ -9651,11 +9551,6 @@ functions-have-names@^1.2.2: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -fuse.js@^3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.6.1.tgz#7de85fdd6e1b3377c23ce010892656385fd9b10c" - integrity sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw== - gauge@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395" @@ -14729,14 +14624,6 @@ react-dom@^18.1.0: loose-envify "^1.1.0" scheduler "^0.22.0" -react-draggable@^4.4.3: - version "4.4.5" - resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.5.tgz#9e37fe7ce1a4cf843030f521a0a4cc41886d7e7c" - integrity sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g== - dependencies: - clsx "^1.1.1" - prop-types "^15.8.1" - react-element-to-jsx-string@^14.3.4: version "14.3.4" resolved "https://registry.yarnpkg.com/react-element-to-jsx-string/-/react-element-to-jsx-string-14.3.4.tgz#709125bc72f06800b68f9f4db485f2c7d31218a8" @@ -14756,7 +14643,7 @@ react-fast-compare@^3.0.1, react-fast-compare@^3.2.0: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== -react-helmet-async@*, react-helmet-async@^1.0.7, react-helmet-async@^1.3.0: +react-helmet-async@*, react-helmet-async@^1.3.0: 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== @@ -14776,7 +14663,7 @@ react-inspector@^5.1.0: is-dom "^1.0.0" prop-types "^15.0.0" -react-is@17.0.2, react-is@^17.0.1, react-is@^17.0.2: +react-is@17.0.2, react-is@^17.0.1: version "17.0.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== @@ -14941,16 +14828,6 @@ react-scripts@^5.0.1: optionalDependencies: fsevents "^2.3.2" -react-sizeme@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-3.0.2.tgz#4a2f167905ba8f8b8d932a9e35164e459f9020e4" - integrity sha512-xOIAOqqSSmKlKFJLO3inBQBdymzDuXx4iuwkNcJmC96jeiOg5ojByvL+g3MW9LPEsojLbC6pf68zOfobK8IPlw== - dependencies: - element-resize-detector "^1.2.2" - invariant "^2.2.4" - shallowequal "^1.1.0" - throttle-debounce "^3.0.1" - react-syntax-highlighter@^13.5.3: version "13.5.3" resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz#9712850f883a3e19eb858cf93fad7bb357eea9c6" @@ -17154,7 +17031,7 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0: +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1, tslib@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== From 3512e4014ded15814fab52199c5dbe9c35ca7452 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 15:01:59 +0000 Subject: [PATCH 148/340] :arrow_up: Bump @types/node from 17.0.34 to 17.0.35 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.34 to 17.0.35. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index ec7dd26e..285fc2b0 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -31,7 +31,7 @@ "@testing-library/user-event": "^14.2.0", "@types/jest": "^27.5.0", "@types/lodash": "^4.14.182", - "@types/node": "^17.0.34", + "@types/node": "^17.0.35", "@types/react": "^18.0.9", "@types/react-dom": "^18.0.4", "@types/styled-components": "^5.1.24", diff --git a/yarn.lock b/yarn.lock index 18cfc624..14cd5b3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4679,10 +4679,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^17.0.34", "@types/node@^17.0.5": - version "17.0.34" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.34.tgz#3b0b6a50ff797280b8d000c6281d229f9c538cef" - integrity sha512-XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA== +"@types/node@*", "@types/node@^17.0.35", "@types/node@^17.0.5": + version "17.0.35" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a" + integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg== "@types/node@^14.0.10": version "14.18.16" From 4383b95593c3a30cd920883bb638006fe253534a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 15:12:25 +0000 Subject: [PATCH 149/340] :arrow_up: Bump @storybook/addon-links from 6.4.22 to 6.5.2 Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 6.4.22 to 6.5.2. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.2/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.2/addons/links) --- updated-dependencies: - dependency-name: "@storybook/addon-links" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index a6b7122e..4962f063 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -20,7 +20,7 @@ "@babel/plugin-proposal-private-property-in-object": "^7.17.12", "@storybook/addon-actions": "^6.4.22", "@storybook/addon-essentials": "^6.5.2", - "@storybook/addon-links": "^6.4.22", + "@storybook/addon-links": "^6.5.2", "@storybook/builder-webpack5": "^6.4.22", "@storybook/manager-webpack5": "^6.5.2", "@storybook/node-logger": "^6.4.22", diff --git a/yarn.lock b/yarn.lock index 784cc9ef..5809fee5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2944,16 +2944,16 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-links@^6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.4.22.tgz#c0ed9e9ef6505cf1562e1476bbc5064c82dadbe2" - integrity sha512-OSOyDnTXnmcplJHlXTYUTMkrfpLqxtHp2R69IXfAyI1e8WNDb79mXflrEXDA/RSNEliLkqYwCyYby7gDMGds5Q== +"@storybook/addon-links@^6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.2.tgz#9dd892b4fe1b0bfe37fbe8175ff6a6b481d7aee3" + integrity sha512-Er7JtdT92gGDlTwRN+LLwF7X9CCXi7auntU/qrE1ozdGTi9+ye37LcsOA+uSOjSYG3LmQqYzp9hIL9NTsVxJFw== dependencies: - "@storybook/addons" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/router" "6.4.22" + "@storybook/addons" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/router" "6.5.2" "@types/qs" "^6.9.5" core-js "^3.8.2" global "^4.4.0" From 0753311b93b125e10d6c7204bd9d9949dbf0c3c4 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 17:00:00 +0200 Subject: [PATCH 150/340] logical tests --- .../Reducer_Peggy_Parse_test.res | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index d4b69729..35822f88 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -91,6 +91,29 @@ describe("Peggy parse", () => { ) //nested if }) + describe("logical", ()=> { + testParse("true || false", "{(::or true false)}") + testParse("true && false", "{(::and true false)}") + testParse("a && b || c", "{(::and :a (::or :b :c))}") + testParse("a && b || c && d", "{(::and (::and :a (::or :b :c)) :d)}") + testParse("a && !b || c", "{(::and :a (::or (::not :b) :c))}") + testParse("a && b==c || d", "{(::and :a (::or (::equal :b :c) :d))}") + testParse("a && b!=c || d", "{(::and :a (::or (::unequal :b :c) :d))}") + testParse("a && !(b==c) || d", "{(::and :a (::or (::not (::equal :b :c)) :d))}") + testParse("a && b>=c || d", "{(::and :a (::or (::largerEq :b :c) :d))}") + testParse("a && !(b>=c) || d", "{(::and :a (::or (::not (::largerEq :b :c)) :d))}") + testParse("a && b<=c || d", "{(::and :a (::or (::smallerEq :b :c) :d))}") + testParse("a && b>c || d", "{(::and :a (::or (::larger :b :c) :d))}") + testParse("a && b { testParse("1 -> add(2)", "{(::add 1 2)}") testParse("-1 -> add(2)", "{(::add (::unaryMinus 1) 2)}") From c80431419418f23fc760d3bcf5a7444819a1b21d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 15:23:59 +0000 Subject: [PATCH 151/340] :arrow_up: Bump @storybook/builder-webpack5 from 6.4.22 to 6.5.2 Bumps [@storybook/builder-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.4.22 to 6.5.2. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.2/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.2/lib/core) --- updated-dependencies: - dependency-name: "@storybook/builder-webpack5" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 642 +++---------------------------- 2 files changed, 45 insertions(+), 599 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 4962f063..8a6870b9 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -21,7 +21,7 @@ "@storybook/addon-actions": "^6.4.22", "@storybook/addon-essentials": "^6.5.2", "@storybook/addon-links": "^6.5.2", - "@storybook/builder-webpack5": "^6.4.22", + "@storybook/builder-webpack5": "^6.5.2", "@storybook/manager-webpack5": "^6.5.2", "@storybook/node-logger": "^6.4.22", "@storybook/preset-create-react-app": "^4.1.0", diff --git a/yarn.lock b/yarn.lock index 5809fee5..bc5907c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1243,7 +1243,7 @@ core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== @@ -1787,49 +1787,6 @@ url-loader "^4.1.1" webpack "^5.72.0" -"@emotion/cache@^10.0.27": - version "10.0.29" - resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0" - integrity sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ== - dependencies: - "@emotion/sheet" "0.9.4" - "@emotion/stylis" "0.8.5" - "@emotion/utils" "0.11.3" - "@emotion/weak-memoize" "0.2.5" - -"@emotion/core@^10.1.1": - version "10.3.1" - resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.3.1.tgz#4021b6d8b33b3304d48b0bb478485e7d7421c69d" - integrity sha512-447aUEjPIm0MnE6QYIaFz9VQOHSXf4Iu6EWOIqq11EAPqinkSZmfymPTmlOE3QjLv846lH4JVZBUOtwGbuQoww== - dependencies: - "@babel/runtime" "^7.5.5" - "@emotion/cache" "^10.0.27" - "@emotion/css" "^10.0.27" - "@emotion/serialize" "^0.11.15" - "@emotion/sheet" "0.9.4" - "@emotion/utils" "0.11.3" - -"@emotion/css@^10.0.27": - version "10.0.27" - resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.27.tgz#3a7458198fbbebb53b01b2b87f64e5e21241e14c" - integrity sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw== - dependencies: - "@emotion/serialize" "^0.11.15" - "@emotion/utils" "0.11.3" - babel-plugin-emotion "^10.0.27" - -"@emotion/hash@0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" - integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== - -"@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.6": - version "0.8.8" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" - integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== - dependencies: - "@emotion/memoize" "0.7.4" - "@emotion/is-prop-valid@^1.1.0": version "1.1.2" resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95" @@ -1837,70 +1794,21 @@ dependencies: "@emotion/memoize" "^0.7.4" -"@emotion/memoize@0.7.4": - version "0.7.4" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" - integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== - "@emotion/memoize@^0.7.4": version "0.7.5" resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== -"@emotion/serialize@^0.11.15", "@emotion/serialize@^0.11.16": - version "0.11.16" - resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz#dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad" - integrity sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg== - dependencies: - "@emotion/hash" "0.8.0" - "@emotion/memoize" "0.7.4" - "@emotion/unitless" "0.7.5" - "@emotion/utils" "0.11.3" - csstype "^2.5.7" - -"@emotion/sheet@0.9.4": - version "0.9.4" - resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5" - integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA== - -"@emotion/styled-base@^10.3.0": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.3.0.tgz#9aa2c946100f78b47316e4bc6048321afa6d4e36" - integrity sha512-PBRqsVKR7QRNkmfH78hTSSwHWcwDpecH9W6heujWAcyp2wdz/64PP73s7fWS1dIPm8/Exc8JAzYS8dEWXjv60w== - dependencies: - "@babel/runtime" "^7.5.5" - "@emotion/is-prop-valid" "0.8.8" - "@emotion/serialize" "^0.11.15" - "@emotion/utils" "0.11.3" - -"@emotion/styled@^10.0.27": - version "10.3.0" - resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.3.0.tgz#8ee959bf75730789abb5f67f7c3ded0c30aec876" - integrity sha512-GgcUpXBBEU5ido+/p/mCT2/Xx+Oqmp9JzQRuC+a4lYM4i4LBBn/dWvc0rQ19N9ObA8/T4NWMrPNe79kMBDJqoQ== - dependencies: - "@emotion/styled-base" "^10.3.0" - babel-plugin-emotion "^10.0.27" - -"@emotion/stylis@0.8.5", "@emotion/stylis@^0.8.4": +"@emotion/stylis@^0.8.4": version "0.8.5" resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== -"@emotion/unitless@0.7.5", "@emotion/unitless@^0.7.4": +"@emotion/unitless@^0.7.4": version "0.7.5" resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== -"@emotion/utils@0.11.3": - version "0.11.3" - resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz#a759863867befa7e583400d322652a3f44820924" - integrity sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw== - -"@emotion/weak-memoize@0.2.5": - version "0.2.5" - resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" - integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== - "@eslint/eslintrc@^1.2.3": version "1.2.3" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz#fcaa2bcef39e13d6e9e7f6271f4cc7cae1174886" @@ -2366,11 +2274,6 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== -"@popperjs/core@^2.5.4", "@popperjs/core@^2.6.0": - version "2.11.5" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64" - integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw== - "@react-hook/latest@^1.0.2": version "1.0.3" resolved "https://registry.yarnpkg.com/@react-hook/latest/-/latest-1.0.3.tgz#c2d1d0b0af8b69ec6e2b3a2412ba0768ac82db80" @@ -3022,23 +2925,6 @@ prop-types "^15.7.2" regenerator-runtime "^0.13.7" -"@storybook/addons@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.4.22.tgz#e165407ca132c2182de2d466b7ff7c5644b6ad7b" - integrity sha512-P/R+Jsxh7pawKLYo8MtE3QU/ilRFKbtCewV/T1o5U/gm8v7hKQdFz3YdRMAra4QuCY8bQIp7MKd2HrB5aH5a1A== - dependencies: - "@storybook/api" "6.4.22" - "@storybook/channels" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/router" "6.4.22" - "@storybook/theming" "6.4.22" - "@types/webpack-env" "^1.16.0" - core-js "^3.8.2" - global "^4.4.0" - regenerator-runtime "^0.13.7" - "@storybook/addons@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.5.2.tgz#59ec479e3cb714e61adc08732ffad388e59c14ba" @@ -3056,29 +2942,6 @@ global "^4.4.0" regenerator-runtime "^0.13.7" -"@storybook/api@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.4.22.tgz#d63f7ad3ffdd74af01ae35099bff4c39702cf793" - integrity sha512-lAVI3o2hKupYHXFTt+1nqFct942up5dHH6YD7SZZJGyW21dwKC3HK1IzCsTawq3fZAKkgWFgmOO649hKk60yKg== - dependencies: - "@storybook/channels" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/router" "6.4.22" - "@storybook/semver" "^7.3.2" - "@storybook/theming" "6.4.22" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - regenerator-runtime "^0.13.7" - store2 "^2.12.0" - telejson "^5.3.2" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/api@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.2.tgz#e5b61b26c5d2d1c15876e281917e2f91cbc59a52" @@ -3155,50 +3018,31 @@ webpack-hot-middleware "^2.25.1" webpack-virtual-modules "^0.2.2" -"@storybook/builder-webpack5@^6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.4.22.tgz#cd10b3b307f4a6f9c474d3b72ba5555055395681" - integrity sha512-vvQ0HgkIIVz+cmaCXIRor0UFZbGZqh4aV0ISSof60BjdW5ld+R+XCr/bdTU6Zg8b2fL9CXh7/LE6fImnIMpRIA== +"@storybook/builder-webpack5@^6.5.2": + version "6.5.2" + resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.5.2.tgz#23ba7dc94365f6a44c3ad3d388b86de565533f9f" + integrity sha512-aZJoP/T4fcmsHodNA7vf55Sr5eIFQdyFmhvh3OJVXVdIj4OAes3fg/ySz0wAc0VmDpYHPOtUl9uUYt+6Y6IQxQ== dependencies: "@babel/core" "^7.12.10" - "@babel/plugin-proposal-class-properties" "^7.12.1" - "@babel/plugin-proposal-decorators" "^7.12.12" - "@babel/plugin-proposal-export-default-from" "^7.12.1" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-object-rest-spread" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" - "@babel/plugin-proposal-private-methods" "^7.12.1" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-transform-arrow-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.12" - "@babel/plugin-transform-classes" "^7.12.1" - "@babel/plugin-transform-destructuring" "^7.12.1" - "@babel/plugin-transform-for-of" "^7.12.1" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-transform-shorthand-properties" "^7.12.1" - "@babel/plugin-transform-spread" "^7.12.1" - "@babel/preset-env" "^7.12.11" - "@babel/preset-react" "^7.12.10" - "@babel/preset-typescript" "^7.12.7" - "@storybook/addons" "6.4.22" - "@storybook/api" "6.4.22" - "@storybook/channel-postmessage" "6.4.22" - "@storybook/channels" "6.4.22" - "@storybook/client-api" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/components" "6.4.22" - "@storybook/core-common" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/node-logger" "6.4.22" - "@storybook/preview-web" "6.4.22" - "@storybook/router" "6.4.22" + "@storybook/addons" "6.5.2" + "@storybook/api" "6.5.2" + "@storybook/channel-postmessage" "6.5.2" + "@storybook/channels" "6.5.2" + "@storybook/client-api" "6.5.2" + "@storybook/client-logger" "6.5.2" + "@storybook/components" "6.5.2" + "@storybook/core-common" "6.5.2" + "@storybook/core-events" "6.5.2" + "@storybook/node-logger" "6.5.2" + "@storybook/preview-web" "6.5.2" + "@storybook/router" "6.5.2" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.4.22" - "@storybook/theming" "6.4.22" - "@types/node" "^14.0.10" + "@storybook/store" "6.5.2" + "@storybook/theming" "6.5.2" + "@types/node" "^14.0.10 || ^16.0.0" babel-loader "^8.0.0" - babel-plugin-macros "^3.0.1" - babel-plugin-polyfill-corejs3 "^0.1.0" + babel-plugin-named-exports-order "^0.0.2" + browser-assert "^1.2.1" case-sensitive-paths-webpack-plugin "^2.3.0" core-js "^3.8.2" css-loader "^5.0.1" @@ -3218,19 +3062,6 @@ webpack-hot-middleware "^2.25.1" webpack-virtual-modules "^0.4.1" -"@storybook/channel-postmessage@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.4.22.tgz#8be0be1ea1e667a49fb0f09cdfdeeb4a45829637" - integrity sha512-gt+0VZLszt2XZyQMh8E94TqjHZ8ZFXZ+Lv/Mmzl0Yogsc2H+6VzTTQO4sv0IIx6xLbpgG72g5cr8VHsxW5kuDQ== - dependencies: - "@storybook/channels" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/core-events" "6.4.22" - core-js "^3.8.2" - global "^4.4.0" - qs "^6.10.0" - telejson "^5.3.2" - "@storybook/channel-postmessage@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.5.2.tgz#1ce4e417229a4f3772f2a8a9a357dd3fd0a3797e" @@ -3255,15 +3086,6 @@ global "^4.4.0" telejson "^6.0.8" -"@storybook/channels@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.4.22.tgz#710f732763d63f063f615898ab1afbe74e309596" - integrity sha512-cfR74tu7MLah1A8Rru5sak71I+kH2e/sY6gkpVmlvBj4hEmdZp4Puj9PTeaKcMXh9DgIDPNA5mb8yvQH6VcyxQ== - dependencies: - core-js "^3.8.2" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/channels@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.2.tgz#ca964ee7d39874f4a7e450345a432c1681007995" @@ -3273,32 +3095,6 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/client-api@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.4.22.tgz#df14f85e7900b94354c26c584bab53a67c47eae9" - integrity sha512-sO6HJNtrrdit7dNXQcZMdlmmZG1k6TswH3gAyP/DoYajycrTwSJ6ovkarzkO+0QcJ+etgra4TEdTIXiGHBMe/A== - dependencies: - "@storybook/addons" "6.4.22" - "@storybook/channel-postmessage" "6.4.22" - "@storybook/channels" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/store" "6.4.22" - "@types/qs" "^6.9.5" - "@types/webpack-env" "^1.16.0" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - store2 "^2.12.0" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/client-api@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.2.tgz#f1cabf78d1f522610c8393affd10d016898ce1d0" @@ -3325,14 +3121,6 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/client-logger@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.4.22.tgz#51abedb7d3c9bc21921aeb153ac8a19abc625cd6" - integrity sha512-LXhxh/lcDsdGnK8kimqfhu3C0+D2ylCSPPQNbU0IsLRmTfbpQYMdyl0XBjPdHiRVwlL7Gkw5OMjYemQgJ02zlw== - dependencies: - core-js "^3.8.2" - global "^4.4.0" - "@storybook/client-logger@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.2.tgz#1dcd7810649586bddef7997e5501d8a225a457f3" @@ -3341,36 +3129,6 @@ core-js "^3.8.2" global "^4.4.0" -"@storybook/components@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.4.22.tgz#4d425280240702883225b6a1f1abde7dc1a0e945" - integrity sha512-dCbXIJF9orMvH72VtAfCQsYbe57OP7fAADtR6YTwfCw9Sm1jFuZr8JbblQ1HcrXEoJG21nOyad3Hm5EYVb/sBw== - dependencies: - "@popperjs/core" "^2.6.0" - "@storybook/client-logger" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/theming" "6.4.22" - "@types/color-convert" "^2.0.0" - "@types/overlayscrollbars" "^1.12.0" - "@types/react-syntax-highlighter" "11.0.5" - color-convert "^2.0.1" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - markdown-to-jsx "^7.1.3" - memoizerific "^1.11.3" - overlayscrollbars "^1.13.1" - polished "^4.0.5" - prop-types "^15.7.2" - react-colorful "^5.1.2" - react-popper-tooltip "^3.1.1" - react-syntax-highlighter "^13.5.3" - react-textarea-autosize "^8.3.0" - regenerator-runtime "^0.13.7" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/components@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.2.tgz#185bf0d75585fe1299c51a001ace405872aa42cd" @@ -3412,61 +3170,6 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" -"@storybook/core-common@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.4.22.tgz#b00fa3c0625e074222a50be3196cb8052dd7f3bf" - integrity sha512-PD3N/FJXPNRHeQS2zdgzYFtqPLdi3MLwAicbnw+U3SokcsspfsAuyYHZOYZgwO8IAEKy6iCc7TpBdiSJZ/vAKQ== - dependencies: - "@babel/core" "^7.12.10" - "@babel/plugin-proposal-class-properties" "^7.12.1" - "@babel/plugin-proposal-decorators" "^7.12.12" - "@babel/plugin-proposal-export-default-from" "^7.12.1" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-object-rest-spread" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" - "@babel/plugin-proposal-private-methods" "^7.12.1" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-transform-arrow-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.12" - "@babel/plugin-transform-classes" "^7.12.1" - "@babel/plugin-transform-destructuring" "^7.12.1" - "@babel/plugin-transform-for-of" "^7.12.1" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-transform-shorthand-properties" "^7.12.1" - "@babel/plugin-transform-spread" "^7.12.1" - "@babel/preset-env" "^7.12.11" - "@babel/preset-react" "^7.12.10" - "@babel/preset-typescript" "^7.12.7" - "@babel/register" "^7.12.1" - "@storybook/node-logger" "6.4.22" - "@storybook/semver" "^7.3.2" - "@types/node" "^14.0.10" - "@types/pretty-hrtime" "^1.0.0" - babel-loader "^8.0.0" - babel-plugin-macros "^3.0.1" - babel-plugin-polyfill-corejs3 "^0.1.0" - chalk "^4.1.0" - core-js "^3.8.2" - express "^4.17.1" - file-system-cache "^1.0.5" - find-up "^5.0.0" - fork-ts-checker-webpack-plugin "^6.0.4" - fs-extra "^9.0.1" - glob "^7.1.6" - handlebars "^4.7.7" - interpret "^2.2.0" - json5 "^2.1.3" - lazy-universal-dotenv "^3.0.1" - picomatch "^2.3.0" - pkg-dir "^5.0.0" - pretty-hrtime "^1.0.3" - resolve-from "^5.0.0" - slash "^3.0.0" - telejson "^5.3.2" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - webpack "4" - "@storybook/core-common@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.2.tgz#3248510f4d80c8159dfbad2fa28c257677247ede" @@ -3523,13 +3226,6 @@ util-deprecate "^1.0.2" webpack "4" -"@storybook/core-events@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.4.22.tgz#c09b0571951affd4254028b8958a4d8652700989" - integrity sha512-5GYY5+1gd58Gxjqex27RVaX6qbfIQmJxcbzbNpXGNSqwqAuIIepcV1rdCVm6I4C3Yb7/AQ3cN5dVbf33QxRIwA== - dependencies: - core-js "^3.8.2" - "@storybook/core-events@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.2.tgz#639d6b1183a72829a035dbae5a06c6ff94aa8c59" @@ -3623,13 +3319,6 @@ dependencies: lodash "^4.17.15" -"@storybook/csf@0.0.2--canary.87bc651.0": - version "0.0.2--canary.87bc651.0" - resolved "https://registry.yarnpkg.com/@storybook/csf/-/csf-0.0.2--canary.87bc651.0.tgz#c7b99b3a344117ef67b10137b6477a3d2750cf44" - integrity sha512-ajk1Uxa+rBpFQHKrCcTmJyQBXZ5slfwHVEaKlkuFaW77it8RgbPJp/ccna3sgoi8oZ7FkkOyvv1Ve4SmwFqRqw== - dependencies: - lodash "^4.17.15" - "@storybook/docs-tools@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.2.tgz#220f6239d5ea13b9b87f8cf8d9f8beaf6ad6144b" @@ -3739,17 +3428,6 @@ prettier ">=2.2.1 <=2.3.0" ts-dedent "^2.0.0" -"@storybook/node-logger@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.4.22.tgz#c4ec00f8714505f44eda7671bc88bb44abf7ae59" - integrity sha512-sUXYFqPxiqM7gGH7gBXvO89YEO42nA4gBicJKZjj9e+W4QQLrftjF9l+mAw2K0mVE10Bn7r4pfs5oEZ0aruyyA== - dependencies: - "@types/npmlog" "^4.1.2" - chalk "^4.1.0" - core-js "^3.8.2" - npmlog "^5.0.1" - pretty-hrtime "^1.0.3" - "@storybook/node-logger@6.5.2", "@storybook/node-logger@^6.4.22": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.2.tgz#b8a54209b4c53aa2022c45888ce54c9abaa8fea0" @@ -3780,28 +3458,6 @@ pnp-webpack-plugin "^1.7.0" semver "^7.3.5" -"@storybook/preview-web@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.4.22.tgz#58bfc6492503ff4265b50f42a27ea8b0bfcf738a" - integrity sha512-sWS+sgvwSvcNY83hDtWUUL75O2l2LY/GTAS0Zp2dh3WkObhtuJ/UehftzPZlZmmv7PCwhb4Q3+tZDKzMlFxnKQ== - dependencies: - "@storybook/addons" "6.4.22" - "@storybook/channel-postmessage" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - "@storybook/store" "6.4.22" - ansi-to-html "^0.6.11" - core-js "^3.8.2" - global "^4.4.0" - lodash "^4.17.21" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - unfetch "^4.2.0" - util-deprecate "^1.0.2" - "@storybook/preview-web@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.5.2.tgz#d02e84d34b086ff0960c18ce7fb623481ba39829" @@ -3878,23 +3534,6 @@ util-deprecate "^1.0.2" webpack ">=4.43.0 <6.0.0" -"@storybook/router@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.4.22.tgz#e3cc5cd8595668a367e971efb9695bbc122ed95e" - integrity sha512-zeuE8ZgFhNerQX8sICQYNYL65QEi3okyzw7ynF58Ud6nRw4fMxSOHcj2T+nZCIU5ufozRL4QWD/Rg9P2s/HtLw== - dependencies: - "@storybook/client-logger" "6.4.22" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - history "5.0.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - qs "^6.10.0" - react-router "^6.0.0" - react-router-dom "^6.0.0" - ts-dedent "^2.0.0" - "@storybook/router@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.5.2.tgz#bdcee8771c48da947719e547b8ca1c0a31e3ebf9" @@ -3928,27 +3567,6 @@ prettier ">=2.2.1 <=2.3.0" regenerator-runtime "^0.13.7" -"@storybook/store@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.4.22.tgz#f291fbe3639f14d25f875cac86abb209a97d4e2a" - integrity sha512-lrmcZtYJLc2emO+1l6AG4Txm9445K6Pyv9cGAuhOJ9Kks0aYe0YtvMkZVVry0RNNAIv6Ypz72zyKc/QK+tZLAQ== - dependencies: - "@storybook/addons" "6.4.22" - "@storybook/client-logger" "6.4.22" - "@storybook/core-events" "6.4.22" - "@storybook/csf" "0.0.2--canary.87bc651.0" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - regenerator-runtime "^0.13.7" - slash "^3.0.0" - stable "^0.1.8" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/store@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.5.2.tgz#9fa55361da041b0dfdcb12999689f23d6f2a6736" @@ -3988,24 +3606,6 @@ read-pkg-up "^7.0.1" regenerator-runtime "^0.13.7" -"@storybook/theming@6.4.22": - version "6.4.22" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.4.22.tgz#19097eec0366447ddd0d6917b0e0f81d0ec5e51e" - integrity sha512-NVMKH/jxSPtnMTO4VCN1k47uztq+u9fWv4GSnzq/eezxdGg9ceGL4/lCrNGoNajht9xbrsZ4QvsJ/V2sVGM8wA== - dependencies: - "@emotion/core" "^10.1.1" - "@emotion/is-prop-valid" "^0.8.6" - "@emotion/styled" "^10.0.27" - "@storybook/client-logger" "6.4.22" - core-js "^3.8.2" - deep-object-diff "^1.1.0" - emotion-theming "^10.0.27" - global "^4.4.0" - memoizerific "^1.11.3" - polished "^4.0.5" - resolve-from "^5.0.0" - ts-dedent "^2.0.0" - "@storybook/theming@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.5.2.tgz#aeff68c156607bb6b0d28ab99219d7242efcc6f0" @@ -4388,18 +3988,6 @@ resolved "https://registry.yarnpkg.com/@types/clone/-/clone-2.1.1.tgz#9b880d0ce9b1f209b5e0bd6d9caa38209db34024" integrity sha512-BZIU34bSYye0j/BFcPraiDZ5ka6MJADjcDVELGf7glr9K+iE8NYVjFslJFVWzskSxkLLyCrSPScE82/UUoBSvg== -"@types/color-convert@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.0.tgz#8f5ee6b9e863dcbee5703f5a517ffb13d3ea4e22" - integrity sha512-m7GG7IKKGuJUXvkZ1qqG3ChccdIM/qBBo913z+Xft0nKCX4hAU/IxKwZBU4cpRZ7GS5kV4vOblUkILtSShCPXQ== - dependencies: - "@types/color-name" "*" - -"@types/color-name@*": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" - integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== - "@types/connect-history-api-fallback@^1.3.5": version "1.3.5" resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" @@ -4612,11 +4200,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a" integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg== -"@types/node@^14.0.10": - version "14.18.16" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.16.tgz#878f670ba3f00482bf859b6550b6010610fc54b5" - integrity sha512-X3bUMdK/VmvrWdoTkz+VCn6nwKwrKCFTHtqwBIaQJNx4RUIBBUFXM00bqPz/DsDd+Icjmzm6/tyYZzeGVqb6/Q== - "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0": version "16.11.36" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.36.tgz#9ab9f8276987132ed2b225cace2218ba794fc751" @@ -4632,11 +4215,6 @@ resolved "https://registry.yarnpkg.com/@types/npmlog/-/npmlog-4.1.4.tgz#30eb872153c7ead3e8688c476054ddca004115f6" integrity sha512-WKG4gTr8przEZBiJ5r3s8ZIAoMXNbOgQ+j/d5O4X3x6kZJRLNvyUJuUK/KoG3+8BaOHPhp2m7WC6JKKeovDSzQ== -"@types/overlayscrollbars@^1.12.0": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@types/overlayscrollbars/-/overlayscrollbars-1.12.1.tgz#fb637071b545834fb12aea94ee309a2ff4cdc0a8" - integrity sha512-V25YHbSoKQN35UasHf0EKD9U2vcmexRSp78qa8UglxFH8H3D+adEa9zGZwrqpH4TdvqeMrgMqVqsLB4woAryrQ== - "@types/parse-json@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" @@ -5914,22 +5492,6 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" -babel-plugin-emotion@^10.0.27: - version "10.2.2" - resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz#a1fe3503cff80abfd0bdda14abd2e8e57a79d17d" - integrity sha512-SMSkGoqTbTyUTDeuVuPIWifPdUGkTk1Kf9BWRiXIOIcuyMfsdp2EjeiiFvOzX8NOBvEh/ypKYvUh2rkgAJMCLA== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@emotion/hash" "0.8.0" - "@emotion/memoize" "0.7.4" - "@emotion/serialize" "^0.11.16" - babel-plugin-macros "^2.0.0" - babel-plugin-syntax-jsx "^6.18.0" - convert-source-map "^1.5.0" - escape-string-regexp "^1.0.5" - find-root "^1.1.0" - source-map "^0.5.7" - babel-plugin-extract-import-names@1.6.22: version "1.6.22" resolved "https://registry.yarnpkg.com/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" @@ -5958,15 +5520,6 @@ babel-plugin-jest-hoist@^27.5.1: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-plugin-macros@^2.0.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" - integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== - dependencies: - "@babel/runtime" "^7.7.2" - cosmiconfig "^6.0.0" - resolve "^1.12.0" - babel-plugin-macros@^3.0.1, babel-plugin-macros@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz#9ef6dc74deb934b4db344dc973ee851d148c50c1" @@ -5981,6 +5534,11 @@ babel-plugin-named-asset-import@^0.3.8: resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz#6b7fa43c59229685368683c28bc9734f24524cc2" integrity sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q== +babel-plugin-named-exports-order@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/babel-plugin-named-exports-order/-/babel-plugin-named-exports-order-0.0.2.tgz#ae14909521cf9606094a2048239d69847540cb09" + integrity sha512-OgOYHOLoRK+/mvXU9imKHlG6GkPLYrUCvFXG/CM93R/aNNO8pOOF4aS+S8CCHMDQoNSeiOYEZb/G6RwL95Jktw== + babel-plugin-polyfill-corejs2@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5" @@ -6359,6 +5917,11 @@ brorand@^1.0.1, brorand@^1.1.0: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= +browser-assert@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/browser-assert/-/browser-assert-1.2.1.tgz#9aaa5a2a8c74685c2ae05bfe46efd606f068c200" + integrity sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ== + browser-process-hrtime@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" @@ -7207,7 +6770,7 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: +convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== @@ -7715,11 +7278,6 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@^2.5.7: - version "2.6.20" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.20.tgz#9229c65ea0b260cf4d3d997cb06288e36a8d6dda" - integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA== - csstype@^3.0.2, csstype@^3.0.6: version "3.0.11" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33" @@ -7931,11 +7489,6 @@ deep-is@^0.1.3, deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -deep-object-diff@^1.1.0: - version "1.1.7" - resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.7.tgz#348b3246f426427dd633eaa50e1ed1fc2eafc7e4" - integrity sha512-QkgBca0mL08P6HiOjoqvmm6xOAl2W6CT2+34Ljhg0OeFan8cwlcdq8jrLKsBBuUFAZLsN5b6y491KdKEoSo9lg== - deepmerge@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" @@ -8400,15 +7953,6 @@ emoticon@^3.2.0: resolved "https://registry.yarnpkg.com/emoticon/-/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" integrity sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg== -emotion-theming@^10.0.27: - version "10.3.0" - resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.3.0.tgz#7f84d7099581d7ffe808aab5cd870e30843db72a" - integrity sha512-mXiD2Oj7N9b6+h/dC6oLf9hwxbtKHQjoIqtodEyL8CpkN4F3V4IK/BT4D0C7zSs4BBFOu4UlPJbvvBLa88SGEA== - dependencies: - "@babel/runtime" "^7.5.5" - "@emotion/weak-memoize" "0.2.5" - hoist-non-react-statics "^3.3.0" - encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -9293,11 +8837,6 @@ find-cache-dir@^3.2.0, find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" -find-root@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" - integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== - find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -10079,18 +9618,11 @@ he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -highlight.js@^10.1.1, highlight.js@^10.4.1, highlight.js@~10.7.0: +highlight.js@^10.4.1, highlight.js@~10.7.0: version "10.7.3" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== -history@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/history/-/history-5.0.0.tgz#0cabbb6c4bbf835addb874f8259f6d25101efd08" - integrity sha512-3NyRMKIiFSJmIPdq7FxkNMJkQ7ZEtVblOQ38VtKaA0zZMW1Eo6Q6W8oDKEflr1kNNTItSnk4JMCO1deeSgbLLg== - dependencies: - "@babel/runtime" "^7.7.6" - history@^4.9.0: version "4.10.1" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" @@ -10103,13 +9635,6 @@ history@^4.9.0: tiny-warning "^1.0.0" value-equal "^1.0.1" -history@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b" - integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ== - dependencies: - "@babel/runtime" "^7.7.6" - hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -12125,7 +11650,7 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== -lowlight@^1.14.0, lowlight@^1.17.0: +lowlight@^1.17.0: version "1.20.0" resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.20.0.tgz#ddb197d33462ad0d93bf19d17b6c301aa3941888" integrity sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw== @@ -12215,11 +11740,6 @@ markdown-escapes@^1.0.0: resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg== -markdown-to-jsx@^7.1.3: - version "7.1.7" - resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.1.7.tgz#a5f22102fb12241c8cea1ca6a4050bb76b23a25d" - integrity sha512-VI3TyyHlGkO8uFle0IOibzpO1c1iJDcXcS/zBrQrXQQvJ2tpdwVzVZ7XdKsyRz1NdRmre4dqQkMZzUHaKIG/1w== - mathjs@^10.5.2: version "10.5.2" resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-10.5.2.tgz#bf0618b99b662a3af8a2613b6489ec0422314b08" @@ -13097,11 +12617,6 @@ os-browserify@^0.3.0: resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= -overlayscrollbars@^1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.1.tgz#0b840a88737f43a946b9d87875a2f9e421d0338a" - integrity sha512-gIQfzgGgu1wy80EB4/6DaJGHMEGmizq27xHIESrzXq0Y/J0Ay1P3DWk6tuVmEPIZH15zaBlxeEJOqdJKmowHCQ== - p-all@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-all/-/p-all-2.1.0.tgz#91419be56b7dee8fe4c5db875d55e0da084244a0" @@ -13525,7 +13040,7 @@ pnp-webpack-plugin@^1.7.0: dependencies: ts-pnp "^1.1.6" -polished@^4.0.5, polished@^4.2.2: +polished@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/polished/-/polished-4.2.2.tgz#2529bb7c3198945373c52e34618c8fe7b1aa84d1" integrity sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ== @@ -14235,7 +13750,7 @@ prism-react-renderer@^1.3.1, prism-react-renderer@^1.3.3: resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.3.tgz#9b5a4211a6756eee3c96fee9a05733abc0b0805c" integrity sha512-Viur/7tBTCH2HmYzwCHmt2rEFn+rdIWNIINXyg0StiISbDiIhHKhrFuEK8eMkKgvsIYSjgGqy/hNyucHp6FpoQ== -prismjs@^1.21.0, prismjs@^1.27.0, prismjs@^1.28.0: +prismjs@^1.27.0, prismjs@^1.28.0: version "1.28.0" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6" integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw== @@ -14560,11 +14075,6 @@ react-base16-styling@^0.6.0: lodash.flow "^3.3.0" pure-color "^1.2.0" -react-colorful@^5.1.2: - version "5.5.1" - resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.5.1.tgz#29d9c4e496f2ca784dd2bb5053a3a4340cfaf784" - integrity sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg== - react-dev-utils@^12.0.1: version "12.0.1" resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73" @@ -14638,7 +14148,7 @@ react-error-overlay@^6.0.11: resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb" integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg== -react-fast-compare@^3.0.1, react-fast-compare@^3.2.0: +react-fast-compare@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== @@ -14700,23 +14210,6 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1: dependencies: "@babel/runtime" "^7.10.3" -react-popper-tooltip@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz#329569eb7b287008f04fcbddb6370452ad3f9eac" - integrity sha512-EnERAnnKRptQBJyaee5GJScWNUKQPDD2ywvzZyUjst/wj5U64C8/CnSYLNEmP2hG0IJ3ZhtDxE8oDN+KOyavXQ== - dependencies: - "@babel/runtime" "^7.12.5" - "@popperjs/core" "^2.5.4" - react-popper "^2.2.4" - -react-popper@^2.2.4: - version "2.3.0" - resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.3.0.tgz#17891c620e1320dce318bad9fede46a5f71c70ba" - integrity sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q== - dependencies: - react-fast-compare "^3.0.1" - warning "^4.0.2" - react-refresh@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046" @@ -14742,14 +14235,6 @@ react-router-dom@^5.2.0: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-router-dom@^6.0.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d" - integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw== - dependencies: - history "^5.2.0" - react-router "6.3.0" - react-router@5.3.1, react-router@^5.2.0: version "5.3.1" resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.1.tgz#b13e84a016c79b9e80dde123ca4112c4f117e3cf" @@ -14766,13 +14251,6 @@ react-router@5.3.1, react-router@^5.2.0: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-router@6.3.0, react-router@^6.0.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557" - integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ== - dependencies: - history "^5.2.0" - react-scripts@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.1.tgz#6285dbd65a8ba6e49ca8d651ce30645a6d980003" @@ -14828,17 +14306,6 @@ react-scripts@^5.0.1: optionalDependencies: fsevents "^2.3.2" -react-syntax-highlighter@^13.5.3: - version "13.5.3" - resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-13.5.3.tgz#9712850f883a3e19eb858cf93fad7bb357eea9c6" - integrity sha512-crPaF+QGPeHNIblxxCdf2Lg936NAHKhNhuMzRL3F9ct6aYXL3NcZtCL0Rms9+qVo6Y1EQLdXGypBNSbPL/r+qg== - dependencies: - "@babel/runtime" "^7.3.1" - highlight.js "^10.1.1" - lowlight "^1.14.0" - prismjs "^1.21.0" - refractor "^3.1.0" - react-syntax-highlighter@^15.4.5: version "15.5.0" resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-15.5.0.tgz#4b3eccc2325fa2ec8eff1e2d6c18fa4a9e07ab20" @@ -14850,7 +14317,7 @@ react-syntax-highlighter@^15.4.5: prismjs "^1.27.0" refractor "^3.6.0" -react-textarea-autosize@^8.3.0, react-textarea-autosize@^8.3.2: +react-textarea-autosize@^8.3.2: version "8.3.3" resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8" integrity sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ== @@ -14997,7 +14464,7 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -refractor@^3.1.0, refractor@^3.6.0: +refractor@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.6.0.tgz#ac318f5a0715ead790fcfb0c71f4dd83d977935a" integrity sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA== @@ -15354,7 +14821,7 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.2, resolve@^1.9.0: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.3.2, resolve@^1.9.0: version "1.22.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== @@ -16027,7 +15494,7 @@ source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, sourc resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7: +source-map@^0.5.0, source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -16652,20 +16119,6 @@ teeny-request@7.1.1: stream-events "^1.0.5" uuid "^8.0.0" -telejson@^5.3.2: - version "5.3.3" - resolved "https://registry.yarnpkg.com/telejson/-/telejson-5.3.3.tgz#fa8ca84543e336576d8734123876a9f02bf41d2e" - integrity sha512-PjqkJZpzEggA9TBpVtJi1LVptP7tYtXB6rEubwlHap76AMjzvOdKX41CxyaW7ahhzDU1aftXnMCx5kAPDZTQBA== - dependencies: - "@types/is-function" "^1.0.0" - global "^4.4.0" - is-function "^1.0.2" - is-regex "^1.1.2" - is-symbol "^1.0.3" - isobject "^4.0.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - telejson@^6.0.8: version "6.0.8" resolved "https://registry.yarnpkg.com/telejson/-/telejson-6.0.8.tgz#1c432db7e7a9212c1fbd941c3e5174ec385148f7" @@ -17977,13 +17430,6 @@ walker@^1.0.7, walker@~1.0.5: dependencies: makeerror "1.0.12" -warning@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" - integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== - dependencies: - loose-envify "^1.0.0" - watchpack-chokidar2@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" From 7bfe286f42ec44dff0a9a0763f60ebfdbf614c0d Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 17:25:19 +0200 Subject: [PATCH 152/340] multiplicative tests --- .../Reducer_Peggy_Parse_test.res | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 35822f88..67cd59c6 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -39,6 +39,29 @@ describe("Peggy parse", () => { testParse("!true", "{(::not true)}") testParse("1 + -1", "{(::add 1 (::unaryMinus 1))}") testParse("-a[0]", "{(::unaryMinus (::$atIndex :a 0))}") + testParse("!a[0]", "{(::not (::$atIndex :a 0))}") + }) + + describe("multiplicative", () => { + testParse("1 * 2", "{(::multiply 1 2)}") + testParse("1 / 2", "{(::divide 1 2)}") + testParse("1 * 2 * 3", "{(::multiply (::multiply 1 2) 3)}") + testParse("1 * 2 / 3", "{(::divide (::multiply 1 2) 3)}") + testParse("1 / 2 * 3", "{(::multiply (::divide 1 2) 3)}") + testParse("1 / 2 / 3", "{(::divide (::divide 1 2) 3)}") + testParse("1 * 2 + 3 * 4", "{(::add (::multiply 1 2) (::multiply 3 4))}") + testParse("1 * 2 - 3 * 4", "{(::subtract (::multiply 1 2) (::multiply 3 4))}") + testParse("1 * 2 .+ 3 * 4", "{(::dotAdd (::multiply 1 2) (::multiply 3 4))}") + testParse("1 * 2 .- 3 * 4", "{(::dotSubtract (::multiply 1 2) (::multiply 3 4))}") + testParse("1 * 2 + 3 .* 4", "{(::add (::multiply 1 2) (::dotMultiply 3 4))}") + testParse("1 * 2 + 3 / 4", "{(::add (::multiply 1 2) (::divide 3 4))}") + testParse("1 * 2 + 3 ./ 4", "{(::add (::multiply 1 2) (::dotDivide 3 4))}") + testParse("1 * 2 - 3 .* 4", "{(::subtract (::multiply 1 2) (::dotMultiply 3 4))}") + testParse("1 * 2 - 3 / 4", "{(::subtract (::multiply 1 2) (::divide 3 4))}") + testParse("1 * 2 - 3 ./ 4", "{(::subtract (::multiply 1 2) (::dotDivide 3 4))}") + testParse("1 * 2 - 3 * 4^5", "{(::subtract (::multiply 1 2) (::multiply 3 (::pow 4 5)))}") + testParse("1 * 2 - 3 * 4^5^6", "{(::subtract (::multiply 1 2) (::multiply 3 (::pow (::pow 4 5) 6)))}") + testParse("1 * -a[-2]", "{(::multiply 1 (::unaryMinus (::$atIndex :a (::unaryMinus 2))))}") }) describe("multi-line", () => { From 56f0c9c290b01ad098c11b5b9eaf05151de09fba Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 17:40:30 +0200 Subject: [PATCH 153/340] lambda tests --- .../Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 67cd59c6..ce0ec5d7 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -61,6 +61,7 @@ describe("Peggy parse", () => { testParse("1 * 2 - 3 ./ 4", "{(::subtract (::multiply 1 2) (::dotDivide 3 4))}") testParse("1 * 2 - 3 * 4^5", "{(::subtract (::multiply 1 2) (::multiply 3 (::pow 4 5)))}") testParse("1 * 2 - 3 * 4^5^6", "{(::subtract (::multiply 1 2) (::multiply 3 (::pow (::pow 4 5) 6)))}") + testParse("1 * 2 - 3 * 4^5^6", "{(::subtract (::multiply 1 2) (::multiply 3 (::pow (::pow 4 5) 6)))}") testParse("1 * -a[-2]", "{(::multiply 1 (::unaryMinus (::$atIndex :a (::unaryMinus 2))))}") }) @@ -185,6 +186,10 @@ describe("Peggy parse", () => { testParse("myadd(x,y)=x+y; z=myadd; z", "{:myadd = {|:x,:y| {(::add :x :y)}}; :z = {:myadd}; :z}") testParse("myadd(x,y)=x+y; z=[myadd]; z", "{:myadd = {|:x,:y| {(::add :x :y)}}; :z = {(::$constructArray (:myadd))}; :z}") testParse("myaddd(x,y)=x+y; z={x: myaddd}; z", "{:myaddd = {|:x,:y| {(::add :x :y)}}; :z = {(::$constructRecord ('x': :myaddd))}; :z}") + testParse("f({|x| x+1})", "{(::f {|:x| {(::add :x 1)}})}") + testParse("map(arr, {|x| x+1})", "{(::map :arr {|:x| {(::add :x 1)}})}") + testParse("map([1,2,3], {|x| x+1})", "{(::map (::$constructArray (1 2 3)) {|:x| {(::add :x 1)}})}") + testParse("[1,2,3]->map({|x| x+1})", "{(::map (::$constructArray (1 2 3)) {|:x| {(::add :x 1)}})}") }) }) From 3371c51e945a322567ac3c648425a0c6439f887b Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 17:47:26 +0200 Subject: [PATCH 154/340] post operators test --- .../Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index ce0ec5d7..7d57119b 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -61,7 +61,6 @@ describe("Peggy parse", () => { testParse("1 * 2 - 3 ./ 4", "{(::subtract (::multiply 1 2) (::dotDivide 3 4))}") testParse("1 * 2 - 3 * 4^5", "{(::subtract (::multiply 1 2) (::multiply 3 (::pow 4 5)))}") testParse("1 * 2 - 3 * 4^5^6", "{(::subtract (::multiply 1 2) (::multiply 3 (::pow (::pow 4 5) 6)))}") - testParse("1 * 2 - 3 * 4^5^6", "{(::subtract (::multiply 1 2) (::multiply 3 (::pow (::pow 4 5) 6)))}") testParse("1 * -a[-2]", "{(::multiply 1 (::unaryMinus (::$atIndex :a (::unaryMinus 2))))}") }) @@ -94,6 +93,13 @@ describe("Peggy parse", () => { testParse("record.property", "{(::$atIndex :record 'property')}") }) + describe("post operators", ()=>{ + //function call, array and record access are post operators with higher priority than unary operators + testParse("a==!b(1)", "{(::equal :a (::not (::b 1)))}") + testParse("a==!b[1]", "{(::equal :a (::not (::$atIndex :b 1)))}") + testParse("a==!b.one", "{(::equal :a (::not (::$atIndex :b 'one')))}") + }) + describe("comments", () => { testParse("1 # This is a line comment", "{1}") testParse("1 // This is a line comment", "{1}") From 7ccb1d8108230d92deebfa31cb4aae867721f006 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 17:59:25 +0200 Subject: [PATCH 155/340] multi-line tests --- .../Reducer_Peggy_Parse_test.res | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 7d57119b..aab71709 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -199,4 +199,31 @@ describe("Peggy parse", () => { }) }) +describe("parsing new line", ()=>{ + testParse(` + a + + b`, "{(::add :a :b)}") + testParse(` + x= + 1`, "{:x = {1}}") + testParse(` + x=1 + y=2`, "{:x = {1}; :y = {2}}") + testParse(` + x={ + y=2; + y } + x`, "{:x = {:y = {2}; :y}; :x}") + testParse(` + x={ + y=2 + y } + x`, "{:x = {:y = {2}; :y}; :x}") + MySkip.testParse(` + x={ + y=2 + y + } + x`, "{:x = {:y = {2}; :y}; :x}") //FIXME: Bracket after new line is not parsed +}) From 638548c37b7588733df93f04e7009ce742b3edb4 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 18:04:51 +0200 Subject: [PATCH 156/340] multi-line comment --- .../Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index aab71709..dea5e98d 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -105,6 +105,11 @@ describe("Peggy parse", () => { testParse("1 // This is a line comment", "{1}") testParse("1 /* This is a multi line comment */", "{1}") testParse("/* This is a multi line comment */ 1", "{1}") + testParse(` + /* This is + a multi line + comment */ + 1`, "{1}") }) describe("ternary operator", () => { From c496ae5cddbc2fe50a526a9d55c9957b851cdfeb Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 18:19:09 +0200 Subject: [PATCH 157/340] multi-line tests --- .../Reducer_Peggy_Parse_test.res | 30 ++++- .../Reducer_Peggy_GeneratedParser.js | 106 ++---------------- .../Reducer_Peggy_GeneratedParser.pegjs | 10 +- 3 files changed, 39 insertions(+), 107 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index dea5e98d..6422882d 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -224,11 +224,37 @@ describe("parsing new line", ()=>{ y=2 y } x`, "{:x = {:y = {2}; :y}; :x}") - MySkip.testParse(` + testParse(` x={ y=2 y } - x`, "{:x = {:y = {2}; :y}; :x}") //FIXME: Bracket after new line is not parsed + x`, "{:x = {:y = {2}; :y}; :x}") + testParse(` + x=1 + y=2 + z=3 + `, "{:x = {1}; :y = {2}; :z = {3}}") + testParse(` + f={ + x=1 + y=2 + z=3 + x+y+z + } + `, "{:f = {:x = {1}; :y = {2}; :z = {3}; (::add (::add :x :y) :z)}}") + testParse(` + a |> + b |> + c |> + d + `, "{(::d (::c (::b :a)))}") + testParse(` + a |> + b |> + c |> + d + + e + `, "{(::add (::d (::c (::b :a))) :e)}") }) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index 54367909..e6d5d0f6 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -676,7 +676,7 @@ function peg$parse(input, options) { } function peg$parseinnerBlockOrExpression() { - var s0, s1, s2, s3, s4, s5, s6; + var s0, s1; var key = peg$currPos * 56 + 3; var cached = peg$resultsCache[key]; @@ -687,105 +687,15 @@ function peg$parse(input, options) { return cached.result; } - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parsearray_statements(); - if (s3 !== peg$FAILED) { - s4 = peg$currPos; - s5 = peg$parsestatementSeparator(); - if (s5 !== peg$FAILED) { - s6 = peg$parseexpression(); - if (s6 !== peg$FAILED) { - s4 = s6; - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - if (s4 !== peg$FAILED) { - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 125) { - s6 = peg$c1; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s6 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f3(s3, s4); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + s0 = peg$parsequotedInnerBlock(); if (s0 === peg$FAILED) { s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } + s1 = peg$parseexpression(); if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parseexpression(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 125) { - s5 = peg$c1; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f4(s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parseexpression(); - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f2(s1); - } - s0 = s1; + peg$savedPos = s0; + s1 = peg$f2(s1); } + s0 = s1; } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -832,7 +742,7 @@ function peg$parse(input, options) { s4 = peg$FAILED; } if (s4 !== peg$FAILED) { - s5 = peg$parse_(); + s5 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 125) { s6 = peg$c1; peg$currPos++; @@ -872,7 +782,7 @@ function peg$parse(input, options) { s2 = peg$parse_nl(); s3 = peg$parseexpression(); if (s3 !== peg$FAILED) { - s4 = peg$parse_(); + s4 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 125) { s5 = peg$c1; peg$currPos++; diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs index 5ad59be8..07a04191 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs @@ -76,19 +76,15 @@ outerBlock { return nodeBlock([finalExpression])} innerBlockOrExpression - = '{' _nl statements:array_statements finalExpression: (statementSeparator @expression) _ '}' - { statements.push(finalExpression) - return nodeBlock(statements) } - / '{' _nl finalExpression: expression _ '}' - { return nodeBlock([finalExpression]) } + = quotedInnerBlock / finalExpression: expression { return nodeBlock([finalExpression])} quotedInnerBlock - = '{' _nl statements:array_statements finalExpression: (statementSeparator @expression) _ '}' + = '{' _nl statements:array_statements finalExpression: (statementSeparator @expression) _nl '}' { statements.push(finalExpression) return nodeBlock(statements) } - / '{' _nl finalExpression: expression _ '}' + / '{' _nl finalExpression: expression _nl '}' { return nodeBlock([finalExpression]) } array_statements From 749fba287765b96f978701368dff3bf246adf894 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 19:07:57 +0200 Subject: [PATCH 158/340] pr fixes --- .../Reducer/Reducer_Expression/Reducer_Expression.res | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res index 6883fe51..39ff9f5e 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res @@ -77,7 +77,7 @@ and reduceValueList = (valueList: list, environment): result< | list{EvCall(fName), ...args} => (fName, args->Belt.List.toArray)->BuiltIn.dispatch(environment, reduceExpression) - | list{EvLambda(_lamdaCall)} => + | list{EvLambda(_)} => valueList ->Lambda.checkIfReduced ->Result.flatMap(reducedValueList => @@ -119,7 +119,7 @@ let evaluateUsingOptions = ( } /* - Evaluates MathJs code and bindings via Reducer and answers the result + Evaluates Squiggle code and bindings via Reducer and answers the result */ let evaluate = (code: string): result => { evaluateUsingOptions(~environment=None, ~externalBindings=None, code) From 986e7c744bbee457d07acbeb4651c37998a9d393 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 19:10:14 +0200 Subject: [PATCH 159/340] pegjs->peggy --- ..._GeneratedParser.pegjs => Reducer_Peggy_GeneratedParser.peggy} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/{Reducer_Peggy_GeneratedParser.pegjs => Reducer_Peggy_GeneratedParser.peggy} (100%) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy similarity index 100% rename from packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.pegjs rename to packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy From d332114bc103e33a62da7092290d1da771090eff Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 19:16:25 +0200 Subject: [PATCH 160/340] peggy build command --- packages/squiggle-lang/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 7a47893e..03c7517a 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -5,6 +5,7 @@ "license": "MIT", "scripts": { "peggy": "peggy --cache ", + "build:peggy": "find . -type f -name *.peggy -exec yarn run peggy {} \\;", "build": "yarn build:rescript && yarn build:typescript", "build:rescript": "rescript build -with-deps", "build:typescript": "tsc", From 27609cd058853812bff8a3dddfd4b354c897b436 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 19:56:00 +0200 Subject: [PATCH 161/340] peggy as development dependency --- packages/squiggle-lang/package.json | 1 + yarn.lock | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 03c7517a..bf76709a 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -56,6 +56,7 @@ "lodash": "^4.17.21", "moduleserve": "^0.9.1", "nyc": "^15.1.0", + "peggy": "^1.2.0", "reanalyze": "^2.19.0", "rescript-fast-check": "^1.1.1", "ts-jest": "^27.1.4", diff --git a/yarn.lock b/yarn.lock index 9666fb0e..a9c6c487 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4477,7 +4477,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.1", "@types/react@^18.0.9": +"@types/react@*", "@types/react@^18.0.9": version "18.0.9" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== @@ -13225,6 +13225,11 @@ pdfast@^0.2.0: resolved "https://registry.yarnpkg.com/pdfast/-/pdfast-0.2.0.tgz#8cbc556e1bf2522177787c0de2e0d4373ba885c9" integrity sha1-jLxVbhvyUiF3eHwN4uDUNzuohck= +peggy@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/peggy/-/peggy-1.2.0.tgz#657ba45900cbef1dc9f52356704bdbb193c2021c" + integrity sha512-PQ+NKpAobImfMprYQtc4Egmyi29bidRGEX0kKjCU5uuW09s0Cthwqhfy7mLkwcB4VcgacE5L/ZjruD/kOPCUUw== + performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -14678,7 +14683,7 @@ react-vega@^7.5.1: prop-types "^15.8.1" vega-embed "^6.5.1" -react@^18.0.0, react@^18.1.0: +react@^18.1.0: version "18.1.0" resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890" integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ== From 516627629fa8b11684b2078a5ee063c50db929e5 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 20:12:46 +0200 Subject: [PATCH 162/340] attempt to resolve "credibleIntervalToDistribution" --- .../ReducerInterface_GenericDistribution.res | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 8366818a..fd9bac70 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -188,14 +188,15 @@ module SymbolicConstructors = { let twoFloat = name => switch name { - | "normal" => Ok(SymbolicDist.Normal.make) - | "uniform" => Ok(SymbolicDist.Uniform.make) | "beta" => Ok(SymbolicDist.Beta.make) - | "lognormal" => Ok(SymbolicDist.Lognormal.make) - | "logistic" => Ok(SymbolicDist.Logistic.make) | "cauchy" => Ok(SymbolicDist.Cauchy.make) + | "credibleIntervalToDistribution" => Ok(SymbolicDist.From90thPercentile.make) | "gamma" => Ok(SymbolicDist.Gamma.make) - | "to" => Ok(SymbolicDist.From90thPercentile.make) + | "logistic" => Ok(SymbolicDist.Logistic.make) + | "lognormal" => Ok(SymbolicDist.Lognormal.make) + | "normal" => Ok(SymbolicDist.Normal.make) + | "to" => Ok(SymbolicDist.From90thPercentile.make) // as credibleIntervalToDistribution is defined "to" might be redundant + | "uniform" => Ok(SymbolicDist.Uniform.make) | _ => Error("Unreachable state") } From 57c2fba7911d628541defe824cc745683b7f451e Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 20:20:14 +0200 Subject: [PATCH 163/340] "credibleIntervalToDistribution" --- .../ReducerInterface/ReducerInterface_GenericDistribution.res | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index fd9bac70..fa152c6f 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -234,6 +234,7 @@ let dispatchToGenericOutput = ( | "lognormal" | "cauchy" | "gamma" + | "credibleIntervalToDistribution" | "to" | "logistic") as fnName, [EvNumber(f1), EvNumber(f2)], From a51e4be528f9a05afb145bd1199695294bbcb8d1 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 20:25:18 +0200 Subject: [PATCH 164/340] format --- .../Reducer_Dispatch_BuiltInMacros_test.res | 14 +- .../Reducer_Peggy_Parse_test.res | 129 ++++++++++++----- .../Reducer_Peggy_ToExpression_test.res | 137 ++++++++++++++---- .../Reducer/Reducer_externalBindings_test.res | 1 - .../Reducer/Reducer_functionTricks_test.res | 20 +-- .../__tests__/Reducer/Reducer_test.res | 2 +- .../Reducer_Expression/Reducer_Expression.res | 6 +- .../Reducer_Peggy_ToExpression.res | 1 - .../ReducerInterface_ExpressionValue.res | 2 +- 9 files changed, 231 insertions(+), 81 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res index e4c2e456..a6a47978 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res @@ -16,7 +16,11 @@ testMacro([], exampleExpression, "Ok(1)") describe("bindStatement", () => { // A statement is bound by the bindings created by the previous statement - testMacro([], eBindStatement(eBindings([]), exampleStatementY), "Ok((:$setBindings {} :y 1) context: {})") + testMacro( + [], + eBindStatement(eBindings([]), exampleStatementY), + "Ok((:$setBindings {} :y 1) context: {})", + ) // Then it answers the bindings for the next statement when reduced testMacroEval([], eBindStatement(eBindings([]), exampleStatementY), "Ok({y: 1})") // Now let's feed a binding to see what happens @@ -31,13 +35,17 @@ describe("bindStatement", () => { testMacro( [("z", EvNumber(99.))], eBindStatementDefault(exampleStatementY), - "Ok((:$setBindings {z: 99} :y 1) context: {z: 99})", + "Ok((:$setBindings {z: 99} :y 1) context: {z: 99})", ) }) describe("bindExpression", () => { // x is simply bound in the expression - testMacro([], eBindExpression(eBindings([("x", EvNumber(2.))]), eSymbol("x")), "Ok(2 context: {x: 2})") + testMacro( + [], + eBindExpression(eBindings([("x", EvNumber(2.))]), eSymbol("x")), + "Ok(2 context: {x: 2})", + ) // When an let statement is the end expression then bindings are returned testMacro( [], diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 6422882d..51431907 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -60,7 +60,10 @@ describe("Peggy parse", () => { testParse("1 * 2 - 3 / 4", "{(::subtract (::multiply 1 2) (::divide 3 4))}") testParse("1 * 2 - 3 ./ 4", "{(::subtract (::multiply 1 2) (::dotDivide 3 4))}") testParse("1 * 2 - 3 * 4^5", "{(::subtract (::multiply 1 2) (::multiply 3 (::pow 4 5)))}") - testParse("1 * 2 - 3 * 4^5^6", "{(::subtract (::multiply 1 2) (::multiply 3 (::pow (::pow 4 5) 6)))}") + testParse( + "1 * 2 - 3 * 4^5^6", + "{(::subtract (::multiply 1 2) (::multiply 3 (::pow (::pow 4 5) 6)))}", + ) testParse("1 * -a[-2]", "{(::multiply 1 (::unaryMinus (::$atIndex :a (::unaryMinus 2))))}") }) @@ -93,7 +96,7 @@ describe("Peggy parse", () => { testParse("record.property", "{(::$atIndex :record 'property')}") }) - describe("post operators", ()=>{ + describe("post operators", () => { //function call, array and record access are post operators with higher priority than unary operators testParse("a==!b(1)", "{(::equal :a (::not (::b 1)))}") testParse("a==!b[1]", "{(::equal :a (::not (::$atIndex :b 1)))}") @@ -105,11 +108,14 @@ describe("Peggy parse", () => { testParse("1 // This is a line comment", "{1}") testParse("1 /* This is a multi line comment */", "{1}") testParse("/* This is a multi line comment */ 1", "{1}") - testParse(` + testParse( + ` /* This is a multi line comment */ - 1`, "{1}") + 1`, + "{1}", + ) }) describe("ternary operator", () => { @@ -126,7 +132,7 @@ describe("Peggy parse", () => { ) //nested if }) - describe("logical", ()=> { + describe("logical", () => { testParse("true || false", "{(::or true false)}") testParse("true && false", "{(::and true false)}") testParse("a && b || c", "{(::and :a (::or :b :c))}") @@ -144,9 +150,18 @@ describe("Peggy parse", () => { testParse("a && b { @@ -194,67 +209,111 @@ describe("Peggy parse", () => { }) describe("Using lambda as value", () => { - testParse("myadd(x,y)=x+y; z=myadd; z", "{:myadd = {|:x,:y| {(::add :x :y)}}; :z = {:myadd}; :z}") - testParse("myadd(x,y)=x+y; z=[myadd]; z", "{:myadd = {|:x,:y| {(::add :x :y)}}; :z = {(::$constructArray (:myadd))}; :z}") - testParse("myaddd(x,y)=x+y; z={x: myaddd}; z", "{:myaddd = {|:x,:y| {(::add :x :y)}}; :z = {(::$constructRecord ('x': :myaddd))}; :z}") + testParse( + "myadd(x,y)=x+y; z=myadd; z", + "{:myadd = {|:x,:y| {(::add :x :y)}}; :z = {:myadd}; :z}", + ) + testParse( + "myadd(x,y)=x+y; z=[myadd]; z", + "{:myadd = {|:x,:y| {(::add :x :y)}}; :z = {(::$constructArray (:myadd))}; :z}", + ) + testParse( + "myaddd(x,y)=x+y; z={x: myaddd}; z", + "{:myaddd = {|:x,:y| {(::add :x :y)}}; :z = {(::$constructRecord ('x': :myaddd))}; :z}", + ) testParse("f({|x| x+1})", "{(::f {|:x| {(::add :x 1)}})}") testParse("map(arr, {|x| x+1})", "{(::map :arr {|:x| {(::add :x 1)}})}") - testParse("map([1,2,3], {|x| x+1})", "{(::map (::$constructArray (1 2 3)) {|:x| {(::add :x 1)}})}") - testParse("[1,2,3]->map({|x| x+1})", "{(::map (::$constructArray (1 2 3)) {|:x| {(::add :x 1)}})}") + testParse( + "map([1,2,3], {|x| x+1})", + "{(::map (::$constructArray (1 2 3)) {|:x| {(::add :x 1)}})}", + ) + testParse( + "[1,2,3]->map({|x| x+1})", + "{(::map (::$constructArray (1 2 3)) {|:x| {(::add :x 1)}})}", + ) }) }) -describe("parsing new line", ()=>{ - testParse(` +describe("parsing new line", () => { + testParse( + ` a + - b`, "{(::add :a :b)}") - testParse(` + b`, + "{(::add :a :b)}", + ) + testParse( + ` x= - 1`, "{:x = {1}}") - testParse(` + 1`, + "{:x = {1}}", + ) + testParse( + ` x=1 - y=2`, "{:x = {1}; :y = {2}}") - testParse(` + y=2`, + "{:x = {1}; :y = {2}}", + ) + testParse( + ` x={ y=2; y } - x`, "{:x = {:y = {2}; :y}; :x}") - testParse(` + x`, + "{:x = {:y = {2}; :y}; :x}", + ) + testParse( + ` x={ y=2 y } - x`, "{:x = {:y = {2}; :y}; :x}") - testParse(` + x`, + "{:x = {:y = {2}; :y}; :x}", + ) + testParse( + ` x={ y=2 y } - x`, "{:x = {:y = {2}; :y}; :x}") - testParse(` + x`, + "{:x = {:y = {2}; :y}; :x}", + ) + testParse( + ` x=1 y=2 z=3 - `, "{:x = {1}; :y = {2}; :z = {3}}") - testParse(` + `, + "{:x = {1}; :y = {2}; :z = {3}}", + ) + testParse( + ` f={ x=1 y=2 z=3 x+y+z } - `, "{:f = {:x = {1}; :y = {2}; :z = {3}; (::add (::add :x :y) :z)}}") - testParse(` + `, + "{:f = {:x = {1}; :y = {2}; :z = {3}; (::add (::add :x :y) :z)}}", + ) + testParse( + ` a |> b |> c |> d - `, "{(::d (::c (::b :a)))}") - testParse(` + `, + "{(::d (::c (::b :a)))}", + ) + testParse( + ` a |> b |> c |> d + e - `, "{(::add (::d (::c (::b :a))) :e)}") + `, + "{(::add (::d (::c (::b :a))) :e)}", + ) }) - diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res index 81326456..fea5a5cd 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res @@ -9,27 +9,32 @@ open Jest open Expect let expectToExpressionToBe = (expr, answer, ~v="_", ()) => { - let rExpr = Parse.parse(expr) - ->Result.map(ToExpression.fromNode) + let rExpr = Parse.parse(expr)->Result.map(ToExpression.fromNode) let a1 = rExpr->ExpressionT.toStringResultOkless - if (v=="_") { + if v == "_" { a1->expect->toBe(answer) } else { - let a2 = rExpr->Result.flatMap( - expr => Expression.reduceExpression(expr, Belt.Map.String.empty, ExpressionValue.defaultEnvironment) - )->ExpressionValue.toStringResultOkless + let a2 = + rExpr + ->Result.flatMap(expr => + Expression.reduceExpression(expr, Belt.Map.String.empty, ExpressionValue.defaultEnvironment) + ) + ->ExpressionValue.toStringResultOkless (a1, a2)->expect->toEqual((answer, v)) } } -let testToExpression = (expr, answer, ~v="_", ()) => test(expr, () => expectToExpressionToBe(expr, answer, ~v=v, ())) +let testToExpression = (expr, answer, ~v="_", ()) => + test(expr, () => expectToExpressionToBe(expr, answer, ~v, ())) module MySkip = { - let testToExpression = (expr, answer, ~v="_", ()) => Skip.test(expr, () => expectToExpressionToBe(expr, answer, ~v=v, ())) + let testToExpression = (expr, answer, ~v="_", ()) => + Skip.test(expr, () => expectToExpressionToBe(expr, answer, ~v, ())) } module MyOnly = { - let testToExpression = (expr, answer, ~v="_", ()) => Only.test(expr, () => expectToExpressionToBe(expr, answer, ~v=v, ())) + let testToExpression = (expr, answer, ~v="_", ()) => + Only.test(expr, () => expectToExpressionToBe(expr, answer, ~v, ())) } describe("Peggy to Expression", () => { @@ -53,7 +58,12 @@ describe("Peggy to Expression", () => { describe("multi-line", () => { testToExpression("x=1; 2", "(:$$block (:$let :x (:$$block 1)) 2)", ~v="2", ()) - testToExpression("x=1; y=2", "(:$$block (:$let :x (:$$block 1)) (:$let :y (:$$block 2)))", ~v="{x: 1,y: 2}", ()) + testToExpression( + "x=1; y=2", + "(:$$block (:$let :x (:$$block 1)) (:$let :y (:$$block 2)))", + ~v="{x: 1,y: 2}", + (), + ) }) describe("variables", () => { @@ -63,22 +73,51 @@ describe("Peggy to Expression", () => { }) describe("functions", () => { - testToExpression("identity(x) = x", "(:$$block (:$let :identity (:$$lambda [x] (:$$block :x))))", ~v="{identity: lambda(x=>internal code)}", ()) // Function definitions become lambda assignments + testToExpression( + "identity(x) = x", + "(:$$block (:$let :identity (:$$lambda [x] (:$$block :x))))", + ~v="{identity: lambda(x=>internal code)}", + (), + ) // Function definitions become lambda assignments testToExpression("identity(x)", "(:$$block (:identity :x))", ()) // Note value returns error properly }) describe("arrays", () => { testToExpression("[]", "(:$$block (:$constructArray ()))", ~v="[]", ()) testToExpression("[0, 1, 2]", "(:$$block (:$constructArray (0 1 2)))", ~v="[0,1,2]", ()) - testToExpression("['hello', 'world']", "(:$$block (:$constructArray ('hello' 'world')))", ~v="['hello','world']", ()) - testToExpression("([0,1,2])[1]", "(:$$block (:$atIndex (:$constructArray (0 1 2)) 1))", ~v="1", ()) + testToExpression( + "['hello', 'world']", + "(:$$block (:$constructArray ('hello' 'world')))", + ~v="['hello','world']", + (), + ) + testToExpression( + "([0,1,2])[1]", + "(:$$block (:$atIndex (:$constructArray (0 1 2)) 1))", + ~v="1", + (), + ) }) describe("records", () => { - testToExpression("{a: 1, b: 2}", "(:$$block (:$constructRecord (('a' 1) ('b' 2))))", ~v="{a: 1,b: 2}", ()) - testToExpression("{1+0: 1, 2+0: 2}", "(:$$block (:$constructRecord (((:add 1 0) 1) ((:add 2 0) 2))))", ()) // key can be any expression + testToExpression( + "{a: 1, b: 2}", + "(:$$block (:$constructRecord (('a' 1) ('b' 2))))", + ~v="{a: 1,b: 2}", + (), + ) + testToExpression( + "{1+0: 1, 2+0: 2}", + "(:$$block (:$constructRecord (((:add 1 0) 1) ((:add 2 0) 2))))", + (), + ) // key can be any expression testToExpression("record.property", "(:$$block (:$atIndex :record 'property'))", ()) - testToExpression("record={property: 1}; record.property", "(:$$block (:$let :record (:$$block (:$constructRecord (('property' 1))))) (:$atIndex :record 'property'))", ~v="1", ()) + testToExpression( + "record={property: 1}; record.property", + "(:$$block (:$let :record (:$$block (:$constructRecord (('property' 1))))) (:$atIndex :record 'property'))", + ~v="1", + (), + ) }) describe("comments", () => { @@ -91,16 +130,35 @@ describe("Peggy to Expression", () => { describe("ternary operator", () => { testToExpression("true ? 1 : 0", "(:$$block (:$$ternary true 1 0))", ~v="1", ()) testToExpression("false ? 1 : 0", "(:$$block (:$$ternary false 1 0))", ~v="0", ()) - testToExpression("true ? 1 : false ? 2 : 0", "(:$$block (:$$ternary true 1 (:$$ternary false 2 0)))", ~v="1", ()) // nested ternary - testToExpression("false ? 1 : false ? 2 : 0", "(:$$block (:$$ternary false 1 (:$$ternary false 2 0)))", ~v="0", ()) // nested ternary + testToExpression( + "true ? 1 : false ? 2 : 0", + "(:$$block (:$$ternary true 1 (:$$ternary false 2 0)))", + ~v="1", + (), + ) // nested ternary + testToExpression( + "false ? 1 : false ? 2 : 0", + "(:$$block (:$$ternary false 1 (:$$ternary false 2 0)))", + ~v="0", + (), + ) // nested ternary }) describe("if then else", () => { - testToExpression("if true then 2 else 3", "(:$$block (:$$ternary true (:$$block 2) (:$$block 3)))", ()) - testToExpression("if true then {2} else {3}", "(:$$block (:$$ternary true (:$$block 2) (:$$block 3)))", ()) + testToExpression( + "if true then 2 else 3", + "(:$$block (:$$ternary true (:$$block 2) (:$$block 3)))", + (), + ) + testToExpression( + "if true then {2} else {3}", + "(:$$block (:$$ternary true (:$$block 2) (:$$block 3)))", + (), + ) testToExpression( "if false then {2} else if false then {4} else {5}", - "(:$$block (:$$ternary false (:$$block 2) (:$$ternary false (:$$block 4) (:$$block 5))))", () + "(:$$block (:$$ternary false (:$$block 2) (:$$ternary false (:$$block 4) (:$$block 5))))", + (), ) //nested if }) @@ -119,15 +177,38 @@ describe("Peggy to Expression", () => { describe("inner block", () => { // inner blocks are 0 argument lambdas. They can be used whenever a value is required. // Like lambdas they have a local scope. - testToExpression("y=99; x={y=1; y}", "(:$$block (:$let :y (:$$block 99)) (:$let :x (:$$block (:$let :y (:$$block 1)) :y)))", ~v="{x: 1,y: 99}", ()) + testToExpression( + "y=99; x={y=1; y}", + "(:$$block (:$let :y (:$$block 99)) (:$let :x (:$$block (:$let :y (:$$block 1)) :y)))", + ~v="{x: 1,y: 99}", + (), + ) }) describe("lambda", () => { - testToExpression("{|x| x}", "(:$$block (:$$lambda [x] (:$$block :x)))", ~v="lambda(x=>internal code)", ()) - testToExpression("f={|x| x}", "(:$$block (:$let :f (:$$block (:$$lambda [x] (:$$block :x)))))", ~v="{f: lambda(x=>internal code)}", ()) - testToExpression("f(x)=x","(:$$block (:$let :f (:$$lambda [x] (:$$block :x))))", ~v="{f: lambda(x=>internal code)}", ()) // Function definitions are lambda assignments - testToExpression("f(x)=x ? 1 : 0", "(:$$block (:$let :f (:$$lambda [x] (:$$block (:$$ternary :x 1 0)))))", ~v="{f: lambda(x=>internal code)}", ()) + testToExpression( + "{|x| x}", + "(:$$block (:$$lambda [x] (:$$block :x)))", + ~v="lambda(x=>internal code)", + (), + ) + testToExpression( + "f={|x| x}", + "(:$$block (:$let :f (:$$block (:$$lambda [x] (:$$block :x)))))", + ~v="{f: lambda(x=>internal code)}", + (), + ) + testToExpression( + "f(x)=x", + "(:$$block (:$let :f (:$$lambda [x] (:$$block :x))))", + ~v="{f: lambda(x=>internal code)}", + (), + ) // Function definitions are lambda assignments + testToExpression( + "f(x)=x ? 1 : 0", + "(:$$block (:$let :f (:$$lambda [x] (:$$block (:$$ternary :x 1 0)))))", + ~v="{f: lambda(x=>internal code)}", + (), + ) }) }) - - diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res index 25a7371d..ecc2ab40 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res @@ -9,4 +9,3 @@ describe("Eval with Bindings", () => { testEvalBindingsToBe("y = x+1; y", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(2)") testEvalBindingsToBe("y = x+1", list{("x", ExpressionValue.EvNumber(1.))}, "Ok({x: 1,y: 2})") }) - diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res index 66df8f14..4cc6cb3a 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res @@ -68,21 +68,23 @@ describe("function tricks", () => { testEvalToBe("y=2;g(x)=inspect(y)+1", "Ok({g: lambda(x=>internal code),y: 2})") MySkip.testEvalToBe("f(x) = x(x); f(f)", "????") // TODO: Infinite loop. Any solution? Catching proper exception or timeout? MySkip.testEvalToBe("f(x, x)=x+x; f(1,2)", "????") // TODO: Duplicate parameters - testEvalToBe("myadd(x,y)=x+y; z=myadd; z", "Ok(lambda(x,y=>internal code))") - testEvalToBe("myadd(x,y)=x+y; z=myadd; z(1, 1)", "Ok(2)") + testEvalToBe("myadd(x,y)=x+y; z=myadd; z", "Ok(lambda(x,y=>internal code))") + testEvalToBe("myadd(x,y)=x+y; z=myadd; z(1, 1)", "Ok(2)") }) describe("lambda in structures", () => { - testEvalToBe("myadd(x,y)=x+y; z=[myadd]", "Ok({myadd: lambda(x,y=>internal code),z: [lambda(x,y=>internal code)]})") - testEvalToBe("myadd(x,y)=x+y; z=[myadd]; z[0]", "Ok(lambda(x,y=>internal code))") - testEvalToBe("myadd(x,y)=x+y; z=[myadd]; z[0](3,2)", "Ok(5)") - testEvalToBe("myaddd(x,y)=x+y; z={x: myaddd}; z", "Ok({x: lambda(x,y=>internal code)})") - testEvalToBe("myaddd(x,y)=x+y; z={x: myaddd}; z.x", "Ok(lambda(x,y=>internal code))") - testEvalToBe("myaddd(x,y)=x+y; z={x: myaddd}; z.x(3,2)", "Ok(5)") + testEvalToBe( + "myadd(x,y)=x+y; z=[myadd]", + "Ok({myadd: lambda(x,y=>internal code),z: [lambda(x,y=>internal code)]})", + ) + testEvalToBe("myadd(x,y)=x+y; z=[myadd]; z[0]", "Ok(lambda(x,y=>internal code))") + testEvalToBe("myadd(x,y)=x+y; z=[myadd]; z[0](3,2)", "Ok(5)") + testEvalToBe("myaddd(x,y)=x+y; z={x: myaddd}; z", "Ok({x: lambda(x,y=>internal code)})") + testEvalToBe("myaddd(x,y)=x+y; z={x: myaddd}; z.x", "Ok(lambda(x,y=>internal code))") + testEvalToBe("myaddd(x,y)=x+y; z={x: myaddd}; z.x(3,2)", "Ok(5)") }) describe("ternary and bindings", () => { testEvalToBe("f(x)=x ? 1 : 0; f(true)", "Ok(1)") testEvalToBe("f(x)=x>2 ? 1 : 0; f(3)", "Ok(1)") }) - diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_test.res index 3d0989d8..32aad5d3 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_test.res @@ -26,7 +26,7 @@ describe("eval", () => { test("define", () => expectEvalToBe("{a: 1, b: 2}", "Ok({a: 1,b: 2})")) test("index", () => expectEvalToBe("r = {a: 1}; r.a", "Ok(1)")) test("index", () => expectEvalToBe("r = {a: 1}; r.b", "Error(Record property not found: b)")) - testEvalError("{a: 1}.b") // invalid syntax + testEvalError("{a: 1}.b") // invalid syntax }) describe("multi-line", () => { diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res index 39ff9f5e..1125c193 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res @@ -21,7 +21,9 @@ type t = expression Converts a Squigle code to expression */ let parse = (peggyCode: string): result => - peggyCode->Reducer_Peggy_Parse.parse->Result.map(node => Reducer_Peggy_ToExpression.fromNode(node)) + peggyCode + ->Reducer_Peggy_Parse.parse + ->Result.map(node => Reducer_Peggy_ToExpression.fromNode(node)) /* Recursively evaluate/reduce the expression (Lisp AST) @@ -72,7 +74,7 @@ and reduceExpressionList = ( and reduceValueList = (valueList: list, environment): result< expressionValue, 'e, -> => +> => switch valueList { | list{EvCall(fName), ...args} => (fName, args->Belt.List.toArray)->BuiltIn.dispatch(environment, reduceExpression) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res index 651d4111..1ce41459 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res @@ -5,7 +5,6 @@ module Parse = Reducer_Peggy_Parse type expression = ExpressionT.expression let rec fromNode = (node: Parse.node): expression => { - let caseBlock = nodeBlock => ExpressionBuilder.eBlock(nodeBlock["statements"]->Js.Array2.map(fromNode)->Belt.List.fromArray) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res index 0fa76304..730cac2a 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res @@ -90,7 +90,7 @@ let toStringResult = x => let toStringResultOkless = codeResult => switch codeResult { | Ok(a) => toString(a) - | Error(m) => `Error(${ErrorValue.errorToString(m)})` + | Error(m) => `Error(${ErrorValue.errorToString(m)})` } let toStringResultRecord = x => From ffedc5dbb3e7f9cfb260ce9a417fd005eda437f2 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 20:38:10 +0200 Subject: [PATCH 165/340] multi-line tests --- .../Reducer_Peggy_Parse_test.res | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 51431907..591fc11a 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -297,6 +297,41 @@ describe("parsing new line", () => { `, "{:f = {:x = {1}; :y = {2}; :z = {3}; (::add (::add :x :y) :z)}}", ) + testParse( + ` + f={ + x=1 + y=2 + z=3 + x+y+z + } + g=f+4 + g + `, + "{:f = {:x = {1}; :y = {2}; :z = {3}; (::add (::add :x :y) :z)}; :g = {(::add :f 4)}; :g}", + ) + testParse( + ` + f = + { + x=1; //x + y=2 //y + z= + 3 + x+ + y+ + z + } + g = + f + + 4 + g -> + h -> + p -> + q + `, + "{:f = {:x = {1}; :y = {2}; :z = {3}; (::add (::add :x :y) :z)}; :g = {(::add :f 4)}; (::q (::p (::h :g)))}", + ) testParse( ` a |> From 75c913fac3d5467f43eae459a066cbdbfa1e34bc Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 20:45:15 +0200 Subject: [PATCH 166/340] fixes #522 --- .../Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res index fea5a5cd..9df108f5 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res @@ -80,6 +80,7 @@ describe("Peggy to Expression", () => { (), ) // Function definitions become lambda assignments testToExpression("identity(x)", "(:$$block (:identity :x))", ()) // Note value returns error properly + testToExpression("f(x) = x> 2 ? 0 : 1; f(3)", "(:$$block (:$let :f (:$$lambda [x] (:$$block (:$$ternary (:larger :x 2) 0 1)))) (:f 3))", ~v="0", ()) }) describe("arrays", () => { @@ -183,6 +184,7 @@ describe("Peggy to Expression", () => { ~v="{x: 1,y: 99}", (), ) + }) describe("lambda", () => { From 58f1789cfed22e596f6bfe11b151ac8c60a3e69e Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 19 May 2022 15:12:36 -0400 Subject: [PATCH 167/340] Refactored Normal and Lognormal functions --- .../src/rescript/FunctionRegistry.res | 209 +++++++++++------- 1 file changed, 125 insertions(+), 84 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index df04cef9..a1138129 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -130,11 +130,12 @@ module Function = { type definitionId = int type match = Match.t, definitionId> - let make = (name, definitions): function => { + let make = (~name, ~definitions): function => { name: name, definitions: definitions, } - let makeDefinition = (name, inputs, run): fnDefinition => { + + let makeDefinition = (~name, ~inputs, ~run): fnDefinition => { name: name, inputs: inputs, run: run, @@ -239,39 +240,50 @@ module Registry = { let impossibleError = "Wrong inputs / Logically impossible" -let twoNumberInputs = (inputs: array) => { - switch inputs { - | [Number(n1), Number(n2)] => Ok(n1, n2) - | _ => Error(impossibleError) +module Prepare = { + let twoNumberInputs = (inputs: array) => { + switch inputs { + | [Number(n1), Number(n2)] => Ok(n1, n2) + | _ => Error(impossibleError) + } } + + let twoDistOrNumber = (values: array) => { + switch values { + | [DistOrNumber(a1), DistOrNumber(a2)] => Ok(a1, a2) + | _ => Error(impossibleError) + } + } + + let twoNumberInputsRecord = (v1: string, v2: string, inputs: array) => + switch inputs { + | [Record([(name1, n1), (name2, n2)])] if name1 == v1 && name2 == v2 => + twoNumberInputs([n1, n2]) + | _ => Error(impossibleError) + } + + let twoNumberInputsRecord2 = (inputs: array) => + switch inputs { + | [Record([(_, n1), (_, n2)])] => twoNumberInputs([n1, n2]) + | _ => Error(impossibleError) + } + + let twoNumberInputsRecord3 = (inputs: array) => + switch inputs { + | [Record([(_, n1), (_, n2)])] => Ok([n1, n2]) + | _ => Error(impossibleError) + } } -let twoNumberInputsRecord = (v1, v2, inputs: array) => - switch inputs { - | [Record([(name1, n1), (name2, n2)])] if name1 == v1 && name2 == v2 => twoNumberInputs([n1, n2]) - | _ => Error(impossibleError) - } - -let contain = r => ReducerInterface_ExpressionValue.EvDistribution(Symbolic(r)) - -let meanStdev = (mean, stdev) => SymbolicDist.Normal.make(mean, stdev)->E.R2.fmap(contain) - -let p5and95 = (p5, p95) => contain(SymbolicDist.Normal.from90PercentCI(p5, p95)) - -let convertTwoInputs = (inputs: array): result => - twoNumberInputs(inputs)->E.R.bind(((mean, stdev)) => meanStdev(mean, stdev)) - -let twoDistOrStdev = (a1: value, a2: value) => { - switch (a1, a2) { - | (DistOrNumber(a1), DistOrNumber(a2)) => Ok(a1, a2) - | _ => Error(impossibleError) - } +module Wrappers = { + let symbolic = r => DistributionTypes.Symbolic(r) + let evDistribution = r => ReducerInterface_ExpressionValue.EvDistribution(r) + let symbolicEvDistribution = r => r->Symbolic->evDistribution } -let distTwo = ( +let twoDistsOrNumbers = ( ~fn: (float, float) => result, - a1: value, - a2: value, + ~values: (distOrNumber, distOrNumber), ) => { let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000) let sampleSetToExpressionValue = ( @@ -299,12 +311,11 @@ let distTwo = ( sampleSetResult->sampleSetToExpressionValue } - switch (a1, a2) { - | (DistOrNumber(Number(a1)), DistOrNumber(Number(a2))) => - fn(a1, a2)->E.R2.fmap(r => ReducerInterface_ExpressionValue.EvDistribution(r)) - | (DistOrNumber(Dist(a1)), DistOrNumber(Number(a2))) => singleVarSample(a1, r => fn(r, a2)) - | (DistOrNumber(Number(a1)), DistOrNumber(Dist(a2))) => singleVarSample(a2, r => fn(a1, r)) - | (DistOrNumber(Dist(a1)), DistOrNumber(Dist(a2))) => { + switch values { + | (Number(a1), Number(a2)) => fn(a1, a2)->E.R2.fmap(Wrappers.evDistribution) + | (Dist(a1), Number(a2)) => singleVarSample(a1, r => fn(r, a2)) + | (Number(a1), Dist(a2)) => singleVarSample(a2, r => fn(a1, r)) + | (Dist(a1), Dist(a2)) => { let altFn = (a, b) => fn(a, b)->mapFnResult let sampleSetResult = E.R.merge(toSampleSet(a1), toSampleSet(a2)) @@ -315,57 +326,87 @@ let distTwo = ( ->E.R2.errMap(r => DistributionTypes.OtherError(r)) sampleSetResult->sampleSetToExpressionValue } - | _ => Error(impossibleError) } } -let normal = Function.make( - "Normal", - [ - Function.makeDefinition("normal", [I_DistOrNumber, I_DistOrNumber], inputs => { - let combine = (a1: float, a2: float) => - SymbolicDist.Normal.make(a1, a2)->E.R2.fmap(r => DistributionTypes.Symbolic(r)) - distTwo(~fn=combine, inputs[0], inputs[1]) - }), - Function.makeDefinition( - "normal", - [I_Record([("mean", I_Numeric), ("stdev", I_Numeric)])], - inputs => - twoNumberInputsRecord("mean", "stdev", inputs)->E.R.bind(((mean, stdev)) => - meanStdev(mean, stdev) - ), - ), - Function.makeDefinition("normal", [I_Record([("p5", I_Numeric), ("p95", I_Numeric)])], inputs => - twoNumberInputsRecord("p5", "p95", inputs)->E.R.bind(((v1, v2)) => Ok(p5and95(v1, v2))) - ), - ], -) +module NormalFn = { + let fnName = "normal" + let twoFloatsToSymoblic = (a1: float, a2: float) => + SymbolicDist.Normal.make(a1, a2)->E.R2.fmap(Wrappers.symbolic) + let twoFloatsToSymbolic90P = (a1: float, a2: float) => + SymbolicDist.Normal.from90PercentCI(a1, a2)->Wrappers.symbolic->Ok -let logNormal = Function.make( - "Lognormal", - [ - Function.makeDefinition("lognormal", [I_Numeric, I_Numeric], inputs => - twoNumberInputs(inputs)->E.R.bind(((mu, sigma)) => - SymbolicDist.Lognormal.make(mu, sigma)->E.R2.fmap(contain) - ) - ), - Function.makeDefinition( - "lognormal", - [I_Record([("p5", I_Numeric), ("p95", I_Numeric)])], - inputs => - twoNumberInputsRecord("p5", "p95", inputs)->E.R.bind(((p5, p95)) => Ok( - contain(SymbolicDist.Lognormal.from90PercentCI(p5, p95)), - )), - ), - Function.makeDefinition( - "lognormal", - [I_Record([("mean", I_Numeric), ("stdev", I_Numeric)])], - inputs => - twoNumberInputsRecord("mean", "stdev", inputs)->E.R.bind(((mean, stdev)) => - SymbolicDist.Lognormal.fromMeanAndStdev(mean, stdev)->E.R2.fmap(contain) - ), - ), - ], -) + let toFn = Function.make( + ~name="Normal", + ~definitions=[ + Function.makeDefinition( + ~name=fnName, + ~inputs=[I_DistOrNumber, I_DistOrNumber], + ~run=inputs => { + inputs + ->Prepare.twoDistOrNumber + ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymoblic, ~values=_)) + }, + ), + Function.makeDefinition( + ~name=fnName, + ~inputs=[I_Record([("mean", I_DistOrNumber), ("stdev", I_DistOrNumber)])], + ~run=inputs => + inputs + ->Prepare.twoNumberInputsRecord3 + ->E.R.bind(Prepare.twoDistOrNumber) + ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymoblic, ~values=_)), + ), + Function.makeDefinition( + ~name=fnName, + ~inputs=[I_Record([("p5", I_DistOrNumber), ("p95", I_DistOrNumber)])], + ~run=inputs => + inputs + ->Prepare.twoNumberInputsRecord3 + ->E.R.bind(Prepare.twoDistOrNumber) + ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymbolic90P, ~values=_)), + ), + ], + ) +} -let allFunctions = [normal, logNormal] +module LognormalFn = { + let fnName = "lognormal" + let twoFloatsToSymoblic = (a1, a2) => + SymbolicDist.Lognormal.make(a1, a2)->E.R2.fmap(Wrappers.symbolic) + let twoFloatsToSymbolic90P = (a1, a2) => + SymbolicDist.Lognormal.from90PercentCI(a1, a2)->Wrappers.symbolic->Ok + let twoFloatsToMeanStdev = (a1, a2) => + SymbolicDist.Lognormal.fromMeanAndStdev(a1, a2)->E.R2.fmap(Wrappers.symbolic) + + let toFn = Function.make( + ~name="Lognormal", + ~definitions=[ + Function.makeDefinition(~name=fnName, ~inputs=[I_DistOrNumber, I_DistOrNumber], ~run=inputs => + inputs + ->Prepare.twoDistOrNumber + ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymoblic, ~values=_)) + ), + Function.makeDefinition( + ~name=fnName, + ~inputs=[I_Record([("p5", I_DistOrNumber), ("p95", I_DistOrNumber)])], + ~run=inputs => + inputs + ->Prepare.twoNumberInputsRecord3 + ->E.R.bind(Prepare.twoDistOrNumber) + ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymbolic90P, ~values=_)), + ), + Function.makeDefinition( + ~name=fnName, + ~inputs=[I_Record([("mean", I_DistOrNumber), ("stdev", I_DistOrNumber)])], + ~run=inputs => + inputs + ->Prepare.twoNumberInputsRecord3 + ->E.R.bind(Prepare.twoDistOrNumber) + ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToMeanStdev, ~values=_)), + ), + ], + ) +} + +let allFunctions = [NormalFn.toFn, LognormalFn.toFn] From 4b07226b4546ccd8b9ccdf715495ffdca126a82a Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 19 May 2022 17:04:31 -0400 Subject: [PATCH 168/340] Continuing cleanup of FunctionRegistry --- .../src/rescript/FunctionRegistry.res | 151 +++++++++--------- 1 file changed, 73 insertions(+), 78 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index a1138129..31db2269 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -241,38 +241,28 @@ module Registry = { let impossibleError = "Wrong inputs / Logically impossible" module Prepare = { - let twoNumberInputs = (inputs: array) => { + let recordWithTwoArgsToValues = (inputs: array): result, string> => + switch inputs { + | [Record([(_, n1), (_, n2)])] => Ok([n1, n2]) + | _ => Error(impossibleError) + } + + let twoNumberInputs = (inputs: array): result<(float, float), string> => { switch inputs { | [Number(n1), Number(n2)] => Ok(n1, n2) | _ => Error(impossibleError) } } - let twoDistOrNumber = (values: array) => { + let twoDistOrNumber = (values: array): result<(distOrNumber, distOrNumber), string> => { switch values { | [DistOrNumber(a1), DistOrNumber(a2)] => Ok(a1, a2) | _ => Error(impossibleError) } } - let twoNumberInputsRecord = (v1: string, v2: string, inputs: array) => - switch inputs { - | [Record([(name1, n1), (name2, n2)])] if name1 == v1 && name2 == v2 => - twoNumberInputs([n1, n2]) - | _ => Error(impossibleError) - } - - let twoNumberInputsRecord2 = (inputs: array) => - switch inputs { - | [Record([(_, n1), (_, n2)])] => twoNumberInputs([n1, n2]) - | _ => Error(impossibleError) - } - - let twoNumberInputsRecord3 = (inputs: array) => - switch inputs { - | [Record([(_, n1), (_, n2)])] => Ok([n1, n2]) - | _ => Error(impossibleError) - } + let twoDistOrNumberFromRecord = (values: array) => + values->recordWithTwoArgsToValues->E.R.bind(twoDistOrNumber) } module Wrappers = { @@ -281,60 +271,69 @@ module Wrappers = { let symbolicEvDistribution = r => r->Symbolic->evDistribution } -let twoDistsOrNumbers = ( - ~fn: (float, float) => result, - ~values: (distOrNumber, distOrNumber), -) => { - let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000) - let sampleSetToExpressionValue = ( - b: Belt.Result.t, - ) => - switch b { - | Ok(r) => Ok(ReducerInterface_ExpressionValue.EvDistribution(SampleSet(r))) - | Error(d) => Error(DistributionTypes.Error.toString(d)) - } +module Process = { + let twoDistsOrNumbersToDist = ( + ~fn: (float, float) => result, + ~values: (distOrNumber, distOrNumber), + ) => { + let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000) + let sampleSetToExpressionValue = ( + b: Belt.Result.t, + ) => + switch b { + | Ok(r) => Ok(ReducerInterface_ExpressionValue.EvDistribution(SampleSet(r))) + | Error(d) => Error(DistributionTypes.Error.toString(d)) + } - let mapFnResult = r => - switch r { - | Ok(r) => Ok(GenericDist.sample(r)) - | Error(r) => Error(Operation.Other(r)) - } + let mapFnResult = r => + switch r { + | Ok(r) => Ok(GenericDist.sample(r)) + | Error(r) => Error(Operation.Other(r)) + } - let singleVarSample = (a, fn) => { - let sampleSetResult = - toSampleSet(a) |> E.R2.bind(dist => - SampleSetDist.samplesMap( - ~fn=f => fn(f)->mapFnResult, - dist, - )->E.R2.errMap(r => DistributionTypes.SampleSetError(r)) - ) - sampleSetResult->sampleSetToExpressionValue - } - - switch values { - | (Number(a1), Number(a2)) => fn(a1, a2)->E.R2.fmap(Wrappers.evDistribution) - | (Dist(a1), Number(a2)) => singleVarSample(a1, r => fn(r, a2)) - | (Number(a1), Dist(a2)) => singleVarSample(a2, r => fn(a1, r)) - | (Dist(a1), Dist(a2)) => { - let altFn = (a, b) => fn(a, b)->mapFnResult + let singleVarSample = (a, fn) => { let sampleSetResult = - E.R.merge(toSampleSet(a1), toSampleSet(a2)) - ->E.R2.errMap(DistributionTypes.Error.toString) - ->E.R.bind(((t1, t2)) => { - SampleSetDist.map2(~fn=altFn, ~t1, ~t2)->E.R2.errMap(Operation.Error.toString) - }) - ->E.R2.errMap(r => DistributionTypes.OtherError(r)) + toSampleSet(a) |> E.R2.bind(dist => + SampleSetDist.samplesMap( + ~fn=f => fn(f)->mapFnResult, + dist, + )->E.R2.errMap(r => DistributionTypes.SampleSetError(r)) + ) sampleSetResult->sampleSetToExpressionValue } + + switch values { + | (Number(a1), Number(a2)) => fn(a1, a2)->E.R2.fmap(Wrappers.evDistribution) + | (Dist(a1), Number(a2)) => singleVarSample(a1, r => fn(r, a2)) + | (Number(a1), Dist(a2)) => singleVarSample(a2, r => fn(a1, r)) + | (Dist(a1), Dist(a2)) => { + let altFn = (a, b) => fn(a, b)->mapFnResult + let sampleSetResult = + E.R.merge(toSampleSet(a1), toSampleSet(a2)) + ->E.R2.errMap(DistributionTypes.Error.toString) + ->E.R.bind(((t1, t2)) => { + SampleSetDist.map2(~fn=altFn, ~t1, ~t2)->E.R2.errMap(Operation.Error.toString) + }) + ->E.R2.errMap(r => DistributionTypes.OtherError(r)) + sampleSetResult->sampleSetToExpressionValue + } + } + } + + let twoDistsOrNumbersToDistUsingSymbolicDist = ( + ~fn: (float, float) => result, + ~values, + ) => { + twoDistsOrNumbersToDist(~fn=(a, b) => fn(a, b)->E.R2.fmap(Wrappers.symbolic), ~values) } } module NormalFn = { let fnName = "normal" - let twoFloatsToSymoblic = (a1: float, a2: float) => - SymbolicDist.Normal.make(a1, a2)->E.R2.fmap(Wrappers.symbolic) - let twoFloatsToSymbolic90P = (a1: float, a2: float) => - SymbolicDist.Normal.from90PercentCI(a1, a2)->Wrappers.symbolic->Ok + let twoFloatsToSymoblic = (a1, a2) => + SymbolicDist.Normal.make(a1, a2) + let twoFloatsToSymbolic90P = (a1, a2) => + SymbolicDist.Normal.from90PercentCI(a1, a2)->Ok let toFn = Function.make( ~name="Normal", @@ -345,7 +344,7 @@ module NormalFn = { ~run=inputs => { inputs ->Prepare.twoDistOrNumber - ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymoblic, ~values=_)) + ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn=twoFloatsToSymoblic, ~values=_)) }, ), Function.makeDefinition( @@ -353,18 +352,16 @@ module NormalFn = { ~inputs=[I_Record([("mean", I_DistOrNumber), ("stdev", I_DistOrNumber)])], ~run=inputs => inputs - ->Prepare.twoNumberInputsRecord3 - ->E.R.bind(Prepare.twoDistOrNumber) - ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymoblic, ~values=_)), + ->Prepare.twoDistOrNumberFromRecord + ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn=twoFloatsToSymoblic, ~values=_)), ), Function.makeDefinition( ~name=fnName, ~inputs=[I_Record([("p5", I_DistOrNumber), ("p95", I_DistOrNumber)])], ~run=inputs => inputs - ->Prepare.twoNumberInputsRecord3 - ->E.R.bind(Prepare.twoDistOrNumber) - ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymbolic90P, ~values=_)), + ->Prepare.twoDistOrNumberFromRecord + ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn=twoFloatsToSymbolic90P, ~values=_)), ), ], ) @@ -385,25 +382,23 @@ module LognormalFn = { Function.makeDefinition(~name=fnName, ~inputs=[I_DistOrNumber, I_DistOrNumber], ~run=inputs => inputs ->Prepare.twoDistOrNumber - ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymoblic, ~values=_)) + ->E.R.bind(Process.twoDistsOrNumbersToDist(~fn=twoFloatsToSymoblic, ~values=_)) ), Function.makeDefinition( ~name=fnName, ~inputs=[I_Record([("p5", I_DistOrNumber), ("p95", I_DistOrNumber)])], ~run=inputs => inputs - ->Prepare.twoNumberInputsRecord3 - ->E.R.bind(Prepare.twoDistOrNumber) - ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToSymbolic90P, ~values=_)), + ->Prepare.twoDistOrNumberFromRecord + ->E.R.bind(Process.twoDistsOrNumbersToDist(~fn=twoFloatsToSymbolic90P, ~values=_)), ), Function.makeDefinition( ~name=fnName, ~inputs=[I_Record([("mean", I_DistOrNumber), ("stdev", I_DistOrNumber)])], ~run=inputs => inputs - ->Prepare.twoNumberInputsRecord3 - ->E.R.bind(Prepare.twoDistOrNumber) - ->E.R.bind(twoDistsOrNumbers(~fn=twoFloatsToMeanStdev, ~values=_)), + ->Prepare.twoDistOrNumberFromRecord + ->E.R.bind(Process.twoDistsOrNumbersToDist(~fn=twoFloatsToMeanStdev, ~values=_)), ), ], ) From 6b2e509aead084176904966924b8ad445f8daade Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Thu, 19 May 2022 23:35:15 +0200 Subject: [PATCH 169/340] pipes, binary, unary and post operators test --- .../Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 591fc11a..71c39874 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -167,13 +167,17 @@ describe("Peggy parse", () => { describe("pipe", () => { testParse("1 -> add(2)", "{(::add 1 2)}") testParse("-1 -> add(2)", "{(::add (::unaryMinus 1) 2)}") + testParse("-a[1] -> add(2)", "{(::add (::unaryMinus (::$atIndex :a 1)) 2)}") + testParse("-f(1) -> add(2)", "{(::add (::unaryMinus (::f 1)) 2)}") + testParse("1 + 2 -> add(3)", "{(::add 1 (::add 2 3))}") testParse("1 -> add(2) * 3", "{(::multiply (::add 1 2) 3)}") testParse("1 -> subtract(2)", "{(::subtract 1 2)}") testParse("-1 -> subtract(2)", "{(::subtract (::unaryMinus 1) 2)}") testParse("1 -> subtract(2) * 3", "{(::multiply (::subtract 1 2) 3)}") }) - describe("elixir pipe", () => { + describe("elixir pipe", () => { + //handled together with -> so there is no need for seperate tests testParse("1 |> add(2)", "{(::add 1 2)}") }) From c326d0b229175a561c2e9efafb2280f410c5c95b Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 19 May 2022 18:09:37 -0400 Subject: [PATCH 170/340] More cleaning --- .../src/rescript/FunctionRegistry.res | 73 ++++++++----------- 1 file changed, 30 insertions(+), 43 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index 31db2269..10f48f43 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -92,11 +92,11 @@ module FnDefinition = { type definitionMatch = MatchSimple.t let getArgValues = (f: fnDefinition, args: array): option> => { - let inputTypes = f.inputs + let mainInputTypes = f.inputs if E.A.length(f.inputs) !== E.A.length(args) { None } else { - E.A.zip(inputTypes, args) + E.A.zip(mainInputTypes, args) ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) ->E.A.O.openIfAllSome } @@ -273,7 +273,7 @@ module Wrappers = { module Process = { let twoDistsOrNumbersToDist = ( - ~fn: (float, float) => result, + ~fn: ((float, float)) => result, ~values: (distOrNumber, distOrNumber), ) => { let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000) @@ -303,11 +303,11 @@ module Process = { } switch values { - | (Number(a1), Number(a2)) => fn(a1, a2)->E.R2.fmap(Wrappers.evDistribution) - | (Dist(a1), Number(a2)) => singleVarSample(a1, r => fn(r, a2)) - | (Number(a1), Dist(a2)) => singleVarSample(a2, r => fn(a1, r)) + | (Number(a1), Number(a2)) => fn((a1, a2))->E.R2.fmap(Wrappers.evDistribution) + | (Dist(a1), Number(a2)) => singleVarSample(a1, r => fn((r, a2))) + | (Number(a1), Dist(a2)) => singleVarSample(a2, r => fn((a1, r))) | (Dist(a1), Dist(a2)) => { - let altFn = (a, b) => fn(a, b)->mapFnResult + let altFn = (a, b) => fn((a, b))->mapFnResult let sampleSetResult = E.R.merge(toSampleSet(a1), toSampleSet(a2)) ->E.R2.errMap(DistributionTypes.Error.toString) @@ -321,47 +321,41 @@ module Process = { } let twoDistsOrNumbersToDistUsingSymbolicDist = ( - ~fn: (float, float) => result, + ~fn: ((float, float)) => result, ~values, ) => { - twoDistsOrNumbersToDist(~fn=(a, b) => fn(a, b)->E.R2.fmap(Wrappers.symbolic), ~values) + twoDistsOrNumbersToDist(~fn=r => r->fn->E.R2.fmap(Wrappers.symbolic), ~values) } } +let twoArgs = (fn, (a1, a2)) => fn(a1, a2) + +let process = (~fn, r) => + r->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_)) + module NormalFn = { let fnName = "normal" - let twoFloatsToSymoblic = (a1, a2) => - SymbolicDist.Normal.make(a1, a2) - let twoFloatsToSymbolic90P = (a1, a2) => - SymbolicDist.Normal.from90PercentCI(a1, a2)->Ok + let mainInputType = I_DistOrNumber let toFn = Function.make( ~name="Normal", ~definitions=[ + Function.makeDefinition(~name=fnName, ~inputs=[mainInputType, mainInputType], ~run=inputs => { + inputs->Prepare.twoDistOrNumber->process(~fn=twoArgs(SymbolicDist.Normal.make)) + }), Function.makeDefinition( ~name=fnName, - ~inputs=[I_DistOrNumber, I_DistOrNumber], - ~run=inputs => { - inputs - ->Prepare.twoDistOrNumber - ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn=twoFloatsToSymoblic, ~values=_)) - }, + ~inputs=[I_Record([("mean", mainInputType), ("stdev", mainInputType)])], + ~run=inputs => + inputs->Prepare.twoDistOrNumberFromRecord->process(~fn=twoArgs(SymbolicDist.Normal.make)), ), Function.makeDefinition( ~name=fnName, - ~inputs=[I_Record([("mean", I_DistOrNumber), ("stdev", I_DistOrNumber)])], + ~inputs=[I_Record([("p5", mainInputType), ("p95", mainInputType)])], ~run=inputs => inputs ->Prepare.twoDistOrNumberFromRecord - ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn=twoFloatsToSymoblic, ~values=_)), - ), - Function.makeDefinition( - ~name=fnName, - ~inputs=[I_Record([("p5", I_DistOrNumber), ("p95", I_DistOrNumber)])], - ~run=inputs => - inputs - ->Prepare.twoDistOrNumberFromRecord - ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn=twoFloatsToSymbolic90P, ~values=_)), + ->process(~fn=r => twoArgs(SymbolicDist.Normal.from90PercentCI, r)->Ok), ), ], ) @@ -369,36 +363,29 @@ module NormalFn = { module LognormalFn = { let fnName = "lognormal" - let twoFloatsToSymoblic = (a1, a2) => - SymbolicDist.Lognormal.make(a1, a2)->E.R2.fmap(Wrappers.symbolic) - let twoFloatsToSymbolic90P = (a1, a2) => - SymbolicDist.Lognormal.from90PercentCI(a1, a2)->Wrappers.symbolic->Ok - let twoFloatsToMeanStdev = (a1, a2) => - SymbolicDist.Lognormal.fromMeanAndStdev(a1, a2)->E.R2.fmap(Wrappers.symbolic) + let mainInputType = I_DistOrNumber let toFn = Function.make( ~name="Lognormal", ~definitions=[ - Function.makeDefinition(~name=fnName, ~inputs=[I_DistOrNumber, I_DistOrNumber], ~run=inputs => - inputs - ->Prepare.twoDistOrNumber - ->E.R.bind(Process.twoDistsOrNumbersToDist(~fn=twoFloatsToSymoblic, ~values=_)) + Function.makeDefinition(~name=fnName, ~inputs=[mainInputType, mainInputType], ~run=inputs => + inputs->Prepare.twoDistOrNumber->process(~fn=twoArgs(SymbolicDist.Lognormal.make)) ), Function.makeDefinition( ~name=fnName, - ~inputs=[I_Record([("p5", I_DistOrNumber), ("p95", I_DistOrNumber)])], + ~inputs=[I_Record([("p5", mainInputType), ("p95", mainInputType)])], ~run=inputs => inputs ->Prepare.twoDistOrNumberFromRecord - ->E.R.bind(Process.twoDistsOrNumbersToDist(~fn=twoFloatsToSymbolic90P, ~values=_)), + ->process(~fn=r => twoArgs(SymbolicDist.Lognormal.from90PercentCI, r)->Ok), ), Function.makeDefinition( ~name=fnName, - ~inputs=[I_Record([("mean", I_DistOrNumber), ("stdev", I_DistOrNumber)])], + ~inputs=[I_Record([("mean", mainInputType), ("stdev", mainInputType)])], ~run=inputs => inputs ->Prepare.twoDistOrNumberFromRecord - ->E.R.bind(Process.twoDistsOrNumbersToDist(~fn=twoFloatsToMeanStdev, ~values=_)), + ->process(~fn=twoArgs(SymbolicDist.Lognormal.fromMeanAndStdev)), ), ], ) From 0b85b125510720fdf624d2bf77d921bf23433b10 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 19 May 2022 18:17:31 -0400 Subject: [PATCH 171/340] Moved matching functionality to dedicated module --- .../src/rescript/FunctionRegistry.res | 281 ++++++++++-------- 1 file changed, 150 insertions(+), 131 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry.res index 10f48f43..8f69b3d4 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry.res @@ -56,41 +56,162 @@ let rec matchInput = (input: itype, r: expressionValue): option => | _ => None } -module MatchSimple = { - type t = DifferentName | SameNameDifferentArguments | FullMatch +module Matcher = { + module MatchSimple = { + type t = DifferentName | SameNameDifferentArguments | FullMatch - let isFullMatch = (match: t) => - switch match { - | FullMatch => true - | _ => false + let isFullMatch = (match: t) => + switch match { + | FullMatch => true + | _ => false + } + + let isNameMatchOnly = (match: t) => + switch match { + | SameNameDifferentArguments => true + | _ => false + } + } + + module Match = { + type t<'a, 'b> = DifferentName | SameNameDifferentArguments('a) | FullMatch('b) + + let isFullMatch = (match: t<'a, 'b>): bool => + switch match { + | FullMatch(_) => true + | _ => false + } + + let isNameMatchOnly = (match: t<'a, 'b>) => + switch match { + | SameNameDifferentArguments(_) => true + | _ => false + } + } + + module FnDefinition = { + type definitionMatch = MatchSimple.t + + let getArgValues = (f: fnDefinition, args: array): option> => { + let mainInputTypes = f.inputs + if E.A.length(f.inputs) !== E.A.length(args) { + None + } else { + E.A.zip(mainInputTypes, args) + ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) + ->E.A.O.openIfAllSome + } } - let isNameMatchOnly = (match: t) => - switch match { - | SameNameDifferentArguments => true - | _ => false - } -} - -module Match = { - type t<'a, 'b> = DifferentName | SameNameDifferentArguments('a) | FullMatch('b) - - let isFullMatch = (match: t<'a, 'b>): bool => - switch match { - | FullMatch(_) => true - | _ => false + let matchAssumingSameName = (f: fnDefinition, args: array) => { + switch getArgValues(f, args) { + | Some(_) => MatchSimple.FullMatch + | None => MatchSimple.SameNameDifferentArguments + } } - let isNameMatchOnly = (match: t<'a, 'b>) => - switch match { - | SameNameDifferentArguments(_) => true - | _ => false + let match = (f: fnDefinition, fnName: string, args: array) => { + if f.name !== fnName { + MatchSimple.DifferentName + } else { + matchAssumingSameName(f, args) + } } + } + + module Function = { + type definitionId = int + type match = Match.t, definitionId> + + let match = (f: function, fnName: string, args: array): match => { + let matchedDefinition = () => + E.A.getIndexBy(f.definitions, r => + MatchSimple.isFullMatch(FnDefinition.match(r, fnName, args)) + ) |> E.O.fmap(r => Match.FullMatch(r)) + let getMatchedNameOnlyDefinition = () => { + let nameMatchIndexes = + f.definitions + ->E.A2.fmapi((index, r) => + MatchSimple.isNameMatchOnly(FnDefinition.match(r, fnName, args)) ? Some(index) : None + ) + ->E.A.O.concatSomes + switch nameMatchIndexes { + | [] => None + | elements => Some(Match.SameNameDifferentArguments(elements)) + } + } + + E.A.O.firstSomeFnWithDefault( + [matchedDefinition, getMatchedNameOnlyDefinition], + Match.DifferentName, + ) + } + } + + module RegistryMatch = { + type match = { + fnName: string, + inputIndex: int, + } + type t = Match.t, match> + let makeMatch = (fnName: string, inputIndex: int) => {fnName: fnName, inputIndex: inputIndex} + } + + module Registry = { + let findExactMatches = (r: registry, fnName: string, args: array) => { + let functionMatchPairs = r->E.A2.fmap(l => (l, Function.match(l, fnName, args))) + let getFullMatch = E.A.getBy(functionMatchPairs, ((_, match: Function.match)) => + Match.isFullMatch(match) + ) + let fullMatch: option = getFullMatch->E.O.bind(((fn, match)) => + switch match { + | FullMatch(index) => Some(RegistryMatch.makeMatch(fn.name, index)) + | _ => None + } + ) + fullMatch + } + + let findNameMatches = (r: registry, fnName: string, args: array) => { + let functionMatchPairs = r->E.A2.fmap(l => (l, Function.match(l, fnName, args))) + let getNameMatches = + functionMatchPairs + ->E.A2.fmap(((fn, match)) => Match.isNameMatchOnly(match) ? Some((fn, match)) : None) + ->E.A.O.concatSomes + let matches = + getNameMatches + ->E.A2.fmap(((fn, match)) => + switch match { + | SameNameDifferentArguments(indexes) => + indexes->E.A2.fmap(index => RegistryMatch.makeMatch(fn.name, index)) + | _ => [] + } + ) + ->Belt.Array.concatMany + E.A.toNoneIfEmpty(matches) + } + + let findMatches = (r: registry, fnName: string, args: array) => { + switch findExactMatches(r, fnName, args) { + | Some(r) => Match.FullMatch(r) + | None => + switch findNameMatches(r, fnName, args) { + | Some(r) => Match.SameNameDifferentArguments(r) + | None => Match.DifferentName + } + } + } + + let fullMatchToDef = (registry: registry, {fnName, inputIndex}: RegistryMatch.match): option< + fnDefinition, + > => + registry + ->E.A.getBy(fn => fn.name === fnName) + ->E.O.bind(fn => E.A.get(fn.definitions, inputIndex)) + } } module FnDefinition = { - type definitionMatch = MatchSimple.t - let getArgValues = (f: fnDefinition, args: array): option> => { let mainInputTypes = f.inputs if E.A.length(f.inputs) !== E.A.length(args) { @@ -101,22 +222,6 @@ module FnDefinition = { ->E.A.O.openIfAllSome } } - - let matchAssumingSameName = (f: fnDefinition, args: array) => { - switch getArgValues(f, args) { - | Some(_) => MatchSimple.FullMatch - | None => MatchSimple.SameNameDifferentArguments - } - } - - let match = (f: fnDefinition, fnName: string, args: array) => { - if f.name !== fnName { - MatchSimple.DifferentName - } else { - matchAssumingSameName(f, args) - } - } - let run = (f: fnDefinition, args: array) => { let argValues = getArgValues(f, args) switch argValues { @@ -128,8 +233,6 @@ module FnDefinition = { module Function = { type definitionId = int - type match = Match.t, definitionId> - let make = (~name, ~definitions): function => { name: name, definitions: definitions, @@ -140,97 +243,13 @@ module Function = { inputs: inputs, run: run, } - - let match = (f: function, fnName: string, args: array): match => { - let matchedDefinition = () => - E.A.getIndexBy(f.definitions, r => - MatchSimple.isFullMatch(FnDefinition.match(r, fnName, args)) - ) |> E.O.fmap(r => Match.FullMatch(r)) - let getMatchedNameOnlyDefinition = () => { - let nameMatchIndexes = - f.definitions - ->E.A2.fmapi((index, r) => - MatchSimple.isNameMatchOnly(FnDefinition.match(r, fnName, args)) ? Some(index) : None - ) - ->E.A.O.concatSomes - switch nameMatchIndexes { - | [] => None - | elements => Some(Match.SameNameDifferentArguments(elements)) - } - } - - E.A.O.firstSomeFnWithDefault( - [matchedDefinition, getMatchedNameOnlyDefinition], - Match.DifferentName, - ) - } -} - -module RegistryMatch = { - type match = { - fnName: string, - inputIndex: int, - } - type t = Match.t, match> - let makeMatch = (fnName: string, inputIndex: int) => {fnName: fnName, inputIndex: inputIndex} } module Registry = { - let findExactMatches = (r: registry, fnName: string, args: array) => { - let functionMatchPairs = r->E.A2.fmap(l => (l, Function.match(l, fnName, args))) - let getFullMatch = E.A.getBy(functionMatchPairs, ((_, match: Function.match)) => - Match.isFullMatch(match) - ) - let fullMatch: option = getFullMatch->E.O.bind(((fn, match)) => - switch match { - | FullMatch(index) => Some(RegistryMatch.makeMatch(fn.name, index)) - | _ => None - } - ) - fullMatch - } - - let findNameMatches = (r: registry, fnName: string, args: array) => { - let functionMatchPairs = r->E.A2.fmap(l => (l, Function.match(l, fnName, args))) - let getNameMatches = - functionMatchPairs - ->E.A2.fmap(((fn, match)) => Match.isNameMatchOnly(match) ? Some((fn, match)) : None) - ->E.A.O.concatSomes - let matches = - getNameMatches - ->E.A2.fmap(((fn, match)) => - switch match { - | SameNameDifferentArguments(indexes) => - indexes->E.A2.fmap(index => RegistryMatch.makeMatch(fn.name, index)) - | _ => [] - } - ) - ->Belt.Array.concatMany - E.A.toNoneIfEmpty(matches) - } - - let findMatches = (r: registry, fnName: string, args: array) => { - switch findExactMatches(r, fnName, args) { - | Some(r) => Match.FullMatch(r) - | None => - switch findNameMatches(r, fnName, args) { - | Some(r) => Match.SameNameDifferentArguments(r) - | None => Match.DifferentName - } - } - } - - let fullMatchToDef = (registry: registry, {fnName, inputIndex}: RegistryMatch.match): option< - fnDefinition, - > => - registry - ->E.A.getBy(fn => fn.name === fnName) - ->E.O.bind(fn => E.A.get(fn.definitions, inputIndex)) - let matchAndRun = (r: registry, fnName: string, args: array) => { - switch findMatches(r, fnName, args) { - | Match.FullMatch(m) => - fullMatchToDef(r, m)->E.O2.fmap(r => { + switch Matcher.Registry.findMatches(r, fnName, args) { + | Matcher.Match.FullMatch(m) => + Matcher.Registry.fullMatchToDef(r, m)->E.O2.fmap(r => { FnDefinition.run(r, args) }) | _ => None From 2c0dc75403543ad73000d569118f36cc40dca709 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 19 May 2022 18:24:56 -0400 Subject: [PATCH 172/340] Split FunctionRegistry into multiple files --- .../FunctionRegistry_Core.res} | 155 ------------------ .../FunctionRegistry_Helpers.res | 91 ++++++++++ .../FunctionRegistry_Library.res | 67 ++++++++ .../ReducerInterface_GenericDistribution.res | 11 +- 4 files changed, 163 insertions(+), 161 deletions(-) rename packages/squiggle-lang/src/rescript/{FunctionRegistry.res => FunctionRegistry/FunctionRegistry_Core.res} (60%) create mode 100644 packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res create mode 100644 packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res similarity index 60% rename from packages/squiggle-lang/src/rescript/FunctionRegistry.res rename to packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res index 8f69b3d4..1afd9a66 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res @@ -256,158 +256,3 @@ module Registry = { } } } - -let impossibleError = "Wrong inputs / Logically impossible" - -module Prepare = { - let recordWithTwoArgsToValues = (inputs: array): result, string> => - switch inputs { - | [Record([(_, n1), (_, n2)])] => Ok([n1, n2]) - | _ => Error(impossibleError) - } - - let twoNumberInputs = (inputs: array): result<(float, float), string> => { - switch inputs { - | [Number(n1), Number(n2)] => Ok(n1, n2) - | _ => Error(impossibleError) - } - } - - let twoDistOrNumber = (values: array): result<(distOrNumber, distOrNumber), string> => { - switch values { - | [DistOrNumber(a1), DistOrNumber(a2)] => Ok(a1, a2) - | _ => Error(impossibleError) - } - } - - let twoDistOrNumberFromRecord = (values: array) => - values->recordWithTwoArgsToValues->E.R.bind(twoDistOrNumber) -} - -module Wrappers = { - let symbolic = r => DistributionTypes.Symbolic(r) - let evDistribution = r => ReducerInterface_ExpressionValue.EvDistribution(r) - let symbolicEvDistribution = r => r->Symbolic->evDistribution -} - -module Process = { - let twoDistsOrNumbersToDist = ( - ~fn: ((float, float)) => result, - ~values: (distOrNumber, distOrNumber), - ) => { - let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000) - let sampleSetToExpressionValue = ( - b: Belt.Result.t, - ) => - switch b { - | Ok(r) => Ok(ReducerInterface_ExpressionValue.EvDistribution(SampleSet(r))) - | Error(d) => Error(DistributionTypes.Error.toString(d)) - } - - let mapFnResult = r => - switch r { - | Ok(r) => Ok(GenericDist.sample(r)) - | Error(r) => Error(Operation.Other(r)) - } - - let singleVarSample = (a, fn) => { - let sampleSetResult = - toSampleSet(a) |> E.R2.bind(dist => - SampleSetDist.samplesMap( - ~fn=f => fn(f)->mapFnResult, - dist, - )->E.R2.errMap(r => DistributionTypes.SampleSetError(r)) - ) - sampleSetResult->sampleSetToExpressionValue - } - - switch values { - | (Number(a1), Number(a2)) => fn((a1, a2))->E.R2.fmap(Wrappers.evDistribution) - | (Dist(a1), Number(a2)) => singleVarSample(a1, r => fn((r, a2))) - | (Number(a1), Dist(a2)) => singleVarSample(a2, r => fn((a1, r))) - | (Dist(a1), Dist(a2)) => { - let altFn = (a, b) => fn((a, b))->mapFnResult - let sampleSetResult = - E.R.merge(toSampleSet(a1), toSampleSet(a2)) - ->E.R2.errMap(DistributionTypes.Error.toString) - ->E.R.bind(((t1, t2)) => { - SampleSetDist.map2(~fn=altFn, ~t1, ~t2)->E.R2.errMap(Operation.Error.toString) - }) - ->E.R2.errMap(r => DistributionTypes.OtherError(r)) - sampleSetResult->sampleSetToExpressionValue - } - } - } - - let twoDistsOrNumbersToDistUsingSymbolicDist = ( - ~fn: ((float, float)) => result, - ~values, - ) => { - twoDistsOrNumbersToDist(~fn=r => r->fn->E.R2.fmap(Wrappers.symbolic), ~values) - } -} - -let twoArgs = (fn, (a1, a2)) => fn(a1, a2) - -let process = (~fn, r) => - r->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_)) - -module NormalFn = { - let fnName = "normal" - let mainInputType = I_DistOrNumber - - let toFn = Function.make( - ~name="Normal", - ~definitions=[ - Function.makeDefinition(~name=fnName, ~inputs=[mainInputType, mainInputType], ~run=inputs => { - inputs->Prepare.twoDistOrNumber->process(~fn=twoArgs(SymbolicDist.Normal.make)) - }), - Function.makeDefinition( - ~name=fnName, - ~inputs=[I_Record([("mean", mainInputType), ("stdev", mainInputType)])], - ~run=inputs => - inputs->Prepare.twoDistOrNumberFromRecord->process(~fn=twoArgs(SymbolicDist.Normal.make)), - ), - Function.makeDefinition( - ~name=fnName, - ~inputs=[I_Record([("p5", mainInputType), ("p95", mainInputType)])], - ~run=inputs => - inputs - ->Prepare.twoDistOrNumberFromRecord - ->process(~fn=r => twoArgs(SymbolicDist.Normal.from90PercentCI, r)->Ok), - ), - ], - ) -} - -module LognormalFn = { - let fnName = "lognormal" - let mainInputType = I_DistOrNumber - - let toFn = Function.make( - ~name="Lognormal", - ~definitions=[ - Function.makeDefinition(~name=fnName, ~inputs=[mainInputType, mainInputType], ~run=inputs => - inputs->Prepare.twoDistOrNumber->process(~fn=twoArgs(SymbolicDist.Lognormal.make)) - ), - Function.makeDefinition( - ~name=fnName, - ~inputs=[I_Record([("p5", mainInputType), ("p95", mainInputType)])], - ~run=inputs => - inputs - ->Prepare.twoDistOrNumberFromRecord - ->process(~fn=r => twoArgs(SymbolicDist.Lognormal.from90PercentCI, r)->Ok), - ), - Function.makeDefinition( - ~name=fnName, - ~inputs=[I_Record([("mean", mainInputType), ("stdev", mainInputType)])], - ~run=inputs => - inputs - ->Prepare.twoDistOrNumberFromRecord - ->process(~fn=twoArgs(SymbolicDist.Lognormal.fromMeanAndStdev)), - ), - ], - ) -} - -let allFunctions = [NormalFn.toFn, LognormalFn.toFn] diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res new file mode 100644 index 00000000..487fa811 --- /dev/null +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -0,0 +1,91 @@ +open FunctionRegistry_Core + +let impossibleError = "Wrong inputs / Logically impossible" + +module Wrappers = { + let symbolic = r => DistributionTypes.Symbolic(r) + let evDistribution = r => ReducerInterface_ExpressionValue.EvDistribution(r) + let symbolicEvDistribution = r => r->Symbolic->evDistribution +} + +module Prepare = { + let recordWithTwoArgsToValues = (inputs: array): result, string> => + switch inputs { + | [Record([(_, n1), (_, n2)])] => Ok([n1, n2]) + | _ => Error(impossibleError) + } + + let twoNumberInputs = (inputs: array): result<(float, float), string> => { + switch inputs { + | [Number(n1), Number(n2)] => Ok(n1, n2) + | _ => Error(impossibleError) + } + } + + let twoDistOrNumber = (values: array): result<(distOrNumber, distOrNumber), string> => { + switch values { + | [DistOrNumber(a1), DistOrNumber(a2)] => Ok(a1, a2) + | _ => Error(impossibleError) + } + } + + let twoDistOrNumberFromRecord = (values: array) => + values->recordWithTwoArgsToValues->E.R.bind(twoDistOrNumber) +} + +module Process = { + let twoDistsOrNumbersToDist = ( + ~fn: ((float, float)) => result, + ~values: (distOrNumber, distOrNumber), + ) => { + let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000) + let sampleSetToExpressionValue = ( + b: Belt.Result.t, + ) => + switch b { + | Ok(r) => Ok(ReducerInterface_ExpressionValue.EvDistribution(SampleSet(r))) + | Error(d) => Error(DistributionTypes.Error.toString(d)) + } + + let mapFnResult = r => + switch r { + | Ok(r) => Ok(GenericDist.sample(r)) + | Error(r) => Error(Operation.Other(r)) + } + + let singleVarSample = (a, fn) => { + let sampleSetResult = + toSampleSet(a) |> E.R2.bind(dist => + SampleSetDist.samplesMap( + ~fn=f => fn(f)->mapFnResult, + dist, + )->E.R2.errMap(r => DistributionTypes.SampleSetError(r)) + ) + sampleSetResult->sampleSetToExpressionValue + } + + switch values { + | (Number(a1), Number(a2)) => fn((a1, a2))->E.R2.fmap(Wrappers.evDistribution) + | (Dist(a1), Number(a2)) => singleVarSample(a1, r => fn((r, a2))) + | (Number(a1), Dist(a2)) => singleVarSample(a2, r => fn((a1, r))) + | (Dist(a1), Dist(a2)) => { + let altFn = (a, b) => fn((a, b))->mapFnResult + let sampleSetResult = + E.R.merge(toSampleSet(a1), toSampleSet(a2)) + ->E.R2.errMap(DistributionTypes.Error.toString) + ->E.R.bind(((t1, t2)) => { + SampleSetDist.map2(~fn=altFn, ~t1, ~t2)->E.R2.errMap(Operation.Error.toString) + }) + ->E.R2.errMap(r => DistributionTypes.OtherError(r)) + sampleSetResult->sampleSetToExpressionValue + } + } + } + + let twoDistsOrNumbersToDistUsingSymbolicDist = ( + ~fn: ((float, float)) => result, + ~values, + ) => { + twoDistsOrNumbersToDist(~fn=r => r->fn->E.R2.fmap(Wrappers.symbolic), ~values) + } +} \ No newline at end of file diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res new file mode 100644 index 00000000..f0ac6b9a --- /dev/null +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -0,0 +1,67 @@ +open FunctionRegistry_Core +open FunctionRegistry_Helpers + +let twoArgs = (fn, (a1, a2)) => fn(a1, a2) + +let process = (~fn, r) => + r->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_)) + +module NormalFn = { + let fnName = "normal" + let mainInputType = I_DistOrNumber + + let toFn = Function.make( + ~name="Normal", + ~definitions=[ + Function.makeDefinition(~name=fnName, ~inputs=[mainInputType, mainInputType], ~run=inputs => { + inputs->Prepare.twoDistOrNumber->process(~fn=twoArgs(SymbolicDist.Normal.make)) + }), + Function.makeDefinition( + ~name=fnName, + ~inputs=[I_Record([("mean", mainInputType), ("stdev", mainInputType)])], + ~run=inputs => + inputs->Prepare.twoDistOrNumberFromRecord->process(~fn=twoArgs(SymbolicDist.Normal.make)), + ), + Function.makeDefinition( + ~name=fnName, + ~inputs=[I_Record([("p5", mainInputType), ("p95", mainInputType)])], + ~run=inputs => + inputs + ->Prepare.twoDistOrNumberFromRecord + ->process(~fn=r => twoArgs(SymbolicDist.Normal.from90PercentCI, r)->Ok), + ), + ], + ) +} + +module LognormalFn = { + let fnName = "lognormal" + let mainInputType = I_DistOrNumber + + let toFn = Function.make( + ~name="Lognormal", + ~definitions=[ + Function.makeDefinition(~name=fnName, ~inputs=[mainInputType, mainInputType], ~run=inputs => + inputs->Prepare.twoDistOrNumber->process(~fn=twoArgs(SymbolicDist.Lognormal.make)) + ), + Function.makeDefinition( + ~name=fnName, + ~inputs=[I_Record([("p5", mainInputType), ("p95", mainInputType)])], + ~run=inputs => + inputs + ->Prepare.twoDistOrNumberFromRecord + ->process(~fn=r => twoArgs(SymbolicDist.Lognormal.from90PercentCI, r)->Ok), + ), + Function.makeDefinition( + ~name=fnName, + ~inputs=[I_Record([("mean", mainInputType), ("stdev", mainInputType)])], + ~run=inputs => + inputs + ->Prepare.twoDistOrNumberFromRecord + ->process(~fn=twoArgs(SymbolicDist.Lognormal.fromMeanAndStdev)), + ), + ], + ) +} + +let allFunctions = [NormalFn.toFn, LognormalFn.toFn] diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 2167d9f2..0beb236e 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -387,13 +387,12 @@ let genericOutputToReducerValue = (o: DistributionOperation.outputType): result< | GenDistError(err) => Error(REDistributionError(err)) } -let registered = FunctionRegistry.allFunctions +let registered = FunctionRegistry_Library.allFunctions -let tryRegistry = (call: ExpressionValue.functionCall) => { - let (fnName, args) = call - let response = FunctionRegistry.Registry.matchAndRun(registered, fnName, args) - let foo = response->E.O2.fmap(r => r->E.R2.errMap(s => Reducer_ErrorValue.RETodo(s))) - foo +let tryRegistry = ((fnName, args): ExpressionValue.functionCall) => { + FunctionRegistry_Core.Registry.matchAndRun(registered, fnName, args)->E.O2.fmap( + E.R2.errMap(_, s => Reducer_ErrorValue.RETodo(s)), + ) } let dispatch = (call: ExpressionValue.functionCall, environment) => { From c1f269e9a4d9463a882b4db34c33d3f0a166ad27 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Fri, 20 May 2022 00:29:04 +0200 Subject: [PATCH 173/340] fixed logical operator priority --- .../Reducer_Peggy_Parse_test.res | 37 ++++++++++--------- .../Reducer_Peggy_GeneratedParser.js | 8 ++-- .../Reducer_Peggy_GeneratedParser.peggy | 4 +- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 71c39874..347322d3 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -135,32 +135,33 @@ describe("Peggy parse", () => { describe("logical", () => { testParse("true || false", "{(::or true false)}") testParse("true && false", "{(::and true false)}") - testParse("a && b || c", "{(::and :a (::or :b :c))}") - testParse("a && b || c && d", "{(::and (::and :a (::or :b :c)) :d)}") - testParse("a && !b || c", "{(::and :a (::or (::not :b) :c))}") - testParse("a && b==c || d", "{(::and :a (::or (::equal :b :c) :d))}") - testParse("a && b!=c || d", "{(::and :a (::or (::unequal :b :c) :d))}") - testParse("a && !(b==c) || d", "{(::and :a (::or (::not (::equal :b :c)) :d))}") - testParse("a && b>=c || d", "{(::and :a (::or (::largerEq :b :c) :d))}") - testParse("a && !(b>=c) || d", "{(::and :a (::or (::not (::largerEq :b :c)) :d))}") - testParse("a && b<=c || d", "{(::and :a (::or (::smallerEq :b :c) :d))}") - testParse("a && b>c || d", "{(::and :a (::or (::larger :b :c) :d))}") - testParse("a && b=c || d", "{(::or (::and :a (::largerEq :b :c)) :d)}") + testParse("a && !(b>=c) || d", "{(::or (::and :a (::not (::largerEq :b :c))) :d)}") + testParse("a && b<=c || d", "{(::or (::and :a (::smallerEq :b :c)) :d)}") + testParse("a && b>c || d", "{(::or (::and :a (::larger :b :c)) :d)}") + testParse("a && b Date: Fri, 20 May 2022 15:18:27 +0200 Subject: [PATCH 174/340] floats in scientific notation and optional leading zero --- .../Reducer_Peggy_Parse_test.res | 11 + .../Reducer_Peggy_GeneratedParser.js | 406 ++++++++++++------ .../Reducer_Peggy_GeneratedParser.peggy | 7 +- 3 files changed, 291 insertions(+), 133 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 347322d3..4d4c56e6 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -23,6 +23,17 @@ module MyOnly = { } describe("Peggy parse", () => { + describe("float", () => { + testParse("1.", "{1}") + testParse("1.1", "{1.1}") + testParse(".1", "{0.1}") + testParse("0.1", "{0.1}") + testParse("1e1", "{10}") + testParse("1e-1", "{0.1}") + testParse(".1e1", "{1}") + testParse("0.1e1", "{1}") + }) + describe("literals operators parenthesis", () => { // Note that there is always an outer block. Otherwise, external bindings are ignrored at the first statement testParse("1", "{1}") diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index bbf2fddb..0a01b5fd 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -285,8 +285,8 @@ function peg$parse(input, options) { var peg$r1 = /^[_a-z0-9]/i; var peg$r2 = /^[^']/; var peg$r3 = /^[^"]/; - var peg$r4 = /^[0-9]/; - var peg$r5 = /^[.]/; + var peg$r4 = /^[e]/i; + var peg$r5 = /^[0-9]/; var peg$r6 = /^[^\r\n]/; var peg$r7 = /^[^*]/; var peg$r8 = /^[ \t]/; @@ -337,9 +337,9 @@ function peg$parse(input, options) { var peg$e42 = peg$literalExpectation("\"", false); var peg$e43 = peg$classExpectation(["\""], true, false); var peg$e44 = peg$otherExpectation("integer"); - var peg$e45 = peg$classExpectation([["0", "9"]], false, false); - var peg$e46 = peg$classExpectation(["."], false, false); - var peg$e47 = peg$otherExpectation("float"); + var peg$e45 = peg$classExpectation(["e"], false, true); + var peg$e46 = peg$otherExpectation("float"); + var peg$e47 = peg$classExpectation([["0", "9"]], false, false); var peg$e48 = peg$otherExpectation("boolean"); var peg$e49 = peg$literalExpectation("true", false); var peg$e50 = peg$literalExpectation("false", false); @@ -399,7 +399,7 @@ function peg$parse(input, options) { var peg$f23 = function(expression) {return expression}; var peg$f24 = function(identifier) {return nodeIdentifier(text())}; var peg$f25 = function(characters) {return nodeString(characters.join(''))}; - var peg$f26 = function(digits) { return nodeInteger(parseInt(text()))}; + var peg$f26 = function() { return nodeInteger(parseInt(text()))}; var peg$f27 = function() { return nodeFloat(parseFloat(text()))}; var peg$f28 = function() { return nodeBoolean(text() === 'true')}; var peg$f29 = function(args, statements, finalExpression) { statements.push(finalExpression) @@ -570,7 +570,7 @@ function peg$parse(input, options) { function peg$parsestart() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 56 + 0; + var key = peg$currPos * 58 + 0; var cached = peg$resultsCache[key]; if (cached) { @@ -603,7 +603,7 @@ function peg$parse(input, options) { function peg$parsezeroOMoreArgumentsBlockOrExpression() { var s0; - var key = peg$currPos * 56 + 1; + var key = peg$currPos * 58 + 1; var cached = peg$resultsCache[key]; if (cached) { @@ -625,7 +625,7 @@ function peg$parse(input, options) { function peg$parseouterBlock() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 56 + 2; + var key = peg$currPos * 58 + 2; var cached = peg$resultsCache[key]; if (cached) { @@ -678,7 +678,7 @@ function peg$parse(input, options) { function peg$parseinnerBlockOrExpression() { var s0, s1; - var key = peg$currPos * 56 + 3; + var key = peg$currPos * 58 + 3; var cached = peg$resultsCache[key]; if (cached) { @@ -706,7 +706,7 @@ function peg$parse(input, options) { function peg$parsequotedInnerBlock() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 56 + 4; + var key = peg$currPos * 58 + 4; var cached = peg$resultsCache[key]; if (cached) { @@ -815,7 +815,7 @@ function peg$parse(input, options) { function peg$parsearray_statements() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 56 + 5; + var key = peg$currPos * 58 + 5; var cached = peg$resultsCache[key]; if (cached) { @@ -870,7 +870,7 @@ function peg$parse(input, options) { function peg$parsestatement() { var s0; - var key = peg$currPos * 56 + 6; + var key = peg$currPos * 58 + 6; var cached = peg$resultsCache[key]; if (cached) { @@ -892,7 +892,7 @@ function peg$parse(input, options) { function peg$parseletStatement() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 56 + 7; + var key = peg$currPos * 58 + 7; var cached = peg$resultsCache[key]; if (cached) { @@ -939,7 +939,7 @@ function peg$parse(input, options) { function peg$parsedefunStatement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 56 + 8; + var key = peg$currPos * 58 + 8; var cached = peg$resultsCache[key]; if (cached) { @@ -1018,7 +1018,7 @@ function peg$parse(input, options) { function peg$parsearray_parameters() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 9; + var key = peg$currPos * 58 + 9; var cached = peg$resultsCache[key]; if (cached) { @@ -1093,7 +1093,7 @@ function peg$parse(input, options) { function peg$parseexpression() { var s0; - var key = peg$currPos * 56 + 10; + var key = peg$currPos * 58 + 10; var cached = peg$resultsCache[key]; if (cached) { @@ -1118,7 +1118,7 @@ function peg$parse(input, options) { function peg$parseifthenelse() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11; - var key = peg$currPos * 56 + 11; + var key = peg$currPos * 58 + 11; var cached = peg$resultsCache[key]; if (cached) { @@ -1226,7 +1226,7 @@ function peg$parse(input, options) { function peg$parseternary() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 56 + 12; + var key = peg$currPos * 58 + 12; var cached = peg$resultsCache[key]; if (cached) { @@ -1296,7 +1296,7 @@ function peg$parse(input, options) { function peg$parselogicalAdditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 13; + var key = peg$currPos * 58 + 13; var cached = peg$resultsCache[key]; if (cached) { @@ -1373,7 +1373,7 @@ function peg$parse(input, options) { function peg$parselogicalMultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 14; + var key = peg$currPos * 58 + 14; var cached = peg$resultsCache[key]; if (cached) { @@ -1450,7 +1450,7 @@ function peg$parse(input, options) { function peg$parseequality() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 56 + 15; + var key = peg$currPos * 58 + 15; var cached = peg$resultsCache[key]; if (cached) { @@ -1509,7 +1509,7 @@ function peg$parse(input, options) { function peg$parserelational() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 56 + 16; + var key = peg$currPos * 58 + 16; var cached = peg$resultsCache[key]; if (cached) { @@ -1586,7 +1586,7 @@ function peg$parse(input, options) { function peg$parseadditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 17; + var key = peg$currPos * 58 + 17; var cached = peg$resultsCache[key]; if (cached) { @@ -1717,7 +1717,7 @@ function peg$parse(input, options) { function peg$parsemultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 18; + var key = peg$currPos * 58 + 18; var cached = peg$resultsCache[key]; if (cached) { @@ -1848,7 +1848,7 @@ function peg$parse(input, options) { function peg$parsepower() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 19; + var key = peg$currPos * 58 + 19; var cached = peg$resultsCache[key]; if (cached) { @@ -1943,7 +1943,7 @@ function peg$parse(input, options) { function peg$parsecredibleInterval() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 20; + var key = peg$currPos * 58 + 20; var cached = peg$resultsCache[key]; if (cached) { @@ -2040,7 +2040,7 @@ function peg$parse(input, options) { function peg$parsechainFunctionCall() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 21; + var key = peg$currPos * 58 + 21; var cached = peg$resultsCache[key]; if (cached) { @@ -2135,7 +2135,7 @@ function peg$parse(input, options) { function peg$parsechainedFunction() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 56 + 22; + var key = peg$currPos * 58 + 22; var cached = peg$resultsCache[key]; if (cached) { @@ -2239,7 +2239,7 @@ function peg$parse(input, options) { function peg$parseunary() { var s0, s1, s2, s3; - var key = peg$currPos * 56 + 23; + var key = peg$currPos * 58 + 23; var cached = peg$resultsCache[key]; if (cached) { @@ -2279,7 +2279,7 @@ function peg$parse(input, options) { function peg$parseunaryOperator() { var s0; - var key = peg$currPos * 56 + 24; + var key = peg$currPos * 58 + 24; var cached = peg$resultsCache[key]; if (cached) { @@ -2322,7 +2322,7 @@ function peg$parse(input, options) { function peg$parseindexedValue() { var s0; - var key = peg$currPos * 56 + 25; + var key = peg$currPos * 58 + 25; var cached = peg$resultsCache[key]; if (cached) { @@ -2344,7 +2344,7 @@ function peg$parse(input, options) { function peg$parsecollectionElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 56 + 26; + var key = peg$currPos * 58 + 26; var cached = peg$resultsCache[key]; if (cached) { @@ -2553,7 +2553,7 @@ function peg$parse(input, options) { function peg$parsearray_functionArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 27; + var key = peg$currPos * 58 + 27; var cached = peg$resultsCache[key]; if (cached) { @@ -2628,7 +2628,7 @@ function peg$parse(input, options) { function peg$parsemaybeRecordElement() { var s0; - var key = peg$currPos * 56 + 28; + var key = peg$currPos * 58 + 28; var cached = peg$resultsCache[key]; if (cached) { @@ -2650,7 +2650,7 @@ function peg$parse(input, options) { function peg$parserecordElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 56 + 29; + var key = peg$currPos * 58 + 29; var cached = peg$resultsCache[key]; if (cached) { @@ -2760,7 +2760,7 @@ function peg$parse(input, options) { function peg$parseatom() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 56 + 30; + var key = peg$currPos * 58 + 30; var cached = peg$resultsCache[key]; if (cached) { @@ -2816,7 +2816,7 @@ function peg$parse(input, options) { function peg$parsebasicValue() { var s0; - var key = peg$currPos * 56 + 31; + var key = peg$currPos * 58 + 31; var cached = peg$resultsCache[key]; if (cached) { @@ -2838,7 +2838,7 @@ function peg$parse(input, options) { function peg$parsebasicLiteral() { var s0; - var key = peg$currPos * 56 + 32; + var key = peg$currPos * 58 + 32; var cached = peg$resultsCache[key]; if (cached) { @@ -2869,7 +2869,7 @@ function peg$parse(input, options) { function peg$parseidentifier() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 56 + 33; + var key = peg$currPos * 58 + 33; var cached = peg$resultsCache[key]; if (cached) { @@ -2947,7 +2947,7 @@ function peg$parse(input, options) { function peg$parsestring() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 56 + 34; + var key = peg$currPos * 58 + 34; var cached = peg$resultsCache[key]; if (cached) { @@ -3071,9 +3071,9 @@ function peg$parse(input, options) { } function peg$parseinteger() { - var s0, s1, s2, s3; + var s0, s1, s2, s3, s4; - var key = peg$currPos * 56 + 35; + var key = peg$currPos * 58 + 35; var cached = peg$resultsCache[key]; if (cached) { @@ -3085,23 +3085,11 @@ function peg$parse(input, options) { peg$silentFails++; s0 = peg$currPos; s1 = []; - if (peg$r4.test(input.charAt(peg$currPos))) { - s2 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } - } + s2 = peg$parsed(); if (s2 !== peg$FAILED) { while (s2 !== peg$FAILED) { s1.push(s2); - if (peg$r4.test(input.charAt(peg$currPos))) { - s2 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } - } + s2 = peg$parsed(); } } else { s1 = peg$FAILED; @@ -3109,12 +3097,12 @@ function peg$parse(input, options) { if (s1 !== peg$FAILED) { s2 = peg$currPos; peg$silentFails++; - if (peg$r5.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); + if (input.charCodeAt(peg$currPos) === 46) { + s3 = peg$c35; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } + if (peg$silentFails === 0) { peg$fail(peg$e35); } } peg$silentFails--; if (s3 === peg$FAILED) { @@ -3124,8 +3112,29 @@ function peg$parse(input, options) { s2 = peg$FAILED; } if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f26(s1); + s3 = peg$currPos; + peg$silentFails++; + if (peg$r4.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e45); } + } + peg$silentFails--; + if (s4 === peg$FAILED) { + s3 = undefined; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f26(); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3146,9 +3155,9 @@ function peg$parse(input, options) { } function peg$parsefloat() { - var s0, s1, s2, s3, s4, s5; + var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 36; + var key = peg$currPos * 58 + 36; var cached = peg$resultsCache[key]; if (cached) { @@ -3160,64 +3169,116 @@ function peg$parse(input, options) { peg$silentFails++; s0 = peg$currPos; s1 = peg$currPos; - s2 = []; - if (peg$r4.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } - } - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - if (peg$r4.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } - } + s2 = peg$currPos; + s3 = peg$currPos; + s4 = []; + s5 = peg$parsed(); + if (s5 !== peg$FAILED) { + while (s5 !== peg$FAILED) { + s4.push(s5); + s5 = peg$parsed(); } } else { - s2 = peg$FAILED; + s4 = peg$FAILED; } - if (s2 !== peg$FAILED) { - if (peg$r5.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); + if (s4 !== peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 46) { + s5 = peg$c35; peg$currPos++; } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e35); } } - if (s3 !== peg$FAILED) { - s4 = []; - if (peg$r4.test(input.charAt(peg$currPos))) { - s5 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } + if (s5 !== peg$FAILED) { + s6 = []; + s7 = peg$parsed(); + while (s7 !== peg$FAILED) { + s6.push(s7); + s7 = peg$parsed(); } - while (s5 !== peg$FAILED) { - s4.push(s5); - if (peg$r4.test(input.charAt(peg$currPos))) { - s5 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } - } - } - s2 = [s2, s3, s4]; - s1 = s2; + s4 = [s4, s5, s6]; + s3 = s4; } else { - peg$currPos = s1; - s1 = peg$FAILED; + peg$currPos = s3; + s3 = peg$FAILED; } } else { - peg$currPos = s1; - s1 = peg$FAILED; + peg$currPos = s3; + s3 = peg$FAILED; + } + if (s3 === peg$FAILED) { + s3 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 46) { + s4 = peg$c35; + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e35); } + } + if (s4 !== peg$FAILED) { + s5 = []; + s6 = peg$parsed(); + if (s6 !== peg$FAILED) { + while (s6 !== peg$FAILED) { + s5.push(s6); + s6 = peg$parsed(); + } + } else { + s5 = peg$FAILED; + } + if (s5 !== peg$FAILED) { + s4 = [s4, s5]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + if (s3 !== peg$FAILED) { + s4 = peg$parsefloatExponent(); + if (s4 === peg$FAILED) { + s4 = null; + } + s3 = [s3, s4]; + s2 = s3; + } else { + peg$currPos = s2; + s2 = peg$FAILED; + } + if (s2 === peg$FAILED) { + s2 = peg$currPos; + s3 = []; + s4 = peg$parsed(); + if (s4 !== peg$FAILED) { + while (s4 !== peg$FAILED) { + s3.push(s4); + s4 = peg$parsed(); + } + } else { + s3 = peg$FAILED; + } + if (s3 !== peg$FAILED) { + s4 = peg$parsefloatExponent(); + if (s4 !== peg$FAILED) { + s3 = [s3, s4]; + s2 = s3; + } else { + peg$currPos = s2; + s2 = peg$FAILED; + } + } else { + peg$currPos = s2; + s2 = peg$FAILED; + } + } + if (s2 !== peg$FAILED) { + s1 = input.substring(s1, peg$currPos); + } else { + s1 = s2; } if (s1 !== peg$FAILED) { peg$savedPos = s0; @@ -3227,6 +3288,89 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e46); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsefloatExponent() { + var s0, s1, s2, s3, s4; + + var key = peg$currPos * 58 + 37; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + if (peg$r4.test(input.charAt(peg$currPos))) { + s1 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e45); } + } + if (s1 !== peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 45) { + s2 = peg$c20; + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e20); } + } + if (s2 === peg$FAILED) { + s2 = null; + } + s3 = []; + s4 = peg$parsed(); + if (s4 !== peg$FAILED) { + while (s4 !== peg$FAILED) { + s3.push(s4); + s4 = peg$parsed(); + } + } else { + s3 = peg$FAILED; + } + if (s3 !== peg$FAILED) { + s1 = [s1, s2, s3]; + s0 = s1; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + + function peg$parsed() { + var s0; + + var key = peg$currPos * 58 + 38; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + if (peg$r5.test(input.charAt(peg$currPos))) { + s0 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s0 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$e47); } } @@ -3238,7 +3382,7 @@ function peg$parse(input, options) { function peg$parseboolean() { var s0, s1; - var key = peg$currPos * 56 + 37; + var key = peg$currPos * 58 + 39; var cached = peg$resultsCache[key]; if (cached) { @@ -3284,7 +3428,7 @@ function peg$parse(input, options) { function peg$parsevalueConstructor() { var s0; - var key = peg$currPos * 56 + 38; + var key = peg$currPos * 58 + 40; var cached = peg$resultsCache[key]; if (cached) { @@ -3312,7 +3456,7 @@ function peg$parse(input, options) { function peg$parselambda() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12; - var key = peg$currPos * 56 + 39; + var key = peg$currPos * 58 + 41; var cached = peg$resultsCache[key]; if (cached) { @@ -3487,7 +3631,7 @@ function peg$parse(input, options) { function peg$parsearrayConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 56 + 40; + var key = peg$currPos * 58 + 42; var cached = peg$resultsCache[key]; if (cached) { @@ -3576,7 +3720,7 @@ function peg$parse(input, options) { function peg$parsearray_elements() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 41; + var key = peg$currPos * 58 + 43; var cached = peg$resultsCache[key]; if (cached) { @@ -3651,7 +3795,7 @@ function peg$parse(input, options) { function peg$parserecordConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 56 + 42; + var key = peg$currPos * 58 + 44; var cached = peg$resultsCache[key]; if (cached) { @@ -3710,7 +3854,7 @@ function peg$parse(input, options) { function peg$parsearray_recordArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 56 + 43; + var key = peg$currPos * 58 + 45; var cached = peg$resultsCache[key]; if (cached) { @@ -3785,7 +3929,7 @@ function peg$parse(input, options) { function peg$parsekeyValuePair() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 56 + 44; + var key = peg$currPos * 58 + 46; var cached = peg$resultsCache[key]; if (cached) { @@ -3832,7 +3976,7 @@ function peg$parse(input, options) { function peg$parse_() { var s0, s1; - var key = peg$currPos * 56 + 45; + var key = peg$currPos * 58 + 47; var cached = peg$resultsCache[key]; if (cached) { @@ -3860,7 +4004,7 @@ function peg$parse(input, options) { function peg$parse_nl() { var s0, s1; - var key = peg$currPos * 56 + 46; + var key = peg$currPos * 58 + 48; var cached = peg$resultsCache[key]; if (cached) { @@ -3894,7 +4038,7 @@ function peg$parse(input, options) { function peg$parse__() { var s0, s1; - var key = peg$currPos * 56 + 47; + var key = peg$currPos * 58 + 49; var cached = peg$resultsCache[key]; if (cached) { @@ -3928,7 +4072,7 @@ function peg$parse(input, options) { function peg$parse__nl() { var s0, s1; - var key = peg$currPos * 56 + 48; + var key = peg$currPos * 58 + 50; var cached = peg$resultsCache[key]; if (cached) { @@ -3968,7 +4112,7 @@ function peg$parse(input, options) { function peg$parsestatementSeparator() { var s0, s1, s2, s3; - var key = peg$currPos * 56 + 49; + var key = peg$currPos * 58 + 51; var cached = peg$resultsCache[key]; if (cached) { @@ -4030,7 +4174,7 @@ function peg$parse(input, options) { function peg$parsecommentOrNewLine() { var s0, s1, s2; - var key = peg$currPos * 56 + 50; + var key = peg$currPos * 58 + 52; var cached = peg$resultsCache[key]; if (cached) { @@ -4061,7 +4205,7 @@ function peg$parse(input, options) { function peg$parsefinalComment() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 56 + 51; + var key = peg$currPos * 58 + 53; var cached = peg$resultsCache[key]; if (cached) { @@ -4127,7 +4271,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharactersOrComment() { var s0; - var key = peg$currPos * 56 + 52; + var key = peg$currPos * 58 + 54; var cached = peg$resultsCache[key]; if (cached) { @@ -4149,7 +4293,7 @@ function peg$parse(input, options) { function peg$parsedelimitedComment() { var s0, s1, s2, s3; - var key = peg$currPos * 56 + 53; + var key = peg$currPos * 58 + 55; var cached = peg$resultsCache[key]; if (cached) { @@ -4217,7 +4361,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharacters() { var s0; - var key = peg$currPos * 56 + 54; + var key = peg$currPos * 58 + 56; var cached = peg$resultsCache[key]; if (cached) { @@ -4242,7 +4386,7 @@ function peg$parse(input, options) { function peg$parsenewLine() { var s0, s1; - var key = peg$currPos * 56 + 55; + var key = peg$currPos * 58 + 57; var cached = peg$resultsCache[key]; if (cached) { diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy index e0f5c351..5cb6245e 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy @@ -246,13 +246,16 @@ string 'string' / characters:('"' @([^"])* '"') {return nodeString(characters.join(''))} integer 'integer' - = digits:[0-9]+![.] + = d+ !"\." ![e]i { return nodeInteger(parseInt(text()))} float 'float' - = ([0-9]+[.][0-9]*) + = $(((d+ "\." d*) / ("\." d+)) floatExponent? / d+ floatExponent) { return nodeFloat(parseFloat(text()))} + floatExponent = [e]i '-'? d+ + d = [0-9] + boolean 'boolean' = ('true'/'false') { return nodeBoolean(text() === 'true')} From 19f25d2d8e168d76e5379d021d31194f66dce881 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 14:40:51 +0000 Subject: [PATCH 175/340] :arrow_up: Bump @storybook/addon-actions from 6.5.2 to 6.5.3 Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.3/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.3/addons/actions) --- updated-dependencies: - dependency-name: "@storybook/addon-actions" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 124 ++++++++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 2 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 8a6870b9..b0df0f26 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -18,7 +18,7 @@ }, "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.17.12", - "@storybook/addon-actions": "^6.4.22", + "@storybook/addon-actions": "^6.5.3", "@storybook/addon-essentials": "^6.5.2", "@storybook/addon-links": "^6.5.2", "@storybook/builder-webpack5": "^6.5.2", diff --git a/yarn.lock b/yarn.lock index bc5907c4..4c15ada8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2730,7 +2730,7 @@ "@stdlib/types" "^0.0.x" debug "^2.6.9" -"@storybook/addon-actions@6.5.2", "@storybook/addon-actions@^6.4.22": +"@storybook/addon-actions@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.2.tgz#081ff620fd9d8896d4c387cd2262bee7326d8f8c" integrity sha512-oBKQveXRwCr7M3U3dESVJe2nP6QlhTn99r2GTmn07L0yJ12NnB7o519uoMcAbYKZbewrH6GWe82PbUDC5O5uAw== @@ -2755,6 +2755,31 @@ util-deprecate "^1.0.2" uuid-browser "^3.1.0" +"@storybook/addon-actions@^6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.3.tgz#1e47bcfc5b215f483aef9d7f22e3619cd354af8c" + integrity sha512-OYfG6dDFoNIPmtQ5vXum7m7U5MDg6rlwkaUpV3MkMVCnSAco0/GGRdsYBVO+fpfFFVxRUi3QFEv7xI0xyX2oiQ== + dependencies: + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/components" "6.5.3" + "@storybook/core-events" "6.5.3" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/theming" "6.5.3" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + polished "^4.2.2" + prop-types "^15.7.2" + react-inspector "^5.1.0" + regenerator-runtime "^0.13.7" + telejson "^6.0.8" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + uuid-browser "^3.1.0" + "@storybook/addon-backgrounds@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.5.2.tgz#98619679a18429884f6e03cf8728e203af701a34" @@ -2942,6 +2967,23 @@ global "^4.4.0" regenerator-runtime "^0.13.7" +"@storybook/addons@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.5.3.tgz#43dd276417edf74be0c465b968d35795f8cd994d" + integrity sha512-gzzkxZ7R4+EaEzIEBbTWmkA55JDEDQrDjg3nNY/SJklnRigYdStz41KSPx6HGkF2CaI5BYVd5vZCawYvG16gyg== + dependencies: + "@storybook/api" "6.5.3" + "@storybook/channels" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/core-events" "6.5.3" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/router" "6.5.3" + "@storybook/theming" "6.5.3" + "@types/webpack-env" "^1.16.0" + core-js "^3.8.2" + global "^4.4.0" + regenerator-runtime "^0.13.7" + "@storybook/api@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.2.tgz#e5b61b26c5d2d1c15876e281917e2f91cbc59a52" @@ -2965,6 +3007,29 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/api@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.3.tgz#f4c468f348bf6ac65dc571f3e65d67302323312c" + integrity sha512-neVW47ssdG3MqwNwTLjlifS/u6zGUkkcK7G/PC1tnQPP9Zc97BStIqS1RnPGie1iawIAT5ZJQefPGJMneSTBKA== + dependencies: + "@storybook/channels" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/core-events" "6.5.3" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/router" "6.5.3" + "@storybook/semver" "^7.3.2" + "@storybook/theming" "6.5.3" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + regenerator-runtime "^0.13.7" + store2 "^2.12.0" + telejson "^6.0.8" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/builder-webpack4@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.2.tgz#5779ad29aacfd8784896b738e33c9d548ff16821" @@ -3095,6 +3160,15 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/channels@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.3.tgz#d1c94f1760a27026d16705ab28a82e582cf9f2d5" + integrity sha512-wpxnMt5clUy+04o+I5LVMoQkYt7nc0e5PDz+pAtlNOvQaoFvlC7oQqsVYxxs1cYm6ZGqAJcsfecI5COtnQfT1w== + dependencies: + core-js "^3.8.2" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/client-api@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.2.tgz#f1cabf78d1f522610c8393affd10d016898ce1d0" @@ -3129,6 +3203,14 @@ core-js "^3.8.2" global "^4.4.0" +"@storybook/client-logger@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.3.tgz#4794e87d85c03aa6e38efc4c5775b9680cc1bf23" + integrity sha512-gUJUkDzQdOQBfAQSJffKlZQ6ueUANjTN6u4xA/FIfJM7+I5N43UuS3dFGEjcnZISS5sj7765ct2aZinMzf1NNQ== + dependencies: + core-js "^3.8.2" + global "^4.4.0" + "@storybook/components@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.2.tgz#185bf0d75585fe1299c51a001ace405872aa42cd" @@ -3144,6 +3226,21 @@ regenerator-runtime "^0.13.7" util-deprecate "^1.0.2" +"@storybook/components@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.3.tgz#8d643d2d89c298e5e5c2957f7ffb171ba3288ecf" + integrity sha512-vYTsg9ADzkPeTsmN1bm351wGqq+oyb8SrAJzLe+FXN+dujIIA9sGEQb6eUZdGe121RDgTyFMO2zKurcJNnGnxQ== + dependencies: + "@storybook/client-logger" "6.5.3" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/theming" "6.5.3" + "@types/react-syntax-highlighter" "11.0.5" + core-js "^3.8.2" + qs "^6.10.0" + react-syntax-highlighter "^15.4.5" + regenerator-runtime "^0.13.7" + util-deprecate "^1.0.2" + "@storybook/core-client@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.2.tgz#98063ba6eec19b18c71d0f478060aeb3a0a6a07a" @@ -3233,6 +3330,13 @@ dependencies: core-js "^3.8.2" +"@storybook/core-events@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.3.tgz#57fb45187d6d60403149d9b16953989897e2bd6e" + integrity sha512-DTWFjXJIx+sZndv3lsJohVEJoUL5MgtkSeeKaypkJmZm9kXkylhA0NnA07CMRE6GMqCWw6NYGSe+qOEGsHj5ig== + dependencies: + core-js "^3.8.2" + "@storybook/core-server@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.2.tgz#96d5d105c8cf24a06c41823a9ebfa68d45c4106f" @@ -3543,6 +3647,15 @@ core-js "^3.8.2" regenerator-runtime "^0.13.7" +"@storybook/router@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.5.3.tgz#55d8a0a5c3acdef9695482e38cd4d70f6926c261" + integrity sha512-UcErvdeuCTMYvmztDogrTK1DKQ8ZFkUR/46bEuVo4tg9OzlX3fr+JqD4RZHT4YOUYmDcTm6cLlUJhDalUpoU6Q== + dependencies: + "@storybook/client-logger" "6.5.3" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + "@storybook/semver@^7.3.2": version "7.3.2" resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0" @@ -3615,6 +3728,15 @@ core-js "^3.8.2" regenerator-runtime "^0.13.7" +"@storybook/theming@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.5.3.tgz#a8df53df2812d49453a3410346123231e028c103" + integrity sha512-2tM46jahAhKRUzCcoaqPoqs+4imXqbze0dCPZ0cdVnfs14jhMB1lAfGE+diodCCaUcXUu8r2c5dTPKqqM1lHqQ== + dependencies: + "@storybook/client-logger" "6.5.3" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + "@storybook/ui@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.2.tgz#034a180604df28d0d1b1d38324bab93de5da8db4" From cf02e199297e9e2f6113c97ee181f159da135882 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 14:41:18 +0000 Subject: [PATCH 176/340] :arrow_up: Bump react-use from 17.3.2 to 17.4.0 Bumps [react-use](https://github.com/streamich/react-use) from 17.3.2 to 17.4.0. - [Release notes](https://github.com/streamich/react-use/releases) - [Changelog](https://github.com/streamich/react-use/blob/master/CHANGELOG.md) - [Commits](https://github.com/streamich/react-use/compare/v17.3.2...v17.4.0) --- updated-dependencies: - dependency-name: react-use dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 8a6870b9..1c2fa611 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -9,7 +9,7 @@ "react": "^18.1.0", "react-ace": "^10.1.0", "react-dom": "^18.1.0", - "react-use": "^17.3.2", + "react-use": "^17.4.0", "react-vega": "^7.5.1", "styled-components": "^5.3.5", "vega": "^5.22.1", diff --git a/yarn.lock b/yarn.lock index bc5907c4..efae6b3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14331,10 +14331,10 @@ react-universal-interface@^0.6.2: resolved "https://registry.yarnpkg.com/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b" integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw== -react-use@^17.3.2: - version "17.3.2" - resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.3.2.tgz#448abf515f47c41c32455024db28167cb6e53be8" - integrity sha512-bj7OD0/1wL03KyWmzFXAFe425zziuTf7q8olwCYBfOeFHY1qfO1FAMjROQLsLZYwG4Rx63xAfb7XAbBrJsZmEw== +react-use@^17.4.0: + version "17.4.0" + resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.4.0.tgz#cefef258b0a6c534a5c8021c2528ac6e1a4cdc6d" + integrity sha512-TgbNTCA33Wl7xzIJegn1HndB4qTS9u03QUwyNycUnXaweZkE4Kq2SB+Yoxx8qbshkZGYBDvUXbXWRUmQDcZZ/Q== dependencies: "@types/js-cookie" "^2.2.6" "@xobotyi/scrollbar-width" "^1.9.5" From 1a9dacafd8e52cf0080d95cf90f8c0bedc518988 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 14:47:56 +0000 Subject: [PATCH 177/340] :arrow_up: Bump @storybook/builder-webpack5 from 6.5.2 to 6.5.3 Bumps [@storybook/builder-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.3/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.3/lib/core) --- updated-dependencies: - dependency-name: "@storybook/builder-webpack5" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 187 +++++++++++++++++++++++++++---- 2 files changed, 169 insertions(+), 20 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index b0df0f26..8db4e464 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -21,7 +21,7 @@ "@storybook/addon-actions": "^6.5.3", "@storybook/addon-essentials": "^6.5.2", "@storybook/addon-links": "^6.5.2", - "@storybook/builder-webpack5": "^6.5.2", + "@storybook/builder-webpack5": "^6.5.3", "@storybook/manager-webpack5": "^6.5.2", "@storybook/node-logger": "^6.4.22", "@storybook/preset-create-react-app": "^4.1.0", diff --git a/yarn.lock b/yarn.lock index 4c15ada8..f4a95eb2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3083,27 +3083,27 @@ webpack-hot-middleware "^2.25.1" webpack-virtual-modules "^0.2.2" -"@storybook/builder-webpack5@^6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.5.2.tgz#23ba7dc94365f6a44c3ad3d388b86de565533f9f" - integrity sha512-aZJoP/T4fcmsHodNA7vf55Sr5eIFQdyFmhvh3OJVXVdIj4OAes3fg/ySz0wAc0VmDpYHPOtUl9uUYt+6Y6IQxQ== +"@storybook/builder-webpack5@^6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.5.3.tgz#1fd01ea93b169afccafcc4f9d6fb15ad992e6ffd" + integrity sha512-noVd6eJE7pmBl886TahPuUdLiVkyE9ecqQhcltnZfMBCuJXeEev0/E642HRp5P2hE6uE2pBzkTAy8gaHExeY+Q== dependencies: "@babel/core" "^7.12.10" - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/channel-postmessage" "6.5.2" - "@storybook/channels" "6.5.2" - "@storybook/client-api" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/components" "6.5.2" - "@storybook/core-common" "6.5.2" - "@storybook/core-events" "6.5.2" - "@storybook/node-logger" "6.5.2" - "@storybook/preview-web" "6.5.2" - "@storybook/router" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/channel-postmessage" "6.5.3" + "@storybook/channels" "6.5.3" + "@storybook/client-api" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/components" "6.5.3" + "@storybook/core-common" "6.5.3" + "@storybook/core-events" "6.5.3" + "@storybook/node-logger" "6.5.3" + "@storybook/preview-web" "6.5.3" + "@storybook/router" "6.5.3" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.2" - "@storybook/theming" "6.5.2" + "@storybook/store" "6.5.3" + "@storybook/theming" "6.5.3" "@types/node" "^14.0.10 || ^16.0.0" babel-loader "^8.0.0" babel-plugin-named-exports-order "^0.0.2" @@ -3140,6 +3140,19 @@ qs "^6.10.0" telejson "^6.0.8" +"@storybook/channel-postmessage@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.5.3.tgz#c3762b92e87cb15e3a3c50d8a23ddede80a1e6d0" + integrity sha512-1vsKhFuTX53VmRm4ZKae+9z6FciSTyywZJ5cYmH2nTRWqW5GOm3UndixHzXpddVM1DWdEH4jJ/Cn15SzPRWiPg== + dependencies: + "@storybook/channels" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/core-events" "6.5.3" + core-js "^3.8.2" + global "^4.4.0" + qs "^6.10.0" + telejson "^6.0.8" + "@storybook/channel-websocket@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.2.tgz#cc7b1d1a592ccf953f99cec18fb7846445eea34d" @@ -3195,6 +3208,32 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/client-api@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.3.tgz#ca7b5ddb9e745b1485d8946dd14d1e81173dd712" + integrity sha512-BxksIgSDkkt9muA41VbsSB96/u3HJAWuOJw+GCzt0yHmlBgfb3+GpQOJUDqTluWQlojg0DHJhAKgYKbejyEpIA== + dependencies: + "@storybook/addons" "6.5.3" + "@storybook/channel-postmessage" "6.5.3" + "@storybook/channels" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/core-events" "6.5.3" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.3" + "@types/qs" "^6.9.5" + "@types/webpack-env" "^1.16.0" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + store2 "^2.12.0" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/client-logger@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.2.tgz#1dcd7810649586bddef7997e5501d8a225a457f3" @@ -3323,6 +3362,62 @@ util-deprecate "^1.0.2" webpack "4" +"@storybook/core-common@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.3.tgz#5892e1ebc77f11b1058b716cb514bc2d1d5636ef" + integrity sha512-A0WJDm/Eo2eP8CZeAQPo8oep+Pbbm/uU6Gl/8GsvK7AVtDv/Sm/kyAWcvqMx5ovnZ7A+qYYjvHr90EZuDoltPg== + dependencies: + "@babel/core" "^7.12.10" + "@babel/plugin-proposal-class-properties" "^7.12.1" + "@babel/plugin-proposal-decorators" "^7.12.12" + "@babel/plugin-proposal-export-default-from" "^7.12.1" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" + "@babel/plugin-proposal-object-rest-spread" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.12.7" + "@babel/plugin-proposal-private-methods" "^7.12.1" + "@babel/plugin-proposal-private-property-in-object" "^7.12.1" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-transform-arrow-functions" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.12" + "@babel/plugin-transform-classes" "^7.12.1" + "@babel/plugin-transform-destructuring" "^7.12.1" + "@babel/plugin-transform-for-of" "^7.12.1" + "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/plugin-transform-shorthand-properties" "^7.12.1" + "@babel/plugin-transform-spread" "^7.12.1" + "@babel/preset-env" "^7.12.11" + "@babel/preset-react" "^7.12.10" + "@babel/preset-typescript" "^7.12.7" + "@babel/register" "^7.12.1" + "@storybook/node-logger" "6.5.3" + "@storybook/semver" "^7.3.2" + "@types/node" "^14.0.10 || ^16.0.0" + "@types/pretty-hrtime" "^1.0.0" + babel-loader "^8.0.0" + babel-plugin-macros "^3.0.1" + babel-plugin-polyfill-corejs3 "^0.1.0" + chalk "^4.1.0" + core-js "^3.8.2" + express "^4.17.1" + file-system-cache "^1.0.5" + find-up "^5.0.0" + fork-ts-checker-webpack-plugin "^6.0.4" + fs-extra "^9.0.1" + glob "^7.1.6" + handlebars "^4.7.7" + interpret "^2.2.0" + json5 "^2.1.3" + lazy-universal-dotenv "^3.0.1" + picomatch "^2.3.0" + pkg-dir "^5.0.0" + pretty-hrtime "^1.0.3" + resolve-from "^5.0.0" + slash "^3.0.0" + telejson "^6.0.8" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + webpack "4" + "@storybook/core-events@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.2.tgz#639d6b1183a72829a035dbae5a06c6ff94aa8c59" @@ -3532,7 +3627,7 @@ prettier ">=2.2.1 <=2.3.0" ts-dedent "^2.0.0" -"@storybook/node-logger@6.5.2", "@storybook/node-logger@^6.4.22": +"@storybook/node-logger@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.2.tgz#b8a54209b4c53aa2022c45888ce54c9abaa8fea0" integrity sha512-p7ICWapQYrk1i+wUZUa9thfgrataMPf9iX5QUn/rWj2CtBL0W63qk1E+X6PL49gsww8clGhOU/rFQcylzNodcQ== @@ -3543,6 +3638,17 @@ npmlog "^5.0.1" pretty-hrtime "^1.0.3" +"@storybook/node-logger@6.5.3", "@storybook/node-logger@^6.4.22": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.3.tgz#6917bbbdaf2bb3b191bafadfe4f19c3ea3cbfa61" + integrity sha512-iG4uQJCtuT54p3zg0zJ7+ALPUrt7PTAXmXqN7ak/9YcWbnwtMlHgg8oTlCebwr+E3QPCMauJM2eLzC6F7bI76w== + dependencies: + "@types/npmlog" "^4.1.2" + chalk "^4.1.0" + core-js "^3.8.2" + npmlog "^5.0.1" + pretty-hrtime "^1.0.3" + "@storybook/postinstall@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.2.tgz#b3b99bad5b21006461cc5ff070b675c8c8b36704" @@ -3584,6 +3690,28 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" +"@storybook/preview-web@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.5.3.tgz#f54fb17476c6a57d715ad2e46674b6b668e6729f" + integrity sha512-NI+sKFloj0vP1xAMaF1BhOAokB2u0qZ5rxx8lnU8eBmAukRURGoebuHWohBoQqniuupaNQK5hkUlJ3mkAPZi8Q== + dependencies: + "@storybook/addons" "6.5.3" + "@storybook/channel-postmessage" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/core-events" "6.5.3" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.3" + ansi-to-html "^0.6.11" + core-js "^3.8.2" + global "^4.4.0" + lodash "^4.17.21" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + unfetch "^4.2.0" + util-deprecate "^1.0.2" + "@storybook/react-docgen-typescript-plugin@1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0", "@storybook/react-docgen-typescript-plugin@canary": version "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0" resolved "https://registry.yarnpkg.com/@storybook/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0.tgz#3103532ff494fb7dc3cf835f10740ecf6a26c0f9" @@ -3701,6 +3829,27 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/store@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.5.3.tgz#8bde9d3ad071c3612665b6190ed093784a98d22d" + integrity sha512-vI5w3OlDsCQE32C5AekRfHI6qX7s7iKRAUJKQE4Azqch37EAnMNLWE3E13KAzdLX1oU+JNRGHjJTogsQUR2UeQ== + dependencies: + "@storybook/addons" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/core-events" "6.5.3" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + regenerator-runtime "^0.13.7" + slash "^3.0.0" + stable "^0.1.8" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/telemetry@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.2.tgz#26b7351b75dadfefb829f8077c8b3a0c1ec29e68" From db8b917dca8f79e20241c04e5d5643bd54faa6fb Mon Sep 17 00:00:00 2001 From: Quinn Date: Fri, 20 May 2022 10:52:45 -0400 Subject: [PATCH 178/340] Hotfix: `dependabot` => `'weekly'` --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9c9c86c3..53e50bd6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,6 +8,6 @@ updates: - package-ecosystem: "npm" # See documentation for possible values directory: "/" # Location of package manifests schedule: - interval: "daily" + interval: "weekly" commit-message: prefix: "⬆️" From 9fa7bc21b41c2847a70cc7f94d27338c4e286da7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 14:54:39 +0000 Subject: [PATCH 179/340] :arrow_up: Bump @storybook/addon-essentials from 6.5.2 to 6.5.3 Bumps [@storybook/addon-essentials](https://github.com/storybookjs/storybook/tree/HEAD/addons/essentials) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.3/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.3/addons/essentials) --- updated-dependencies: - dependency-name: "@storybook/addon-essentials" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 242 +++++++++++++++---------------- 2 files changed, 116 insertions(+), 128 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 714456a9..88fe0cdb 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.17.12", "@storybook/addon-actions": "^6.5.3", - "@storybook/addon-essentials": "^6.5.2", + "@storybook/addon-essentials": "^6.5.3", "@storybook/addon-links": "^6.5.2", "@storybook/builder-webpack5": "^6.5.3", "@storybook/manager-webpack5": "^6.5.2", diff --git a/yarn.lock b/yarn.lock index 7ff8f3f6..f2ebf133 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2730,32 +2730,7 @@ "@stdlib/types" "^0.0.x" debug "^2.6.9" -"@storybook/addon-actions@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.2.tgz#081ff620fd9d8896d4c387cd2262bee7326d8f8c" - integrity sha512-oBKQveXRwCr7M3U3dESVJe2nP6QlhTn99r2GTmn07L0yJ12NnB7o519uoMcAbYKZbewrH6GWe82PbUDC5O5uAw== - dependencies: - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/components" "6.5.2" - "@storybook/core-events" "6.5.2" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/theming" "6.5.2" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - polished "^4.2.2" - prop-types "^15.7.2" - react-inspector "^5.1.0" - regenerator-runtime "^0.13.7" - telejson "^6.0.8" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - uuid-browser "^3.1.0" - -"@storybook/addon-actions@^6.5.3": +"@storybook/addon-actions@6.5.3", "@storybook/addon-actions@^6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.3.tgz#1e47bcfc5b215f483aef9d7f22e3619cd354af8c" integrity sha512-OYfG6dDFoNIPmtQ5vXum7m7U5MDg6rlwkaUpV3MkMVCnSAco0/GGRdsYBVO+fpfFFVxRUi3QFEv7xI0xyX2oiQ== @@ -2780,18 +2755,18 @@ util-deprecate "^1.0.2" uuid-browser "^3.1.0" -"@storybook/addon-backgrounds@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.5.2.tgz#98619679a18429884f6e03cf8728e203af701a34" - integrity sha512-+2TtH5rzlTy5kPcDZ0FQ1eMFqg6RFM/fLEdsN90+AdI5TmBgO40rBErYAbM3Y82WjvvjpnUDSxg4Ru41H5GAzQ== +"@storybook/addon-backgrounds@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.5.3.tgz#dbe357d88c2844aef5c3c85e055c1c954721a109" + integrity sha512-U8ic8fR7kACRvvSaElFaCOgb8ugU2NCtpv2CC3VzxCVWDCdaYivgpXQrvHe0GLYhIrySqgm1wP7q73oILl+Qcg== dependencies: - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/components" "6.5.2" - "@storybook/core-events" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/components" "6.5.3" + "@storybook/core-events" "6.5.3" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/theming" "6.5.2" + "@storybook/theming" "6.5.3" core-js "^3.8.2" global "^4.4.0" memoizerific "^1.11.3" @@ -2799,47 +2774,47 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/addon-controls@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.5.2.tgz#9293fc03da3d36dee34cc2e6388fcdd9ee318c38" - integrity sha512-R2HCmuetOAN4nIIbBijdCq4pxtyT6NthCHy1jmtElF8q3C8j1dhn6ULr8+imWQaW+lKZGWESLN/ey7s4FZ9tyw== +"@storybook/addon-controls@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.5.3.tgz#0f398b1c1898bf735bbd228f04a0ddfe1c281807" + integrity sha512-90dTS2ySo/u8t/UTY1snsfAJCszvJKW8FNbzxF1c+JwvErb6hrHq0JOSmFLOeRqPuvkKKB8q83vp6A6fXOU+gQ== dependencies: - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/components" "6.5.2" - "@storybook/core-common" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/components" "6.5.3" + "@storybook/core-common" "6.5.3" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/node-logger" "6.5.2" - "@storybook/store" "6.5.2" - "@storybook/theming" "6.5.2" + "@storybook/node-logger" "6.5.3" + "@storybook/store" "6.5.3" + "@storybook/theming" "6.5.3" core-js "^3.8.2" lodash "^4.17.21" ts-dedent "^2.0.0" -"@storybook/addon-docs@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.5.2.tgz#715afbf7aa7dc451a558d6f32a651c4fb94cfc10" - integrity sha512-W1OBxNQ6wFNRNPnVMI2a4u0XsPdnoeJ4qBIOxzLjeucgpjyAtQi/gjdABI0Y/gw/AIt89HXJsZDrG/jYvHN6Sw== +"@storybook/addon-docs@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.5.3.tgz#6db38b7721245193d2ceaf788844f5a110d1e8bc" + integrity sha512-MC1Bwamw8lQvRMmGKsf4UcyNdQCYgpAB2o9m4R0EPA5byTkcEfAXkAwSP8atlP0/wQTjrwvyVgQuhchHmxnR0Q== dependencies: "@babel/plugin-transform-react-jsx" "^7.12.12" "@babel/preset-env" "^7.12.11" "@jest/transform" "^26.6.2" "@mdx-js/react" "^1.6.22" - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/components" "6.5.2" - "@storybook/core-common" "6.5.2" - "@storybook/core-events" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/components" "6.5.3" + "@storybook/core-common" "6.5.3" + "@storybook/core-events" "6.5.3" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/docs-tools" "6.5.2" + "@storybook/docs-tools" "6.5.3" "@storybook/mdx1-csf" canary - "@storybook/node-logger" "6.5.2" - "@storybook/postinstall" "6.5.2" - "@storybook/preview-web" "6.5.2" - "@storybook/source-loader" "6.5.2" - "@storybook/store" "6.5.2" - "@storybook/theming" "6.5.2" + "@storybook/node-logger" "6.5.3" + "@storybook/postinstall" "6.5.3" + "@storybook/preview-web" "6.5.3" + "@storybook/source-loader" "6.5.3" + "@storybook/store" "6.5.3" + "@storybook/theming" "6.5.3" babel-loader "^8.0.0" core-js "^3.8.2" fast-deep-equal "^3.1.3" @@ -2851,23 +2826,23 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/addon-essentials@^6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.5.2.tgz#4850e878bc1b5b9c73dd4090176c4fef25fc259e" - integrity sha512-BB4exm5rZYC2KnmsaW46HdO7SO3Q/7JrSjOV2Kg0DxWie1Qd5wKYAVcPBwHg6QI4pCHIY3rF9dM3REJU2m3nEg== +"@storybook/addon-essentials@^6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.5.3.tgz#1bd33d5265288d24049e5fd63e78a99d67fdbe50" + integrity sha512-ZVps1kFMB4OuKRS9vIo8u07u04zvU84jP4B7c5TcH/WxFbwPW9I9ePBcCv+QmkdhDTb3TGWRWQqv5zs4cnQ1YA== dependencies: - "@storybook/addon-actions" "6.5.2" - "@storybook/addon-backgrounds" "6.5.2" - "@storybook/addon-controls" "6.5.2" - "@storybook/addon-docs" "6.5.2" - "@storybook/addon-measure" "6.5.2" - "@storybook/addon-outline" "6.5.2" - "@storybook/addon-toolbars" "6.5.2" - "@storybook/addon-viewport" "6.5.2" - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/core-common" "6.5.2" - "@storybook/node-logger" "6.5.2" + "@storybook/addon-actions" "6.5.3" + "@storybook/addon-backgrounds" "6.5.3" + "@storybook/addon-controls" "6.5.3" + "@storybook/addon-docs" "6.5.3" + "@storybook/addon-measure" "6.5.3" + "@storybook/addon-outline" "6.5.3" + "@storybook/addon-toolbars" "6.5.3" + "@storybook/addon-viewport" "6.5.3" + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/core-common" "6.5.3" + "@storybook/node-logger" "6.5.3" core-js "^3.8.2" regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" @@ -2890,60 +2865,60 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-measure@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-6.5.2.tgz#7362dcb198b0c4274a6ee97b2c5fee93175929e0" - integrity sha512-XSoyvcGJpLBFFVQRHGWMZM1OKxxPJFMAldyDdt+Rbjj8vsnomwZeMVlkKnoG5qwEAFDBvFlntOXRXrYy2319Gg== +"@storybook/addon-measure@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-6.5.3.tgz#7a27082d7863981924362fd15022521b0722048f" + integrity sha512-8auVdpM66+qaam3KGmfZZgSQ/jJIm6aMeEzi+HX48b2xVa4vv9W9/ZpJp9fc3K2349+BR5K3nzLMObdFr1Yjew== dependencies: - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/components" "6.5.2" - "@storybook/core-events" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/components" "6.5.3" + "@storybook/core-events" "6.5.3" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" global "^4.4.0" -"@storybook/addon-outline@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-6.5.2.tgz#0ccd3d6d1f3f20f25c18ff7e8a46bdc77b9066f6" - integrity sha512-g4V7YdNAs/YIFRVbVAlnhDERl9xeufvtcnMoI5pINzQRrGxlz7BqRpqhbtreC5mbWgrNQsQnI77HjS3zF4Jwww== +"@storybook/addon-outline@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-6.5.3.tgz#2560912eddda92dc827448268176e9b3ac1ef308" + integrity sha512-QVSsTOs813Tl404IcWTxdzM+gAIiq46LuH11Re1cMwKrnuOvfHtbLQ4x2n1aTy+mTuWxNymaHwX2Aqilr0fqJA== dependencies: - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/components" "6.5.2" - "@storybook/core-events" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/components" "6.5.3" + "@storybook/core-events" "6.5.3" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" global "^4.4.0" regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-toolbars@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.5.2.tgz#e569d86424e65b5016b6333d5d65b20e46c8d990" - integrity sha512-DveAfyfo/qXDD//kReby+TBerL1kfwcbAA0IEByDChelImAgGC7s614jbpHQKwTJqaljZPsb+wHhcE8I/CPxfA== +"@storybook/addon-toolbars@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.5.3.tgz#1a379bae5217ddbcbf37948867211c755d264c70" + integrity sha512-wQxDUQASrpdGJouo6WsC840JwaAQkgV4nuCmuxyqbL6yJ7HNyS7mbBoJzfe8kXWOzSN2MM1lP4gOlZuGH4m05g== dependencies: - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/components" "6.5.2" - "@storybook/theming" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/components" "6.5.3" + "@storybook/theming" "6.5.3" core-js "^3.8.2" regenerator-runtime "^0.13.7" -"@storybook/addon-viewport@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.5.2.tgz#5f24169c2eaff9245c6855698da74a2f6b8c7ddb" - integrity sha512-I02dAefFennQrNrF5+xPWl9aQj0k/J9rxKslkZrbTyJvqbd24701NE9iWJ441/SR1Y/p3MKuOMvtjRKNtUCWgw== +"@storybook/addon-viewport@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.5.3.tgz#759d0f5e276a77e032bdcd111162d1944f875a81" + integrity sha512-jzHGACC40g/jWXmDIdMyQk5EepNoHhOLFWxUpt12kSgkx0s8PL6PHAOn7p0Yh8JOp0hwHxZJXnYch6yEEgpBTA== dependencies: - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/components" "6.5.2" - "@storybook/core-events" "6.5.2" - "@storybook/theming" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/components" "6.5.3" + "@storybook/core-events" "6.5.3" + "@storybook/theming" "6.5.3" core-js "^3.8.2" global "^4.4.0" memoizerific "^1.11.3" @@ -3531,6 +3506,19 @@ lodash "^4.17.21" regenerator-runtime "^0.13.7" +"@storybook/docs-tools@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.3.tgz#2460df5d20e4c6670e985268b50bf9c412eb47b7" + integrity sha512-scUztkQ9ZRRoo4lHiYRaCkmk351H2CwMnlOrCwv/EpmLZnHdffSAtMZS/O07KUOC8fvxCw36z5SfHlbCIcolSQ== + dependencies: + "@babel/core" "^7.12.10" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.3" + core-js "^3.8.2" + doctrine "^3.0.0" + lodash "^4.17.21" + regenerator-runtime "^0.13.7" + "@storybook/manager-webpack4@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.2.tgz#8af1b1f3689d6ccc2e71674ea0da93e55845336f" @@ -3649,10 +3637,10 @@ npmlog "^5.0.1" pretty-hrtime "^1.0.3" -"@storybook/postinstall@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.2.tgz#b3b99bad5b21006461cc5ff070b675c8c8b36704" - integrity sha512-AKgTN1cqjspnZP1eOyKBJ0TLC0kyt/41FrBKPZYepofUWD7/NyI8XKNTJZcZIfu5tmV3c7ES7miYDFsq5zCotA== +"@storybook/postinstall@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.3.tgz#ba815b7590d0fe8ee8626e62ddd3f729264aa464" + integrity sha512-EIHnbrGwt/CPyLXwNFyfAGY4LhrBx713ghCtacQu2xAukDXg9UWJHarYXjwIivk8DGrims28qXGIjIUKqKeuyA== dependencies: core-js "^3.8.2" @@ -3792,13 +3780,13 @@ core-js "^3.6.5" find-up "^4.1.0" -"@storybook/source-loader@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.5.2.tgz#d37fac2707eb622d99da38ae22928efe4b77f6f8" - integrity sha512-SU0b0aA31rszvf3mxl5X75McPrdf0SxKam9aE10D0RkKFgdz/MU0RQGSgBofUw+VT31UZy2Xq0BHy1/LvlqP+w== +"@storybook/source-loader@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.5.3.tgz#5991dd33805ebb54c5c1e0ad779a2cf80ec6b3b9" + integrity sha512-JrwCm3El6XZC7eVYCF83e7x7/fA4ue+g2s0oAtdXD11KOrrJ7e0bgtvVdtRWKG/4n4Ww3+sGFnuIlXfPbJ3hvw== dependencies: - "@storybook/addons" "6.5.2" - "@storybook/client-logger" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/client-logger" "6.5.3" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" estraverse "^5.2.0" From 957e09e6b95ed3ad526da199655cd4aff4e0ec01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 15:01:48 +0000 Subject: [PATCH 180/340] :arrow_up: Bump @storybook/addon-links from 6.5.2 to 6.5.3 Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.3/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.3/addons/links) --- updated-dependencies: - dependency-name: "@storybook/addon-links" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 88fe0cdb..f550b3a6 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -20,7 +20,7 @@ "@babel/plugin-proposal-private-property-in-object": "^7.17.12", "@storybook/addon-actions": "^6.5.3", "@storybook/addon-essentials": "^6.5.3", - "@storybook/addon-links": "^6.5.2", + "@storybook/addon-links": "^6.5.3", "@storybook/builder-webpack5": "^6.5.3", "@storybook/manager-webpack5": "^6.5.2", "@storybook/node-logger": "^6.4.22", diff --git a/yarn.lock b/yarn.lock index f2ebf133..9df66188 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2847,16 +2847,16 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-links@^6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.2.tgz#9dd892b4fe1b0bfe37fbe8175ff6a6b481d7aee3" - integrity sha512-Er7JtdT92gGDlTwRN+LLwF7X9CCXi7auntU/qrE1ozdGTi9+ye37LcsOA+uSOjSYG3LmQqYzp9hIL9NTsVxJFw== +"@storybook/addon-links@^6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.3.tgz#5eae9855e19cc03548aa6655756886c26557a175" + integrity sha512-FOcrHbEi8Bw6QE3hzO0vtnJVFj2iIiQk0thEdkhq+Pnn5iZ6VmDoctHPwc2wuyM7BIKDlROaK0VRXYLCx6uiBg== dependencies: - "@storybook/addons" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/core-events" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/core-events" "6.5.3" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/router" "6.5.2" + "@storybook/router" "6.5.3" "@types/qs" "^6.9.5" core-js "^3.8.2" global "^4.4.0" From 870b0c9d4e766455d0940ef933927eebc9e318e2 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Fri, 20 May 2022 17:05:53 +0200 Subject: [PATCH 181/340] hidden macros --- .../Reducer_Dispatch_BuiltInMacros_test.res | 22 ++--- .../Reducer_Peggy_Parse_test.res | 14 +-- .../Reducer_Peggy_ToExpression_test.res | 94 +++++++++---------- .../Reducer/Reducer_externalBindings_test.res | 2 +- .../Reducer_functionAssignment_test.res | 4 +- .../Reducer/Reducer_functionTricks_test.res | 2 +- .../Reducer/Reducer_ternaryOperator_test.res | 2 +- .../ReducerInterface_Distribution_test.res | 22 ++--- .../Reducer_Dispatch_BuiltInMacros.res | 14 +-- .../Reducer_Expression_ExpressionBuilder.res | 10 +- .../Reducer_Peggy_GeneratedParser.js | 6 +- .../Reducer_Peggy_GeneratedParser.peggy | 6 +- .../Reducer_Peggy/Reducer_Peggy_Parse.res | 2 +- .../Reducer_Peggy_ToExpression.res | 4 +- 14 files changed, 102 insertions(+), 102 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res index a6a47978..993eff10 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res @@ -68,37 +68,37 @@ describe("bindExpression", () => { describe("block", () => { // Block with a single expression - testMacro([], eBlock(list{exampleExpression}), "Ok((:$$bindExpression 1))") + testMacro([], eBlock(list{exampleExpression}), "Ok((:$$_bindExpression_$$ 1))") testMacroEval([], eBlock(list{exampleExpression}), "Ok(1)") // Block with a single statement - testMacro([], eBlock(list{exampleStatementY}), "Ok((:$$bindExpression (:$let :y 1)))") + testMacro([], eBlock(list{exampleStatementY}), "Ok((:$$_bindExpression_$$ (:$let :y 1)))") testMacroEval([], eBlock(list{exampleStatementY}), "Ok({y: 1})") // Block with a statement and an expression testMacro( [], eBlock(list{exampleStatementY, exampleExpressionY}), - "Ok((:$$bindExpression (:$$bindStatement (:$let :y 1)) :y))", + "Ok((:$$_bindExpression_$$ (:$$_bindStatement_$$ (:$let :y 1)) :y))", ) testMacroEval([], eBlock(list{exampleStatementY, exampleExpressionY}), "Ok(1)") // Block with a statement and another statement testMacro( [], eBlock(list{exampleStatementY, exampleStatementZ}), - "Ok((:$$bindExpression (:$$bindStatement (:$let :y 1)) (:$let :z :y)))", + "Ok((:$$_bindExpression_$$ (:$$_bindStatement_$$ (:$let :y 1)) (:$let :z :y)))", ) testMacroEval([], eBlock(list{exampleStatementY, exampleStatementZ}), "Ok({y: 1,z: 1})") // Block inside a block testMacro( [], eBlock(list{eBlock(list{exampleExpression})}), - "Ok((:$$bindExpression (:$$block 1)))", + "Ok((:$$_bindExpression_$$ (:$$_block_$$ 1)))", ) testMacroEval([], eBlock(list{eBlock(list{exampleExpression})}), "Ok(1)") // Block assigned to a variable testMacro( [], eBlock(list{eLetStatement("z", eBlock(list{eBlock(list{exampleExpressionY})}))}), - "Ok((:$$bindExpression (:$let :z (:$$block (:$$block :y)))))", + "Ok((:$$_bindExpression_$$ (:$let :z (:$$_block_$$ (:$$_block_$$ :y)))))", ) testMacroEval( [], @@ -107,7 +107,7 @@ describe("block", () => { ) // Empty block testMacro([], eBlock(list{}), "Ok(:undefined block)") //TODO: should be an error - // :$$block (:$$block (:$let :y (:add :x 1)) :y)" + // :$$_block_$$ (:$$_block_$$ (:$let :y (:add :x 1)) :y)" testMacro( [], eBlock(list{ @@ -116,7 +116,7 @@ describe("block", () => { eSymbol("y"), }), }), - "Ok((:$$bindExpression (:$$block (:$let :y (:add :x 1)) :y)))", + "Ok((:$$_bindExpression_$$ (:$$_block_$$ (:$let :y (:add :x 1)) :y)))", ) testMacroEval( [("x", EvNumber(1.))], @@ -132,17 +132,17 @@ describe("block", () => { describe("lambda", () => { // assign a lambda to a variable - let lambdaExpression = eFunction("$$lambda", list{eArrayString(["y"]), exampleExpressionY}) + let lambdaExpression = eFunction("$$_lambda_$$", list{eArrayString(["y"]), exampleExpressionY}) testMacro([], lambdaExpression, "Ok(lambda(y=>internal code))") // call a lambda let callLambdaExpression = list{lambdaExpression, eNumber(1.)}->ExpressionT.EList - testMacro([], callLambdaExpression, "Ok(((:$$lambda [y] :y) 1))") + testMacro([], callLambdaExpression, "Ok(((:$$_lambda_$$ [y] :y) 1))") testMacroEval([], callLambdaExpression, "Ok(1)") // Parameters shadow the outer scope testMacroEval([("y", EvNumber(666.))], callLambdaExpression, "Ok(1)") // When not shadowed by the parameters, the outer scope variables are available let lambdaExpression = eFunction( - "$$lambda", + "$$_lambda_$$", list{eArrayString(["z"]), eFunction("add", list{eSymbol("y"), eSymbol("z")})}, ) let callLambdaExpression = eList(list{lambdaExpression, eNumber(1.)}) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 4d4c56e6..84957dff 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -130,16 +130,16 @@ describe("Peggy parse", () => { }) describe("ternary operator", () => { - testParse("true ? 2 : 3", "{(::$$ternary true 2 3)}") - testParse("false ? 2 : false ? 4 : 5", "{(::$$ternary false 2 (::$$ternary false 4 5))}") // nested ternary + testParse("true ? 2 : 3", "{(::$$_ternary_$$ true 2 3)}") + testParse("false ? 2 : false ? 4 : 5", "{(::$$_ternary_$$ false 2 (::$$_ternary_$$ false 4 5))}") // nested ternary }) describe("if then else", () => { - testParse("if true then 2 else 3", "{(::$$ternary true {2} {3})}") - testParse("if false then {2} else {3}", "{(::$$ternary false {2} {3})}") + testParse("if true then 2 else 3", "{(::$$_ternary_$$ true {2} {3})}") + testParse("if false then {2} else {3}", "{(::$$_ternary_$$ false {2} {3})}") testParse( "if false then {2} else if false then {4} else {5}", - "{(::$$ternary false {2} (::$$ternary false {4} {5}))}", + "{(::$$_ternary_$$ false {2} (::$$_ternary_$$ false {4} {5}))}", ) //nested if }) @@ -172,7 +172,7 @@ describe("Peggy parse", () => { ) testParse( "a && b<1+2*3 || d ? true : false", - "{(::$$ternary (::or (::and :a (::smaller :b (::add 1 (::multiply 2 3)))) :d) true false)}", + "{(::$$_ternary_$$ (::or (::and :a (::smaller :b (::add 1 (::multiply 2 3)))) :d) true false)}", ) }) @@ -221,7 +221,7 @@ describe("Peggy parse", () => { testParse("{|x| x}", "{{|:x| {:x}}}") testParse("f={|x| x}", "{:f = {{|:x| {:x}}}}") testParse("f(x)=x", "{:f = {|:x| {:x}}}") // Function definitions are lambda assignments - testParse("f(x)=x ? 1 : 0", "{:f = {|:x| {(::$$ternary :x 1 0)}}}") // Function definitions are lambda assignments + testParse("f(x)=x ? 1 : 0", "{:f = {|:x| {(::$$_ternary_$$ :x 1 0)}}}") // Function definitions are lambda assignments }) describe("Using lambda as value", () => { diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res index 9df108f5..9e857db5 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res @@ -40,61 +40,61 @@ module MyOnly = { describe("Peggy to Expression", () => { describe("literals operators parenthesis", () => { // Note that there is always an outer block. Otherwise, external bindings are ignrored at the first statement - testToExpression("1", "(:$$block 1)", ~v="1", ()) - testToExpression("'hello'", "(:$$block 'hello')", ~v="'hello'", ()) - testToExpression("true", "(:$$block true)", ~v="true", ()) - testToExpression("1+2", "(:$$block (:add 1 2))", ~v="3", ()) - testToExpression("add(1,2)", "(:$$block (:add 1 2))", ~v="3", ()) - testToExpression("(1)", "(:$$block 1)", ()) - testToExpression("(1+2)", "(:$$block (:add 1 2))", ()) + testToExpression("1", "(:$$_block_$$ 1)", ~v="1", ()) + testToExpression("'hello'", "(:$$_block_$$ 'hello')", ~v="'hello'", ()) + testToExpression("true", "(:$$_block_$$ true)", ~v="true", ()) + testToExpression("1+2", "(:$$_block_$$ (:add 1 2))", ~v="3", ()) + testToExpression("add(1,2)", "(:$$_block_$$ (:add 1 2))", ~v="3", ()) + testToExpression("(1)", "(:$$_block_$$ 1)", ()) + testToExpression("(1+2)", "(:$$_block_$$ (:add 1 2))", ()) }) describe("unary", () => { - testToExpression("-1", "(:$$block (:unaryMinus 1))", ~v="-1", ()) - testToExpression("!true", "(:$$block (:not true))", ~v="false", ()) - testToExpression("1 + -1", "(:$$block (:add 1 (:unaryMinus 1)))", ~v="0", ()) - testToExpression("-a[0]", "(:$$block (:unaryMinus (:$atIndex :a 0)))", ()) + testToExpression("-1", "(:$$_block_$$ (:unaryMinus 1))", ~v="-1", ()) + testToExpression("!true", "(:$$_block_$$ (:not true))", ~v="false", ()) + testToExpression("1 + -1", "(:$$_block_$$ (:add 1 (:unaryMinus 1)))", ~v="0", ()) + testToExpression("-a[0]", "(:$$_block_$$ (:unaryMinus (:$atIndex :a 0)))", ()) }) describe("multi-line", () => { - testToExpression("x=1; 2", "(:$$block (:$let :x (:$$block 1)) 2)", ~v="2", ()) + testToExpression("x=1; 2", "(:$$_block_$$ (:$let :x (:$$_block_$$ 1)) 2)", ~v="2", ()) testToExpression( "x=1; y=2", - "(:$$block (:$let :x (:$$block 1)) (:$let :y (:$$block 2)))", + "(:$$_block_$$ (:$let :x (:$$_block_$$ 1)) (:$let :y (:$$_block_$$ 2)))", ~v="{x: 1,y: 2}", (), ) }) describe("variables", () => { - testToExpression("x = 1", "(:$$block (:$let :x (:$$block 1)))", ~v="{x: 1}", ()) - testToExpression("x", "(:$$block :x)", ~v=":x", ()) //TODO: value should return error - testToExpression("x = 1; x", "(:$$block (:$let :x (:$$block 1)) :x)", ~v="1", ()) + testToExpression("x = 1", "(:$$_block_$$ (:$let :x (:$$_block_$$ 1)))", ~v="{x: 1}", ()) + testToExpression("x", "(:$$_block_$$ :x)", ~v=":x", ()) //TODO: value should return error + testToExpression("x = 1; x", "(:$$_block_$$ (:$let :x (:$$_block_$$ 1)) :x)", ~v="1", ()) }) describe("functions", () => { testToExpression( "identity(x) = x", - "(:$$block (:$let :identity (:$$lambda [x] (:$$block :x))))", + "(:$$_block_$$ (:$let :identity (:$$_lambda_$$ [x] (:$$_block_$$ :x))))", ~v="{identity: lambda(x=>internal code)}", (), ) // Function definitions become lambda assignments - testToExpression("identity(x)", "(:$$block (:identity :x))", ()) // Note value returns error properly - testToExpression("f(x) = x> 2 ? 0 : 1; f(3)", "(:$$block (:$let :f (:$$lambda [x] (:$$block (:$$ternary (:larger :x 2) 0 1)))) (:f 3))", ~v="0", ()) + testToExpression("identity(x)", "(:$$_block_$$ (:identity :x))", ()) // Note value returns error properly + testToExpression("f(x) = x> 2 ? 0 : 1; f(3)", "(:$$_block_$$ (:$let :f (:$$_lambda_$$ [x] (:$$_block_$$ (:$$_ternary_$$ (:larger :x 2) 0 1)))) (:f 3))", ~v="0", ()) }) describe("arrays", () => { - testToExpression("[]", "(:$$block (:$constructArray ()))", ~v="[]", ()) - testToExpression("[0, 1, 2]", "(:$$block (:$constructArray (0 1 2)))", ~v="[0,1,2]", ()) + testToExpression("[]", "(:$$_block_$$ (:$constructArray ()))", ~v="[]", ()) + testToExpression("[0, 1, 2]", "(:$$_block_$$ (:$constructArray (0 1 2)))", ~v="[0,1,2]", ()) testToExpression( "['hello', 'world']", - "(:$$block (:$constructArray ('hello' 'world')))", + "(:$$_block_$$ (:$constructArray ('hello' 'world')))", ~v="['hello','world']", (), ) testToExpression( "([0,1,2])[1]", - "(:$$block (:$atIndex (:$constructArray (0 1 2)) 1))", + "(:$$_block_$$ (:$atIndex (:$constructArray (0 1 2)) 1))", ~v="1", (), ) @@ -103,43 +103,43 @@ describe("Peggy to Expression", () => { describe("records", () => { testToExpression( "{a: 1, b: 2}", - "(:$$block (:$constructRecord (('a' 1) ('b' 2))))", + "(:$$_block_$$ (:$constructRecord (('a' 1) ('b' 2))))", ~v="{a: 1,b: 2}", (), ) testToExpression( "{1+0: 1, 2+0: 2}", - "(:$$block (:$constructRecord (((:add 1 0) 1) ((:add 2 0) 2))))", + "(:$$_block_$$ (:$constructRecord (((:add 1 0) 1) ((:add 2 0) 2))))", (), ) // key can be any expression - testToExpression("record.property", "(:$$block (:$atIndex :record 'property'))", ()) + testToExpression("record.property", "(:$$_block_$$ (:$atIndex :record 'property'))", ()) testToExpression( "record={property: 1}; record.property", - "(:$$block (:$let :record (:$$block (:$constructRecord (('property' 1))))) (:$atIndex :record 'property'))", + "(:$$_block_$$ (:$let :record (:$$_block_$$ (:$constructRecord (('property' 1))))) (:$atIndex :record 'property'))", ~v="1", (), ) }) describe("comments", () => { - testToExpression("1 # This is a line comment", "(:$$block 1)", ~v="1", ()) - testToExpression("1 // This is a line comment", "(:$$block 1)", ~v="1", ()) - testToExpression("1 /* This is a multi line comment */", "(:$$block 1)", ~v="1", ()) - testToExpression("/* This is a multi line comment */ 1", "(:$$block 1)", ~v="1", ()) + testToExpression("1 # This is a line comment", "(:$$_block_$$ 1)", ~v="1", ()) + testToExpression("1 // This is a line comment", "(:$$_block_$$ 1)", ~v="1", ()) + testToExpression("1 /* This is a multi line comment */", "(:$$_block_$$ 1)", ~v="1", ()) + testToExpression("/* This is a multi line comment */ 1", "(:$$_block_$$ 1)", ~v="1", ()) }) describe("ternary operator", () => { - testToExpression("true ? 1 : 0", "(:$$block (:$$ternary true 1 0))", ~v="1", ()) - testToExpression("false ? 1 : 0", "(:$$block (:$$ternary false 1 0))", ~v="0", ()) + testToExpression("true ? 1 : 0", "(:$$_block_$$ (:$$_ternary_$$ true 1 0))", ~v="1", ()) + testToExpression("false ? 1 : 0", "(:$$_block_$$ (:$$_ternary_$$ false 1 0))", ~v="0", ()) testToExpression( "true ? 1 : false ? 2 : 0", - "(:$$block (:$$ternary true 1 (:$$ternary false 2 0)))", + "(:$$_block_$$ (:$$_ternary_$$ true 1 (:$$_ternary_$$ false 2 0)))", ~v="1", (), ) // nested ternary testToExpression( "false ? 1 : false ? 2 : 0", - "(:$$block (:$$ternary false 1 (:$$ternary false 2 0)))", + "(:$$_block_$$ (:$$_ternary_$$ false 1 (:$$_ternary_$$ false 2 0)))", ~v="0", (), ) // nested ternary @@ -148,29 +148,29 @@ describe("Peggy to Expression", () => { describe("if then else", () => { testToExpression( "if true then 2 else 3", - "(:$$block (:$$ternary true (:$$block 2) (:$$block 3)))", + "(:$$_block_$$ (:$$_ternary_$$ true (:$$_block_$$ 2) (:$$_block_$$ 3)))", (), ) testToExpression( "if true then {2} else {3}", - "(:$$block (:$$ternary true (:$$block 2) (:$$block 3)))", + "(:$$_block_$$ (:$$_ternary_$$ true (:$$_block_$$ 2) (:$$_block_$$ 3)))", (), ) testToExpression( "if false then {2} else if false then {4} else {5}", - "(:$$block (:$$ternary false (:$$block 2) (:$$ternary false (:$$block 4) (:$$block 5))))", + "(:$$_block_$$ (:$$_ternary_$$ false (:$$_block_$$ 2) (:$$_ternary_$$ false (:$$_block_$$ 4) (:$$_block_$$ 5))))", (), ) //nested if }) describe("pipe", () => { - testToExpression("1 -> add(2)", "(:$$block (:add 1 2))", ~v="3", ()) - testToExpression("-1 -> add(2)", "(:$$block (:add (:unaryMinus 1) 2))", ~v="1", ()) // note that unary has higher priority naturally - testToExpression("1 -> add(2) * 3", "(:$$block (:multiply (:add 1 2) 3))", ~v="9", ()) + testToExpression("1 -> add(2)", "(:$$_block_$$ (:add 1 2))", ~v="3", ()) + testToExpression("-1 -> add(2)", "(:$$_block_$$ (:add (:unaryMinus 1) 2))", ~v="1", ()) // note that unary has higher priority naturally + testToExpression("1 -> add(2) * 3", "(:$$_block_$$ (:multiply (:add 1 2) 3))", ~v="9", ()) }) describe("elixir pipe", () => { - testToExpression("1 |> add(2)", "(:$$block (:add 1 2))", ~v="3", ()) + testToExpression("1 |> add(2)", "(:$$_block_$$ (:add 1 2))", ~v="3", ()) }) // see testParse for priorities of to and credibleIntervalToDistribution @@ -180,7 +180,7 @@ describe("Peggy to Expression", () => { // Like lambdas they have a local scope. testToExpression( "y=99; x={y=1; y}", - "(:$$block (:$let :y (:$$block 99)) (:$let :x (:$$block (:$let :y (:$$block 1)) :y)))", + "(:$$_block_$$ (:$let :y (:$$_block_$$ 99)) (:$let :x (:$$_block_$$ (:$let :y (:$$_block_$$ 1)) :y)))", ~v="{x: 1,y: 99}", (), ) @@ -190,25 +190,25 @@ describe("Peggy to Expression", () => { describe("lambda", () => { testToExpression( "{|x| x}", - "(:$$block (:$$lambda [x] (:$$block :x)))", + "(:$$_block_$$ (:$$_lambda_$$ [x] (:$$_block_$$ :x)))", ~v="lambda(x=>internal code)", (), ) testToExpression( "f={|x| x}", - "(:$$block (:$let :f (:$$block (:$$lambda [x] (:$$block :x)))))", + "(:$$_block_$$ (:$let :f (:$$_block_$$ (:$$_lambda_$$ [x] (:$$_block_$$ :x)))))", ~v="{f: lambda(x=>internal code)}", (), ) testToExpression( "f(x)=x", - "(:$$block (:$let :f (:$$lambda [x] (:$$block :x))))", + "(:$$_block_$$ (:$let :f (:$$_lambda_$$ [x] (:$$_block_$$ :x))))", ~v="{f: lambda(x=>internal code)}", (), ) // Function definitions are lambda assignments testToExpression( "f(x)=x ? 1 : 0", - "(:$$block (:$let :f (:$$lambda [x] (:$$block (:$$ternary :x 1 0)))))", + "(:$$_block_$$ (:$let :f (:$$_lambda_$$ [x] (:$$_block_$$ (:$$_ternary_$$ :x 1 0)))))", ~v="{f: lambda(x=>internal code)}", (), ) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res index ecc2ab40..b780a537 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res @@ -5,7 +5,7 @@ open Reducer_TestHelpers describe("Eval with Bindings", () => { testEvalBindingsToBe("x", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(1)") testEvalBindingsToBe("x+1", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(2)") - testParseToBe("y = x+1; y", "Ok((:$$block (:$let :y (:$$block (:add :x 1))) :y))") + testParseToBe("y = x+1; y", "Ok((:$$_block_$$ (:$let :y (:$$_block_$$ (:add :x 1))) :y))") testEvalBindingsToBe("y = x+1; y", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(2)") testEvalBindingsToBe("y = x+1", list{("x", ExpressionValue.EvNumber(1.))}, "Ok({x: 1,y: 2})") }) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res index bb3e2220..6dacbdd2 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res @@ -2,8 +2,8 @@ open Jest open Reducer_TestHelpers describe("Parse function assignment", () => { - testParseToBe("f(x)=x", "Ok((:$$block (:$let :f (:$$lambda [x] (:$$block :x)))))") - testParseToBe("f(x)=2*x", "Ok((:$$block (:$let :f (:$$lambda [x] (:$$block (:multiply 2 :x))))))") + testParseToBe("f(x)=x", "Ok((:$$_block_$$ (:$let :f (:$$_lambda_$$ [x] (:$$_block_$$ :x)))))") + testParseToBe("f(x)=2*x", "Ok((:$$_block_$$ (:$let :f (:$$_lambda_$$ [x] (:$$_block_$$ (:multiply 2 :x))))))") //MathJs does not allow blocks in function definitions }) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res index 4cc6cb3a..2a82f510 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res @@ -51,7 +51,7 @@ describe("call and bindings", () => { ) testParseToBe( "f=99; g(x)=f; g(2)", - "Ok((:$$block (:$let :f (:$$block 99)) (:$let :g (:$$lambda [x] (:$$block :f))) (:g 2)))", + "Ok((:$$_block_$$ (:$let :f (:$$_block_$$ 99)) (:$let :g (:$$_lambda_$$ [x] (:$$_block_$$ :f))) (:g 2)))", ) testEvalToBe("f=99; g(x)=f; g(2)", "Ok(99)") testEvalToBe("f(x)=x; g(x)=f(x); g(2)", "Ok(2)") diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_ternaryOperator_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_ternaryOperator_test.res index c0311450..57b44156 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_ternaryOperator_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_ternaryOperator_test.res @@ -2,7 +2,7 @@ open Jest open Reducer_TestHelpers describe("Parse ternary operator", () => { - testParseToBe("true ? 'YES' : 'NO'", "Ok((:$$block (:$$ternary true 'YES' 'NO')))") + testParseToBe("true ? 'YES' : 'NO'", "Ok((:$$_block_$$ (:$$_ternary_$$ true 'YES' 'NO')))") }) describe("Evaluate ternary operator", () => { diff --git a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res index 48bdcaa5..4e4d12ff 100644 --- a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res +++ b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res @@ -123,34 +123,34 @@ describe("eval on distribution functions", () => { describe("parse on distribution functions", () => { describe("power", () => { - testParse("normal(5,2) ^ normal(5,1)", "Ok((:$$block (:pow (:normal 5 2) (:normal 5 1))))") - testParse("3 ^ normal(5,1)", "Ok((:$$block (:pow 3 (:normal 5 1))))") - testParse("normal(5,2) ^ 3", "Ok((:$$block (:pow (:normal 5 2) 3)))") + testParse("normal(5,2) ^ normal(5,1)", "Ok((:$$_block_$$ (:pow (:normal 5 2) (:normal 5 1))))") + testParse("3 ^ normal(5,1)", "Ok((:$$_block_$$ (:pow 3 (:normal 5 1))))") + testParse("normal(5,2) ^ 3", "Ok((:$$_block_$$ (:pow (:normal 5 2) 3)))") }) describe("subtraction", () => { - testParse("10 - normal(5,1)", "Ok((:$$block (:subtract 10 (:normal 5 1))))") - testParse("normal(5,1) - 10", "Ok((:$$block (:subtract (:normal 5 1) 10)))") + testParse("10 - normal(5,1)", "Ok((:$$_block_$$ (:subtract 10 (:normal 5 1))))") + testParse("normal(5,1) - 10", "Ok((:$$_block_$$ (:subtract (:normal 5 1) 10)))") }) describe("pointwise arithmetic expressions", () => { testParse(~skip=true, "normal(5,2) .+ normal(5,1)", "Ok((:dotAdd (:normal 5 2) (:normal 5 1)))") testParse( ~skip=true, "normal(5,2) .- normal(5,1)", - "Ok((:$$block (:dotSubtract (:normal 5 2) (:normal 5 1))))", - // TODO: !!! returns "Ok((:$$block (:dotPow (:normal 5 2) (:normal 5 1))))" + "Ok((:$$_block_$$ (:dotSubtract (:normal 5 2) (:normal 5 1))))", + // TODO: !!! returns "Ok((:$$_block_$$ (:dotPow (:normal 5 2) (:normal 5 1))))" ) testParse( "normal(5,2) .* normal(5,1)", - "Ok((:$$block (:dotMultiply (:normal 5 2) (:normal 5 1))))", + "Ok((:$$_block_$$ (:dotMultiply (:normal 5 2) (:normal 5 1))))", ) testParse( "normal(5,2) ./ normal(5,1)", - "Ok((:$$block (:dotDivide (:normal 5 2) (:normal 5 1))))", + "Ok((:$$_block_$$ (:dotDivide (:normal 5 2) (:normal 5 1))))", ) - testParse("normal(5,2) .^ normal(5,1)", "Ok((:$$block (:dotPow (:normal 5 2) (:normal 5 1))))") + testParse("normal(5,2) .^ normal(5,1)", "Ok((:$$_block_$$ (:dotPow (:normal 5 2) (:normal 5 1))))") }) describe("equality", () => { - testParse("5 == normal(5,2)", "Ok((:$$block (:equal 5 (:normal 5 2))))") + testParse("5 == normal(5,2)", "Ok((:$$_block_$$ (:equal 5 (:normal 5 2))))") }) describe("pointwise adding two normals", () => { testParse(~skip=true, "normal(5,2) .+ normal(5,1)", "Ok((:dotAdd (:normal 5 2) (:normal 5 1)))") diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res index afb9ec26..12fb7ddc 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res @@ -157,31 +157,31 @@ let dispatchMacroCall = ( > => switch aList { | list{ - ExpressionT.EValue(EvCall("$$bindStatement")), + ExpressionT.EValue(EvCall("$$_bindStatement_$$")), bindingExpr: ExpressionT.expression, statement, } => doBindStatement(bindingExpr, statement, environment) - | list{ExpressionT.EValue(EvCall("$$bindStatement")), statement} => + | list{ExpressionT.EValue(EvCall("$$_bindStatement_$$")), statement} => // bindings of the context are used when there is no binding expression doBindStatement(eRecord(Bindings.toExternalBindings(bindings)), statement, environment) | list{ - ExpressionT.EValue(EvCall("$$bindExpression")), + ExpressionT.EValue(EvCall("$$_bindExpression_$$")), bindingExpr: ExpressionT.expression, expression, } => doBindExpression(bindingExpr, expression, environment) - | list{ExpressionT.EValue(EvCall("$$bindExpression")), expression} => + | list{ExpressionT.EValue(EvCall("$$_bindExpression_$$")), expression} => // bindings of the context are used when there is no binding expression doBindExpression(eRecord(Bindings.toExternalBindings(bindings)), expression, environment) - | list{ExpressionT.EValue(EvCall("$$block")), ...exprs} => doBlock(exprs, bindings, environment) + | list{ExpressionT.EValue(EvCall("$$_block_$$")), ...exprs} => doBlock(exprs, bindings, environment) | list{ - ExpressionT.EValue(EvCall("$$lambda")), + ExpressionT.EValue(EvCall("$$_lambda_$$")), ExpressionT.EValue(EvArrayString(parameters)), lambdaDefinition, } => doLambdaDefinition(bindings, parameters, lambdaDefinition) - | list{ExpressionT.EValue(EvCall("$$ternary")), condition, ifTrue, ifFalse} => + | list{ExpressionT.EValue(EvCall("$$_ternary_$$")), condition, ifTrue, ifFalse} => doTernary(condition, ifTrue, ifFalse, bindings, environment) | _ => ExpressionWithContext.noContext(ExpressionT.EList(aList))->Ok } diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res index 7ccea9fc..761dc901 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res @@ -48,19 +48,19 @@ let eSymbol = (name: string): expression => name->BExpressionValue.EvSymbol->BEx let eList = (list: list): expression => list->BExpressionT.EList -let eBlock = (exprs: list): expression => eFunction("$$block", exprs) +let eBlock = (exprs: list): expression => eFunction("$$_block_$$", exprs) let eLetStatement = (symbol: string, valueExpression: expression): expression => eFunction("$let", list{eSymbol(symbol), valueExpression}) let eBindStatement = (bindingExpr: expression, letStatement: expression): expression => - eFunction("$$bindStatement", list{bindingExpr, letStatement}) + eFunction("$$_bindStatement_$$", list{bindingExpr, letStatement}) let eBindStatementDefault = (letStatement: expression): expression => - eFunction("$$bindStatement", list{letStatement}) + eFunction("$$_bindStatement_$$", list{letStatement}) let eBindExpression = (bindingExpr: expression, expression: expression): expression => - eFunction("$$bindExpression", list{bindingExpr, expression}) + eFunction("$$_bindExpression_$$", list{bindingExpr, expression}) let eBindExpressionDefault = (expression: expression): expression => - eFunction("$$bindExpression", list{expression}) + eFunction("$$_bindExpression_$$", list{expression}) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index 0a01b5fd..f6608aa6 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -36,7 +36,7 @@ var postOperatorToFunction = { '.': '$atIndex', - '()': '$$applyAll', + '()': '$$_applyAll_$$', '[]': '$atIndex', } @@ -46,10 +46,10 @@ function nodeExpression(args) {return {type: 'Expression', nodes: args}} function nodeFloat(value) {return {type: 'Float', value: value}} function makeFunctionCall(fn, args) { - if (fn === '$$applyAll') { + if (fn === '$$_applyAll_$$') { // Any list of values is applied from left to right anyway. // Like in Haskell and Lisp. - // So we remove the redundant $$applyAll. + // So we remove the redundant $$_applyAll_$$. if (args[0].type === "Identifier") {args[0].type = "CallIdentifier"} return nodeExpression(args) } else { diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy index 5cb6245e..38561598 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy @@ -32,7 +32,7 @@ var postOperatorToFunction = { '.': '$atIndex', - '()': '$$applyAll', + '()': '$$_applyAll_$$', '[]': '$atIndex', } @@ -42,10 +42,10 @@ function nodeExpression(args) {return {type: 'Expression', nodes: args}} function nodeFloat(value) {return {type: 'Float', value: value}} function makeFunctionCall(fn, args) { - if (fn === '$$applyAll') { + if (fn === '$$_applyAll_$$') { // Any list of values is applied from left to right anyway. // Like in Haskell and Lisp. - // So we remove the redundant $$applyAll. + // So we remove the redundant $$_applyAll_$$. if (args[0].type === "Identifier") {args[0].type = "CallIdentifier"} return nodeExpression(args) } else { diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_Parse.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_Parse.res index 22b0142f..313639fb 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_Parse.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_Parse.res @@ -92,7 +92,7 @@ let rec pgToString = (peggyNode: peggyNode): string => { pgToString(PgNodeIdentifier(node["variable"])) ++ " = " ++ toString(node["value"]) | PgNodeString(node) => `'${node["value"]->Js.String.make}'` | PgNodeTernary(node) => - "(::$$ternary " ++ + "(::$$_ternary_$$ " ++ toString(node["condition"]) ++ " " ++ toString(node["trueExpression"]) ++ diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res index 1ce41459..a9d4fb22 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression.res @@ -14,7 +14,7 @@ let rec fromNode = (node: Parse.node): expression => { ->Js.Array2.map((argNode: Parse.nodeIdentifier) => argNode["value"]) ->ExpressionBuilder.eArrayString let body = nodeLambda["body"]->caseBlock - ExpressionBuilder.eFunction("$$lambda", list{args, body}) + ExpressionBuilder.eFunction("$$_lambda_$$", list{args, body}) } switch Parse.castNodeType(node) { @@ -37,7 +37,7 @@ let rec fromNode = (node: Parse.node): expression => { | PgNodeString(nodeString) => ExpressionBuilder.eString(nodeString["value"]) | PgNodeTernary(nodeTernary) => ExpressionBuilder.eFunction( - "$$ternary", + "$$_ternary_$$", list{ fromNode(nodeTernary["condition"]), fromNode(nodeTernary["trueExpression"]), From c747bf0118a6d01134563a77fd79d52bab331150 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 15:11:06 +0000 Subject: [PATCH 182/340] :arrow_up: Bump @storybook/manager-webpack5 from 6.5.2 to 6.5.3 Bumps [@storybook/manager-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.3/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.3/lib/core) --- updated-dependencies: - dependency-name: "@storybook/manager-webpack5" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 75 +++++++++++++++++++++++++++----- 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index f550b3a6..ab62b6fc 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -22,7 +22,7 @@ "@storybook/addon-essentials": "^6.5.3", "@storybook/addon-links": "^6.5.3", "@storybook/builder-webpack5": "^6.5.3", - "@storybook/manager-webpack5": "^6.5.2", + "@storybook/manager-webpack5": "^6.5.3", "@storybook/node-logger": "^6.4.22", "@storybook/preset-create-react-app": "^4.1.0", "@storybook/react": "^6.5.2", diff --git a/yarn.lock b/yarn.lock index 9df66188..d424b568 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3139,6 +3139,17 @@ global "^4.4.0" telejson "^6.0.8" +"@storybook/channel-websocket@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.3.tgz#3403d30c107763db311b084a0f6586c755ca64f0" + integrity sha512-Q1XCqtVMZFP1WG+OtzJ5l0Ip8umzBOkVmH3SH+DDU+o+MCSSfXKbw7UnbDUaZHzOHuFq55WaXVEnzRkeydI9rQ== + dependencies: + "@storybook/channels" "6.5.3" + "@storybook/client-logger" "6.5.3" + core-js "^3.8.2" + global "^4.4.0" + telejson "^6.0.8" + "@storybook/channels@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.2.tgz#ca964ee7d39874f4a7e450345a432c1681007995" @@ -3281,6 +3292,32 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" +"@storybook/core-client@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.3.tgz#9c689a5f6797dc7afe60183c29502e496bbd0a07" + integrity sha512-tsyXs+J7e210lRWminzyQU5uvbiKq9XrzsMs6feGyCE3kjZbBCj7RIgd/KxStVT/Ssim6BeTXHfnlLTxLbq5pQ== + dependencies: + "@storybook/addons" "6.5.3" + "@storybook/channel-postmessage" "6.5.3" + "@storybook/channel-websocket" "6.5.3" + "@storybook/client-api" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/core-events" "6.5.3" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/preview-web" "6.5.3" + "@storybook/store" "6.5.3" + "@storybook/ui" "6.5.3" + airbnb-js-shims "^2.2.1" + ansi-to-html "^0.6.11" + core-js "^3.8.2" + global "^4.4.0" + lodash "^4.17.21" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + ts-dedent "^2.0.0" + unfetch "^4.2.0" + util-deprecate "^1.0.2" + "@storybook/core-common@6.5.2": version "6.5.2" resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.2.tgz#3248510f4d80c8159dfbad2fa28c257677247ede" @@ -3560,20 +3597,20 @@ webpack-dev-middleware "^3.7.3" webpack-virtual-modules "^0.2.2" -"@storybook/manager-webpack5@^6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/manager-webpack5/-/manager-webpack5-6.5.2.tgz#053a48a06560cdd4a3f3e4dcec3ef8e8737846dd" - integrity sha512-aCk7THztQG2Qo2b+0J2KcR2C6leeQw0XHbodlpRiTr6woXfs4q9xZX88Ujl40q1oZQhb19LMBrac90Es1e2I5w== +"@storybook/manager-webpack5@^6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/manager-webpack5/-/manager-webpack5-6.5.3.tgz#63cd2fe547653c5489f301db954016bed4ab9d29" + integrity sha512-AJpx2cpiBXt6lVHxe2ZaBWTXqq8/GNXfFKXuBRTvLM0ZqiY3HcohUmgpWs56OC2JUwunbZiS0nvxA3dzQmuBZg== dependencies: "@babel/core" "^7.12.10" "@babel/plugin-transform-template-literals" "^7.12.1" "@babel/preset-react" "^7.12.10" - "@storybook/addons" "6.5.2" - "@storybook/core-client" "6.5.2" - "@storybook/core-common" "6.5.2" - "@storybook/node-logger" "6.5.2" - "@storybook/theming" "6.5.2" - "@storybook/ui" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/core-client" "6.5.3" + "@storybook/core-common" "6.5.3" + "@storybook/node-logger" "6.5.3" + "@storybook/theming" "6.5.3" + "@storybook/ui" "6.5.3" "@types/node" "^14.0.10 || ^16.0.0" babel-loader "^8.0.0" case-sensitive-paths-webpack-plugin "^2.3.0" @@ -3892,6 +3929,24 @@ regenerator-runtime "^0.13.7" resolve-from "^5.0.0" +"@storybook/ui@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.3.tgz#afa7a327c71350e9f92628b86c7f14d58427ec3c" + integrity sha512-TLJBfXHFM0ilMuUjer4AjhnNGvQ7lI4GYIKzuCjCrw/ukfUb1AABXd9fdHq7tEzVm8z7T3pyrRVsb1VVdbxL0A== + dependencies: + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/channels" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/components" "6.5.3" + "@storybook/core-events" "6.5.3" + "@storybook/router" "6.5.3" + "@storybook/semver" "^7.3.2" + "@storybook/theming" "6.5.3" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + resolve-from "^5.0.0" + "@surma/rollup-plugin-off-main-thread@^2.2.3": version "2.2.3" resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053" From 1557c197a0165de12e2d205bf64129a993183724 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Fri, 20 May 2022 17:11:32 +0200 Subject: [PATCH 183/340] renamed internal variables starting with $ so that they are not overriden by $ variables in Squigle --- .../Reducer_Dispatch_BuiltInMacros_test.res | 20 ++++----- .../Reducer_Peggy_Parse_test.res | 42 +++++++++---------- .../Reducer_Peggy_ToExpression_test.res | 38 ++++++++--------- .../Reducer/Reducer_externalBindings_test.res | 2 +- .../Reducer_functionAssignment_test.res | 4 +- .../Reducer/Reducer_functionTricks_test.res | 2 +- .../Reducer_Dispatch_BuiltIn.res | 12 +++--- .../Reducer_Dispatch_BuiltInMacros.res | 12 +++--- .../Reducer_Expression_ExpressionBuilder.res | 2 +- .../Reducer_Peggy_GeneratedParser.js | 10 ++--- .../Reducer_Peggy_GeneratedParser.peggy | 10 ++--- 11 files changed, 77 insertions(+), 77 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res index 993eff10..f1acfd3a 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res @@ -19,7 +19,7 @@ describe("bindStatement", () => { testMacro( [], eBindStatement(eBindings([]), exampleStatementY), - "Ok((:$setBindings {} :y 1) context: {})", + "Ok((:$_setBindings_$ {} :y 1) context: {})", ) // Then it answers the bindings for the next statement when reduced testMacroEval([], eBindStatement(eBindings([]), exampleStatementY), "Ok({y: 1})") @@ -27,7 +27,7 @@ describe("bindStatement", () => { testMacro( [], eBindStatement(eBindings([("x", EvNumber(2.))]), exampleStatementX), - "Ok((:$setBindings {x: 2} :y 2) context: {x: 2})", + "Ok((:$_setBindings_$ {x: 2} :y 2) context: {x: 2})", ) // An expression does not return a binding, thus error testMacro([], eBindStatement(eBindings([]), exampleExpression), "Assignment expected") @@ -35,7 +35,7 @@ describe("bindStatement", () => { testMacro( [("z", EvNumber(99.))], eBindStatementDefault(exampleStatementY), - "Ok((:$setBindings {z: 99} :y 1) context: {z: 99})", + "Ok((:$_setBindings_$ {z: 99} :y 1) context: {z: 99})", ) }) @@ -50,7 +50,7 @@ describe("bindExpression", () => { testMacro( [], eBindExpression(eBindings([("x", EvNumber(2.))]), exampleStatementY), - "Ok((:$exportBindings (:$setBindings {x: 2} :y 1)) context: {x: 2})", + "Ok((:$_exportBindings_$ (:$_setBindings_$ {x: 2} :y 1)) context: {x: 2})", ) // Now let's reduce that expression testMacroEval( @@ -71,20 +71,20 @@ describe("block", () => { testMacro([], eBlock(list{exampleExpression}), "Ok((:$$_bindExpression_$$ 1))") testMacroEval([], eBlock(list{exampleExpression}), "Ok(1)") // Block with a single statement - testMacro([], eBlock(list{exampleStatementY}), "Ok((:$$_bindExpression_$$ (:$let :y 1)))") + testMacro([], eBlock(list{exampleStatementY}), "Ok((:$$_bindExpression_$$ (:$_let_$ :y 1)))") testMacroEval([], eBlock(list{exampleStatementY}), "Ok({y: 1})") // Block with a statement and an expression testMacro( [], eBlock(list{exampleStatementY, exampleExpressionY}), - "Ok((:$$_bindExpression_$$ (:$$_bindStatement_$$ (:$let :y 1)) :y))", + "Ok((:$$_bindExpression_$$ (:$$_bindStatement_$$ (:$_let_$ :y 1)) :y))", ) testMacroEval([], eBlock(list{exampleStatementY, exampleExpressionY}), "Ok(1)") // Block with a statement and another statement testMacro( [], eBlock(list{exampleStatementY, exampleStatementZ}), - "Ok((:$$_bindExpression_$$ (:$$_bindStatement_$$ (:$let :y 1)) (:$let :z :y)))", + "Ok((:$$_bindExpression_$$ (:$$_bindStatement_$$ (:$_let_$ :y 1)) (:$_let_$ :z :y)))", ) testMacroEval([], eBlock(list{exampleStatementY, exampleStatementZ}), "Ok({y: 1,z: 1})") // Block inside a block @@ -98,7 +98,7 @@ describe("block", () => { testMacro( [], eBlock(list{eLetStatement("z", eBlock(list{eBlock(list{exampleExpressionY})}))}), - "Ok((:$$_bindExpression_$$ (:$let :z (:$$_block_$$ (:$$_block_$$ :y)))))", + "Ok((:$$_bindExpression_$$ (:$_let_$ :z (:$$_block_$$ (:$$_block_$$ :y)))))", ) testMacroEval( [], @@ -107,7 +107,7 @@ describe("block", () => { ) // Empty block testMacro([], eBlock(list{}), "Ok(:undefined block)") //TODO: should be an error - // :$$_block_$$ (:$$_block_$$ (:$let :y (:add :x 1)) :y)" + // :$$_block_$$ (:$$_block_$$ (:$_let_$ :y (:add :x 1)) :y)" testMacro( [], eBlock(list{ @@ -116,7 +116,7 @@ describe("block", () => { eSymbol("y"), }), }), - "Ok((:$$_bindExpression_$$ (:$$_block_$$ (:$let :y (:add :x 1)) :y)))", + "Ok((:$$_bindExpression_$$ (:$$_block_$$ (:$_let_$ :y (:add :x 1)) :y)))", ) testMacroEval( [("x", EvNumber(1.))], diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 84957dff..3c2381cb 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -49,8 +49,8 @@ describe("Peggy parse", () => { testParse("-1", "{(::unaryMinus 1)}") testParse("!true", "{(::not true)}") testParse("1 + -1", "{(::add 1 (::unaryMinus 1))}") - testParse("-a[0]", "{(::unaryMinus (::$atIndex :a 0))}") - testParse("!a[0]", "{(::not (::$atIndex :a 0))}") + testParse("-a[0]", "{(::unaryMinus (::$_atIndex_$ :a 0))}") + testParse("!a[0]", "{(::not (::$_atIndex_$ :a 0))}") }) describe("multiplicative", () => { @@ -75,7 +75,7 @@ describe("Peggy parse", () => { "1 * 2 - 3 * 4^5^6", "{(::subtract (::multiply 1 2) (::multiply 3 (::pow (::pow 4 5) 6)))}", ) - testParse("1 * -a[-2]", "{(::multiply 1 (::unaryMinus (::$atIndex :a (::unaryMinus 2))))}") + testParse("1 * -a[-2]", "{(::multiply 1 (::unaryMinus (::$_atIndex_$ :a (::unaryMinus 2))))}") }) describe("multi-line", () => { @@ -95,23 +95,23 @@ describe("Peggy parse", () => { }) describe("arrays", () => { - testParse("[]", "{(::$constructArray ())}") - testParse("[0, 1, 2]", "{(::$constructArray (0 1 2))}") - testParse("['hello', 'world']", "{(::$constructArray ('hello' 'world'))}") - testParse("([0,1,2])[1]", "{(::$atIndex (::$constructArray (0 1 2)) 1)}") + testParse("[]", "{(::$_constructArray_$ ())}") + testParse("[0, 1, 2]", "{(::$_constructArray_$ (0 1 2))}") + testParse("['hello', 'world']", "{(::$_constructArray_$ ('hello' 'world'))}") + testParse("([0,1,2])[1]", "{(::$_atIndex_$ (::$_constructArray_$ (0 1 2)) 1)}") }) describe("records", () => { - testParse("{a: 1, b: 2}", "{(::$constructRecord ('a': 1 'b': 2))}") - testParse("{1+0: 1, 2+0: 2}", "{(::$constructRecord ((::add 1 0): 1 (::add 2 0): 2))}") // key can be any expression - testParse("record.property", "{(::$atIndex :record 'property')}") + testParse("{a: 1, b: 2}", "{(::$_constructRecord_$ ('a': 1 'b': 2))}") + testParse("{1+0: 1, 2+0: 2}", "{(::$_constructRecord_$ ((::add 1 0): 1 (::add 2 0): 2))}") // key can be any expression + testParse("record.property", "{(::$_atIndex_$ :record 'property')}") }) describe("post operators", () => { //function call, array and record access are post operators with higher priority than unary operators testParse("a==!b(1)", "{(::equal :a (::not (::b 1)))}") - testParse("a==!b[1]", "{(::equal :a (::not (::$atIndex :b 1)))}") - testParse("a==!b.one", "{(::equal :a (::not (::$atIndex :b 'one')))}") + testParse("a==!b[1]", "{(::equal :a (::not (::$_atIndex_$ :b 1)))}") + testParse("a==!b.one", "{(::equal :a (::not (::$_atIndex_$ :b 'one')))}") }) describe("comments", () => { @@ -158,8 +158,8 @@ describe("Peggy parse", () => { testParse("a && b<=c || d", "{(::or (::and :a (::smallerEq :b :c)) :d)}") testParse("a && b>c || d", "{(::or (::and :a (::larger :b :c)) :d)}") testParse("a && b { describe("pipe", () => { testParse("1 -> add(2)", "{(::add 1 2)}") testParse("-1 -> add(2)", "{(::add (::unaryMinus 1) 2)}") - testParse("-a[1] -> add(2)", "{(::add (::unaryMinus (::$atIndex :a 1)) 2)}") + testParse("-a[1] -> add(2)", "{(::add (::unaryMinus (::$_atIndex_$ :a 1)) 2)}") testParse("-f(1) -> add(2)", "{(::add (::unaryMinus (::f 1)) 2)}") testParse("1 + 2 -> add(3)", "{(::add 1 (::add 2 3))}") testParse("1 -> add(2) * 3", "{(::multiply (::add 1 2) 3)}") @@ -198,11 +198,11 @@ describe("Peggy parse", () => { testParse("-1 to -2", "{(::credibleIntervalToDistribution (::unaryMinus 1) (::unaryMinus 2))}") // lower than unary testParse( "a[1] to a[2]", - "{(::credibleIntervalToDistribution (::$atIndex :a 1) (::$atIndex :a 2))}", + "{(::credibleIntervalToDistribution (::$_atIndex_$ :a 1) (::$_atIndex_$ :a 2))}", ) // lower than post testParse( "a.p1 to a.p2", - "{(::credibleIntervalToDistribution (::$atIndex :a 'p1') (::$atIndex :a 'p2'))}", + "{(::credibleIntervalToDistribution (::$_atIndex_$ :a 'p1') (::$_atIndex_$ :a 'p2'))}", ) // lower than post testParse("1 to 2 + 3", "{(::add (::credibleIntervalToDistribution 1 2) 3)}") // higher than binary operators testParse( @@ -231,21 +231,21 @@ describe("Peggy parse", () => { ) testParse( "myadd(x,y)=x+y; z=[myadd]; z", - "{:myadd = {|:x,:y| {(::add :x :y)}}; :z = {(::$constructArray (:myadd))}; :z}", + "{:myadd = {|:x,:y| {(::add :x :y)}}; :z = {(::$_constructArray_$ (:myadd))}; :z}", ) testParse( "myaddd(x,y)=x+y; z={x: myaddd}; z", - "{:myaddd = {|:x,:y| {(::add :x :y)}}; :z = {(::$constructRecord ('x': :myaddd))}; :z}", + "{:myaddd = {|:x,:y| {(::add :x :y)}}; :z = {(::$_constructRecord_$ ('x': :myaddd))}; :z}", ) testParse("f({|x| x+1})", "{(::f {|:x| {(::add :x 1)}})}") testParse("map(arr, {|x| x+1})", "{(::map :arr {|:x| {(::add :x 1)}})}") testParse( "map([1,2,3], {|x| x+1})", - "{(::map (::$constructArray (1 2 3)) {|:x| {(::add :x 1)}})}", + "{(::map (::$_constructArray_$ (1 2 3)) {|:x| {(::add :x 1)}})}", ) testParse( "[1,2,3]->map({|x| x+1})", - "{(::map (::$constructArray (1 2 3)) {|:x| {(::add :x 1)}})}", + "{(::map (::$_constructArray_$ (1 2 3)) {|:x| {(::add :x 1)}})}", ) }) }) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res index 9e857db5..2c676c8f 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res @@ -53,48 +53,48 @@ describe("Peggy to Expression", () => { testToExpression("-1", "(:$$_block_$$ (:unaryMinus 1))", ~v="-1", ()) testToExpression("!true", "(:$$_block_$$ (:not true))", ~v="false", ()) testToExpression("1 + -1", "(:$$_block_$$ (:add 1 (:unaryMinus 1)))", ~v="0", ()) - testToExpression("-a[0]", "(:$$_block_$$ (:unaryMinus (:$atIndex :a 0)))", ()) + testToExpression("-a[0]", "(:$$_block_$$ (:unaryMinus (:$_atIndex_$ :a 0)))", ()) }) describe("multi-line", () => { - testToExpression("x=1; 2", "(:$$_block_$$ (:$let :x (:$$_block_$$ 1)) 2)", ~v="2", ()) + testToExpression("x=1; 2", "(:$$_block_$$ (:$_let_$ :x (:$$_block_$$ 1)) 2)", ~v="2", ()) testToExpression( "x=1; y=2", - "(:$$_block_$$ (:$let :x (:$$_block_$$ 1)) (:$let :y (:$$_block_$$ 2)))", + "(:$$_block_$$ (:$_let_$ :x (:$$_block_$$ 1)) (:$_let_$ :y (:$$_block_$$ 2)))", ~v="{x: 1,y: 2}", (), ) }) describe("variables", () => { - testToExpression("x = 1", "(:$$_block_$$ (:$let :x (:$$_block_$$ 1)))", ~v="{x: 1}", ()) + testToExpression("x = 1", "(:$$_block_$$ (:$_let_$ :x (:$$_block_$$ 1)))", ~v="{x: 1}", ()) testToExpression("x", "(:$$_block_$$ :x)", ~v=":x", ()) //TODO: value should return error - testToExpression("x = 1; x", "(:$$_block_$$ (:$let :x (:$$_block_$$ 1)) :x)", ~v="1", ()) + testToExpression("x = 1; x", "(:$$_block_$$ (:$_let_$ :x (:$$_block_$$ 1)) :x)", ~v="1", ()) }) describe("functions", () => { testToExpression( "identity(x) = x", - "(:$$_block_$$ (:$let :identity (:$$_lambda_$$ [x] (:$$_block_$$ :x))))", + "(:$$_block_$$ (:$_let_$ :identity (:$$_lambda_$$ [x] (:$$_block_$$ :x))))", ~v="{identity: lambda(x=>internal code)}", (), ) // Function definitions become lambda assignments testToExpression("identity(x)", "(:$$_block_$$ (:identity :x))", ()) // Note value returns error properly - testToExpression("f(x) = x> 2 ? 0 : 1; f(3)", "(:$$_block_$$ (:$let :f (:$$_lambda_$$ [x] (:$$_block_$$ (:$$_ternary_$$ (:larger :x 2) 0 1)))) (:f 3))", ~v="0", ()) + testToExpression("f(x) = x> 2 ? 0 : 1; f(3)", "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ (:$$_ternary_$$ (:larger :x 2) 0 1)))) (:f 3))", ~v="0", ()) }) describe("arrays", () => { - testToExpression("[]", "(:$$_block_$$ (:$constructArray ()))", ~v="[]", ()) - testToExpression("[0, 1, 2]", "(:$$_block_$$ (:$constructArray (0 1 2)))", ~v="[0,1,2]", ()) + testToExpression("[]", "(:$$_block_$$ (:$_constructArray_$ ()))", ~v="[]", ()) + testToExpression("[0, 1, 2]", "(:$$_block_$$ (:$_constructArray_$ (0 1 2)))", ~v="[0,1,2]", ()) testToExpression( "['hello', 'world']", - "(:$$_block_$$ (:$constructArray ('hello' 'world')))", + "(:$$_block_$$ (:$_constructArray_$ ('hello' 'world')))", ~v="['hello','world']", (), ) testToExpression( "([0,1,2])[1]", - "(:$$_block_$$ (:$atIndex (:$constructArray (0 1 2)) 1))", + "(:$$_block_$$ (:$_atIndex_$ (:$_constructArray_$ (0 1 2)) 1))", ~v="1", (), ) @@ -103,19 +103,19 @@ describe("Peggy to Expression", () => { describe("records", () => { testToExpression( "{a: 1, b: 2}", - "(:$$_block_$$ (:$constructRecord (('a' 1) ('b' 2))))", + "(:$$_block_$$ (:$_constructRecord_$ (('a' 1) ('b' 2))))", ~v="{a: 1,b: 2}", (), ) testToExpression( "{1+0: 1, 2+0: 2}", - "(:$$_block_$$ (:$constructRecord (((:add 1 0) 1) ((:add 2 0) 2))))", + "(:$$_block_$$ (:$_constructRecord_$ (((:add 1 0) 1) ((:add 2 0) 2))))", (), ) // key can be any expression - testToExpression("record.property", "(:$$_block_$$ (:$atIndex :record 'property'))", ()) + testToExpression("record.property", "(:$$_block_$$ (:$_atIndex_$ :record 'property'))", ()) testToExpression( "record={property: 1}; record.property", - "(:$$_block_$$ (:$let :record (:$$_block_$$ (:$constructRecord (('property' 1))))) (:$atIndex :record 'property'))", + "(:$$_block_$$ (:$_let_$ :record (:$$_block_$$ (:$_constructRecord_$ (('property' 1))))) (:$_atIndex_$ :record 'property'))", ~v="1", (), ) @@ -180,7 +180,7 @@ describe("Peggy to Expression", () => { // Like lambdas they have a local scope. testToExpression( "y=99; x={y=1; y}", - "(:$$_block_$$ (:$let :y (:$$_block_$$ 99)) (:$let :x (:$$_block_$$ (:$let :y (:$$_block_$$ 1)) :y)))", + "(:$$_block_$$ (:$_let_$ :y (:$$_block_$$ 99)) (:$_let_$ :x (:$$_block_$$ (:$_let_$ :y (:$$_block_$$ 1)) :y)))", ~v="{x: 1,y: 99}", (), ) @@ -196,19 +196,19 @@ describe("Peggy to Expression", () => { ) testToExpression( "f={|x| x}", - "(:$$_block_$$ (:$let :f (:$$_block_$$ (:$$_lambda_$$ [x] (:$$_block_$$ :x)))))", + "(:$$_block_$$ (:$_let_$ :f (:$$_block_$$ (:$$_lambda_$$ [x] (:$$_block_$$ :x)))))", ~v="{f: lambda(x=>internal code)}", (), ) testToExpression( "f(x)=x", - "(:$$_block_$$ (:$let :f (:$$_lambda_$$ [x] (:$$_block_$$ :x))))", + "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ :x))))", ~v="{f: lambda(x=>internal code)}", (), ) // Function definitions are lambda assignments testToExpression( "f(x)=x ? 1 : 0", - "(:$$_block_$$ (:$let :f (:$$_lambda_$$ [x] (:$$_block_$$ (:$$_ternary_$$ :x 1 0)))))", + "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ (:$$_ternary_$$ :x 1 0)))))", ~v="{f: lambda(x=>internal code)}", (), ) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res index b780a537..c47879b3 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res @@ -5,7 +5,7 @@ open Reducer_TestHelpers describe("Eval with Bindings", () => { testEvalBindingsToBe("x", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(1)") testEvalBindingsToBe("x+1", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(2)") - testParseToBe("y = x+1; y", "Ok((:$$_block_$$ (:$let :y (:$$_block_$$ (:add :x 1))) :y))") + testParseToBe("y = x+1; y", "Ok((:$$_block_$$ (:$_let_$ :y (:$$_block_$$ (:add :x 1))) :y))") testEvalBindingsToBe("y = x+1; y", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(2)") testEvalBindingsToBe("y = x+1", list{("x", ExpressionValue.EvNumber(1.))}, "Ok({x: 1,y: 2})") }) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res index 6dacbdd2..2bd1498a 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res @@ -2,8 +2,8 @@ open Jest open Reducer_TestHelpers describe("Parse function assignment", () => { - testParseToBe("f(x)=x", "Ok((:$$_block_$$ (:$let :f (:$$_lambda_$$ [x] (:$$_block_$$ :x)))))") - testParseToBe("f(x)=2*x", "Ok((:$$_block_$$ (:$let :f (:$$_lambda_$$ [x] (:$$_block_$$ (:multiply 2 :x))))))") + testParseToBe("f(x)=x", "Ok((:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ :x)))))") + testParseToBe("f(x)=2*x", "Ok((:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ (:multiply 2 :x))))))") //MathJs does not allow blocks in function definitions }) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res index 2a82f510..ba29e920 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res @@ -51,7 +51,7 @@ describe("call and bindings", () => { ) testParseToBe( "f=99; g(x)=f; g(2)", - "Ok((:$$_block_$$ (:$let :f (:$$_block_$$ 99)) (:$let :g (:$$_lambda_$$ [x] (:$$_block_$$ :f))) (:g 2)))", + "Ok((:$$_block_$$ (:$_let_$ :f (:$$_block_$$ 99)) (:$_let_$ :g (:$$_lambda_$$ [x] (:$$_block_$$ :f))) (:g 2)))", ) testEvalToBe("f=99; g(x)=f; g(2)", "Ok(99)") testEvalToBe("f(x)=x; g(x)=f(x); g(2)", "Ok(2)") diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res index 4a47b49a..203d2c37 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res @@ -130,12 +130,12 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce } switch call { - | ("$atIndex", [EvArray(aValueArray), EvNumber(fIndex)]) => arrayAtIndex(aValueArray, fIndex) - | ("$atIndex", [EvRecord(dict), EvString(sIndex)]) => recordAtIndex(dict, sIndex) - | ("$constructArray", [EvArray(aValueArray)]) => EvArray(aValueArray)->Ok - | ("$constructRecord", [EvArray(arrayOfPairs)]) => constructRecord(arrayOfPairs) - | ("$exportBindings", [EvRecord(externalBindings)]) => doExportBindings(externalBindings) - | ("$setBindings", [EvRecord(externalBindings), EvSymbol(symbol), value]) => + | ("$_atIndex_$", [EvArray(aValueArray), EvNumber(fIndex)]) => arrayAtIndex(aValueArray, fIndex) + | ("$_atIndex_$", [EvRecord(dict), EvString(sIndex)]) => recordAtIndex(dict, sIndex) + | ("$_constructArray_$", [EvArray(aValueArray)]) => EvArray(aValueArray)->Ok + | ("$_constructRecord_$", [EvArray(arrayOfPairs)]) => constructRecord(arrayOfPairs) + | ("$_exportBindings_$", [EvRecord(externalBindings)]) => doExportBindings(externalBindings) + | ("$_setBindings_$", [EvRecord(externalBindings), EvSymbol(symbol), value]) => doSetBindings(externalBindings, symbol, value) | ("inspect", [value, EvString(label)]) => inspectLabel(value, label) | ("inspect", [value]) => inspect(value) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res index 12fb7ddc..f0fd08b3 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res @@ -25,7 +25,7 @@ let dispatchMacroCall = ( ): result => { let doBindStatement = (bindingExpr: expression, statement: expression, environment) => switch statement { - | ExpressionT.EList(list{ExpressionT.EValue(EvCall("$let")), symbolExpr, statement}) => { + | ExpressionT.EList(list{ExpressionT.EValue(EvCall("$_let_$")), symbolExpr, statement}) => { let rExternalBindingsValue = reduceExpression(bindingExpr, bindings, environment) rExternalBindingsValue->Result.flatMap(externalBindingsValue => { @@ -34,7 +34,7 @@ let dispatchMacroCall = ( // Js.log( // `bindStatement ${Bindings.toString(newBindings)}<==${ExpressionT.toString( // bindingExpr, - // )} statement: $let ${ExpressionT.toString(symbolExpr)}=${ExpressionT.toString( + // )} statement: $_let_$ ${ExpressionT.toString(symbolExpr)}=${ExpressionT.toString( // statement, // )}`, // ) @@ -43,7 +43,7 @@ let dispatchMacroCall = ( rNewStatement->Result.map(newStatement => ExpressionWithContext.withContext( eFunction( - "$setBindings", + "$_setBindings_$", list{newBindings->Bindings.toExternalBindings->eRecord, symbolExpr, newStatement}, ), newBindings, @@ -59,7 +59,7 @@ let dispatchMacroCall = ( errorValue, > => switch statement { - | ExpressionT.EList(list{ExpressionT.EValue(EvCall("$let")), symbolExpr, statement}) => { + | ExpressionT.EList(list{ExpressionT.EValue(EvCall("$_let_$")), symbolExpr, statement}) => { let rExternalBindingsValue = reduceExpression(bindingExpr, bindings, environment) rExternalBindingsValue->Result.flatMap(externalBindingsValue => { @@ -68,10 +68,10 @@ let dispatchMacroCall = ( rNewStatement->Result.map(newStatement => ExpressionWithContext.withContext( eFunction( - "$exportBindings", + "$_exportBindings_$", list{ eFunction( - "$setBindings", + "$_setBindings_$", list{ newBindings->Bindings.toExternalBindings->eRecord, symbolExpr, diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res index 761dc901..cdf3425b 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_ExpressionBuilder.res @@ -51,7 +51,7 @@ let eList = (list: list): expression => list->BExpressionT.EList let eBlock = (exprs: list): expression => eFunction("$$_block_$$", exprs) let eLetStatement = (symbol: string, valueExpression: expression): expression => - eFunction("$let", list{eSymbol(symbol), valueExpression}) + eFunction("$_let_$", list{eSymbol(symbol), valueExpression}) let eBindStatement = (bindingExpr: expression, letStatement: expression): expression => eFunction("$$_bindStatement_$$", list{bindingExpr, letStatement}) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index f6608aa6..c797ff15 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -35,9 +35,9 @@ } var postOperatorToFunction = { - '.': '$atIndex', + '.': '$_atIndex_$', '()': '$$_applyAll_$$', - '[]': '$atIndex', + '[]': '$_atIndex_$', } function nodeBlock(statements) {return{type: 'Block', statements: statements}} @@ -405,9 +405,9 @@ function peg$parse(input, options) { var peg$f29 = function(args, statements, finalExpression) { statements.push(finalExpression) return nodeLambda(args, nodeBlock(statements)) }; var peg$f30 = function(args, finalExpression) { return nodeLambda(args, nodeBlock([finalExpression])) }; - var peg$f31 = function() { return makeFunctionCall('$constructArray', [nodeExpression([])])}; - var peg$f32 = function(args) { return makeFunctionCall('$constructArray', [nodeExpression(args)])}; - var peg$f33 = function(args) { return makeFunctionCall('$constructRecord', [nodeExpression(args)])}; + var peg$f31 = function() { return makeFunctionCall('$_constructArray_$', [nodeExpression([])])}; + var peg$f32 = function(args) { return makeFunctionCall('$_constructArray_$', [nodeExpression(args)])}; + var peg$f33 = function(args) { return makeFunctionCall('$_constructRecord_$', [nodeExpression(args)])}; var peg$f34 = function(key, value) { return nodeKeyValue(key, value)}; var peg$currPos = 0; diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy index 38561598..7f47c761 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy @@ -31,9 +31,9 @@ } var postOperatorToFunction = { - '.': '$atIndex', + '.': '$_atIndex_$', '()': '$$_applyAll_$$', - '[]': '$atIndex', + '[]': '$_atIndex_$', } function nodeBlock(statements) {return{type: 'Block', statements: statements}} @@ -275,9 +275,9 @@ lambda arrayConstructor 'array' = '[' _nl ']' - { return makeFunctionCall('$constructArray', [nodeExpression([])])} + { return makeFunctionCall('$_constructArray_$', [nodeExpression([])])} / '[' _nl args:array_elements _nl ']' - { return makeFunctionCall('$constructArray', [nodeExpression(args)])} + { return makeFunctionCall('$_constructArray_$', [nodeExpression(args)])} array_elements = head:expression tail:(_ ',' _nl @expression)* @@ -285,7 +285,7 @@ arrayConstructor 'array' recordConstructor 'record' = '{' _nl args:array_recordArguments _nl '}' - { return makeFunctionCall('$constructRecord', [nodeExpression(args)])} + { return makeFunctionCall('$_constructRecord_$', [nodeExpression(args)])} array_recordArguments = head:keyValuePair tail:(_ ',' _nl @keyValuePair)* From b9c5e308d833bb28bfb1c996a4200aff648fcb63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 May 2022 15:22:03 +0000 Subject: [PATCH 184/340] :arrow_up: Bump @storybook/react from 6.5.2 to 6.5.3 Bumps [@storybook/react](https://github.com/storybookjs/storybook/tree/HEAD/app/react) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.3/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.3/app/react) --- updated-dependencies: - dependency-name: "@storybook/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 695 +++++++++++++------------------ 2 files changed, 302 insertions(+), 395 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index ab62b6fc..ad9f2e63 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -25,7 +25,7 @@ "@storybook/manager-webpack5": "^6.5.3", "@storybook/node-logger": "^6.4.22", "@storybook/preset-create-react-app": "^4.1.0", - "@storybook/react": "^6.5.2", + "@storybook/react": "^6.5.3", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^14.2.0", diff --git a/yarn.lock b/yarn.lock index d424b568..1a8f9e89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -147,11 +147,6 @@ jsonpointer "^5.0.0" leven "^3.1.0" -"@aw-web-design/x-default-browser@1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@aw-web-design/x-default-browser/-/x-default-browser-1.4.0.tgz#3f9be9d5f5ce7a3b6a0298870717e79bec5acb10" - integrity sha512-F20Xs2yCgeXuU6+Q8DzlRp2jdLB3roJ2qlgDxg6EgTJ8mX8LilGjdViMXFvR7LOdCmNgPMNBnUiamsrf6esP6g== - "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" @@ -2925,23 +2920,6 @@ prop-types "^15.7.2" regenerator-runtime "^0.13.7" -"@storybook/addons@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.5.2.tgz#59ec479e3cb714e61adc08732ffad388e59c14ba" - integrity sha512-v7odkqaZUrQJQF1QRQ/amFgtklj972NoSsqOSA3D6rjc3J8qZfrtNxqN54vW7B+xl+Uu08cUjvSp34uWMs3xfg== - dependencies: - "@storybook/api" "6.5.2" - "@storybook/channels" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/core-events" "6.5.2" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/router" "6.5.2" - "@storybook/theming" "6.5.2" - "@types/webpack-env" "^1.16.0" - core-js "^3.8.2" - global "^4.4.0" - regenerator-runtime "^0.13.7" - "@storybook/addons@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.5.3.tgz#43dd276417edf74be0c465b968d35795f8cd994d" @@ -2959,29 +2937,6 @@ global "^4.4.0" regenerator-runtime "^0.13.7" -"@storybook/api@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.2.tgz#e5b61b26c5d2d1c15876e281917e2f91cbc59a52" - integrity sha512-i3no64ULdnTt6kdacrRF1SVz03QGtj2yggXYG0e0agz6tB1D/THeDs0o1+J30jUFm0oF+XL204JjNKio31kSYQ== - dependencies: - "@storybook/channels" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/core-events" "6.5.2" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/router" "6.5.2" - "@storybook/semver" "^7.3.2" - "@storybook/theming" "6.5.2" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - regenerator-runtime "^0.13.7" - store2 "^2.12.0" - telejson "^6.0.8" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/api@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.3.tgz#f4c468f348bf6ac65dc571f3e65d67302323312c" @@ -3005,28 +2960,28 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/builder-webpack4@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.2.tgz#5779ad29aacfd8784896b738e33c9d548ff16821" - integrity sha512-+Vch4u+gbC0ZA54zPl3zfufocxP/cmO9a3OLD51ujdqe/6ke8eT61yD5D4UCRFfsMcwWEgtLYwcguWIhW4RKUg== +"@storybook/builder-webpack4@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.3.tgz#5e99a009c0132380620a1d177a69a5f352ef6d29" + integrity sha512-zhZ879FH8XDs8TRkXN29pGMR2rJrKQYdRn19XTsBt9MlRI8ALFClGixYBsUF/Fa74LAWF2roL5dSt7qDyBQULQ== dependencies: "@babel/core" "^7.12.10" - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/channel-postmessage" "6.5.2" - "@storybook/channels" "6.5.2" - "@storybook/client-api" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/components" "6.5.2" - "@storybook/core-common" "6.5.2" - "@storybook/core-events" "6.5.2" - "@storybook/node-logger" "6.5.2" - "@storybook/preview-web" "6.5.2" - "@storybook/router" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/api" "6.5.3" + "@storybook/channel-postmessage" "6.5.3" + "@storybook/channels" "6.5.3" + "@storybook/client-api" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/components" "6.5.3" + "@storybook/core-common" "6.5.3" + "@storybook/core-events" "6.5.3" + "@storybook/node-logger" "6.5.3" + "@storybook/preview-web" "6.5.3" + "@storybook/router" "6.5.3" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.2" - "@storybook/theming" "6.5.2" - "@storybook/ui" "6.5.2" + "@storybook/store" "6.5.3" + "@storybook/theming" "6.5.3" + "@storybook/ui" "6.5.3" "@types/node" "^14.0.10 || ^16.0.0" "@types/webpack" "^4.41.26" autoprefixer "^9.8.6" @@ -3102,19 +3057,6 @@ webpack-hot-middleware "^2.25.1" webpack-virtual-modules "^0.4.1" -"@storybook/channel-postmessage@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.5.2.tgz#1ce4e417229a4f3772f2a8a9a357dd3fd0a3797e" - integrity sha512-qIbkESElK5oO12zDZCQpqfIe5ceInkoSoT0F1ZfQTjZpc4cO65pJEDDfR8TN7gXD9CNeu5cCJKE0heQ/+TFIbw== - dependencies: - "@storybook/channels" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/core-events" "6.5.2" - core-js "^3.8.2" - global "^4.4.0" - qs "^6.10.0" - telejson "^6.0.8" - "@storybook/channel-postmessage@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.5.3.tgz#c3762b92e87cb15e3a3c50d8a23ddede80a1e6d0" @@ -3128,17 +3070,6 @@ qs "^6.10.0" telejson "^6.0.8" -"@storybook/channel-websocket@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.2.tgz#cc7b1d1a592ccf953f99cec18fb7846445eea34d" - integrity sha512-lNIOWm15CKUxLc/Ak7/OHSCCsE6Up6rL5Nl0SUUir1cZEW4yF+JR27UBYiZtwJdLkDojkdCQmyFNTPW2+pTfuQ== - dependencies: - "@storybook/channels" "6.5.2" - "@storybook/client-logger" "6.5.2" - core-js "^3.8.2" - global "^4.4.0" - telejson "^6.0.8" - "@storybook/channel-websocket@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.3.tgz#3403d30c107763db311b084a0f6586c755ca64f0" @@ -3150,15 +3081,6 @@ global "^4.4.0" telejson "^6.0.8" -"@storybook/channels@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.2.tgz#ca964ee7d39874f4a7e450345a432c1681007995" - integrity sha512-gdKOKIpG+PYmfofukbTGbTPV5XxMip5ZgqclbGdUCNDOjR/yUrBTnKLGoO+S7SbT2JlgNqBb/TifMobA3dqD2w== - dependencies: - core-js "^3.8.2" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/channels@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.3.tgz#d1c94f1760a27026d16705ab28a82e582cf9f2d5" @@ -3168,32 +3090,6 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/client-api@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.2.tgz#f1cabf78d1f522610c8393affd10d016898ce1d0" - integrity sha512-boMUUuT9wxPBREoC1NfucSYu5rjQkPc7F4RlAr5OvUG/BwxauwQmg8QMcBv73MfjY6+6OGeSd5Bp/ELKkTC0zg== - dependencies: - "@storybook/addons" "6.5.2" - "@storybook/channel-postmessage" "6.5.2" - "@storybook/channels" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/core-events" "6.5.2" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/store" "6.5.2" - "@types/qs" "^6.9.5" - "@types/webpack-env" "^1.16.0" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - store2 "^2.12.0" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/client-api@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.3.tgz#ca7b5ddb9e745b1485d8946dd14d1e81173dd712" @@ -3220,14 +3116,6 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/client-logger@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.2.tgz#1dcd7810649586bddef7997e5501d8a225a457f3" - integrity sha512-KT7SrLvf1k2S4jUFiYefSn1h6yXyC8WbPvvYPpnfCN3eVpGYNYYe4Mn4XmKYCOY3QcLUsQWaKXRY5Mz3SzcA0g== - dependencies: - core-js "^3.8.2" - global "^4.4.0" - "@storybook/client-logger@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.3.tgz#4794e87d85c03aa6e38efc4c5775b9680cc1bf23" @@ -3236,21 +3124,6 @@ core-js "^3.8.2" global "^4.4.0" -"@storybook/components@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.2.tgz#185bf0d75585fe1299c51a001ace405872aa42cd" - integrity sha512-Zulmcm2qLvkF0whP2YV5WDrPi8q/P+GVt9cGD53XqvqxVGtIO7QvqZ/RDKJn8LNpvfEnxyAzX1JOxUe5o2wFjA== - dependencies: - "@storybook/client-logger" "6.5.2" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/theming" "6.5.2" - "@types/react-syntax-highlighter" "11.0.5" - core-js "^3.8.2" - qs "^6.10.0" - react-syntax-highlighter "^15.4.5" - regenerator-runtime "^0.13.7" - util-deprecate "^1.0.2" - "@storybook/components@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.3.tgz#8d643d2d89c298e5e5c2957f7ffb171ba3288ecf" @@ -3266,32 +3139,6 @@ regenerator-runtime "^0.13.7" util-deprecate "^1.0.2" -"@storybook/core-client@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.2.tgz#98063ba6eec19b18c71d0f478060aeb3a0a6a07a" - integrity sha512-NlgNbEL9arcrxBoGxX8TR8CH29r4rsO9fDQEE+z39gCeWvPi+3aDV8+8NQxaenfWTuEU9lSgwNje7Pd14KDe0w== - dependencies: - "@storybook/addons" "6.5.2" - "@storybook/channel-postmessage" "6.5.2" - "@storybook/channel-websocket" "6.5.2" - "@storybook/client-api" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/core-events" "6.5.2" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/preview-web" "6.5.2" - "@storybook/store" "6.5.2" - "@storybook/ui" "6.5.2" - airbnb-js-shims "^2.2.1" - ansi-to-html "^0.6.11" - core-js "^3.8.2" - global "^4.4.0" - lodash "^4.17.21" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - ts-dedent "^2.0.0" - unfetch "^4.2.0" - util-deprecate "^1.0.2" - "@storybook/core-client@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.3.tgz#9c689a5f6797dc7afe60183c29502e496bbd0a07" @@ -3318,62 +3165,6 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" -"@storybook/core-common@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.2.tgz#3248510f4d80c8159dfbad2fa28c257677247ede" - integrity sha512-mZC7wFgmVIKdItb1PkklAP6mLbFHQltCe58TToP2aZ2cbZGfOo9nWG4bZaM/Or9dvKmxRaKPxA5efkK7VcKxiw== - dependencies: - "@babel/core" "^7.12.10" - "@babel/plugin-proposal-class-properties" "^7.12.1" - "@babel/plugin-proposal-decorators" "^7.12.12" - "@babel/plugin-proposal-export-default-from" "^7.12.1" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-object-rest-spread" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" - "@babel/plugin-proposal-private-methods" "^7.12.1" - "@babel/plugin-proposal-private-property-in-object" "^7.12.1" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-transform-arrow-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.12" - "@babel/plugin-transform-classes" "^7.12.1" - "@babel/plugin-transform-destructuring" "^7.12.1" - "@babel/plugin-transform-for-of" "^7.12.1" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-transform-shorthand-properties" "^7.12.1" - "@babel/plugin-transform-spread" "^7.12.1" - "@babel/preset-env" "^7.12.11" - "@babel/preset-react" "^7.12.10" - "@babel/preset-typescript" "^7.12.7" - "@babel/register" "^7.12.1" - "@storybook/node-logger" "6.5.2" - "@storybook/semver" "^7.3.2" - "@types/node" "^14.0.10 || ^16.0.0" - "@types/pretty-hrtime" "^1.0.0" - babel-loader "^8.0.0" - babel-plugin-macros "^3.0.1" - babel-plugin-polyfill-corejs3 "^0.1.0" - chalk "^4.1.0" - core-js "^3.8.2" - express "^4.17.1" - file-system-cache "^1.0.5" - find-up "^5.0.0" - fork-ts-checker-webpack-plugin "^6.0.4" - fs-extra "^9.0.1" - glob "^7.1.6" - handlebars "^4.7.7" - interpret "^2.2.0" - json5 "^2.1.3" - lazy-universal-dotenv "^3.0.1" - picomatch "^2.3.0" - pkg-dir "^5.0.0" - pretty-hrtime "^1.0.3" - resolve-from "^5.0.0" - slash "^3.0.0" - telejson "^6.0.8" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - webpack "4" - "@storybook/core-common@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.3.tgz#5892e1ebc77f11b1058b716cb514bc2d1d5636ef" @@ -3430,13 +3221,6 @@ util-deprecate "^1.0.2" webpack "4" -"@storybook/core-events@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.2.tgz#639d6b1183a72829a035dbae5a06c6ff94aa8c59" - integrity sha512-RPxPmfW8fPRV8EV+9O1jS0jH/fBw4SC7gJ7M36fRwbI2kHTyr1mI3Rr0sBOfxagx5nyHwfd6q89TQYNnn5YaQw== - dependencies: - core-js "^3.8.2" - "@storybook/core-events@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.3.tgz#57fb45187d6d60403149d9b16953989897e2bd6e" @@ -3444,24 +3228,23 @@ dependencies: core-js "^3.8.2" -"@storybook/core-server@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.2.tgz#96d5d105c8cf24a06c41823a9ebfa68d45c4106f" - integrity sha512-xRUBvR4Q2YMCxLuWjM3PfsINr503swclW9F/Zwi7cvtSqMJgkavmVtENnWb9/Cq0mvjA/wKbjfUpGt4rEsZCbQ== +"@storybook/core-server@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.3.tgz#6c6168ec74f07594b48b248ae53454745945b37e" + integrity sha512-aehEen3VeY2NvouYfbnw346KtRwCJceOH5IWGHvVVEauSVzwCH+Yfgy7c4k2j0Ey3u6fz5qCkvPp8rdY0XS7SA== dependencies: - "@aw-web-design/x-default-browser" "1.4.0" "@discoveryjs/json-ext" "^0.5.3" - "@storybook/builder-webpack4" "6.5.2" - "@storybook/core-client" "6.5.2" - "@storybook/core-common" "6.5.2" - "@storybook/core-events" "6.5.2" + "@storybook/builder-webpack4" "6.5.3" + "@storybook/core-client" "6.5.3" + "@storybook/core-common" "6.5.3" + "@storybook/core-events" "6.5.3" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/csf-tools" "6.5.2" - "@storybook/manager-webpack4" "6.5.2" - "@storybook/node-logger" "6.5.2" + "@storybook/csf-tools" "6.5.3" + "@storybook/manager-webpack4" "6.5.3" + "@storybook/node-logger" "6.5.3" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.2" - "@storybook/telemetry" "6.5.2" + "@storybook/store" "6.5.3" + "@storybook/telemetry" "6.5.3" "@types/node" "^14.0.10 || ^16.0.0" "@types/node-fetch" "^2.5.7" "@types/pretty-hrtime" "^1.0.0" @@ -3494,19 +3277,20 @@ watchpack "^2.2.0" webpack "4" ws "^8.2.3" + x-default-browser "^0.4.0" -"@storybook/core@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.5.2.tgz#6d61d449c74ee87d108d4708bbb5309ff3701d66" - integrity sha512-EXBU+kRLDecZ+L58PTkD1Sv+AzkKA5fOcKMcDqRBWCH/QLCOC6eY6/5SlsFVi4LtMssGj8UEzngopaieJq7RjA== +"@storybook/core@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.5.3.tgz#8291e7bccd5d726ac7dc39c1e27fc04178f777f6" + integrity sha512-XQDcAryLNyXe5eiNqB++6xvGqnYlJ8ZAFOPWFlFUhjrktojtwVEeHfj5M3e23D9XMN4KkBODoH3OWmREcUMwXg== dependencies: - "@storybook/core-client" "6.5.2" - "@storybook/core-server" "6.5.2" + "@storybook/core-client" "6.5.3" + "@storybook/core-server" "6.5.3" -"@storybook/csf-tools@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.5.2.tgz#54b5767bbb329037fb0f663910ed0ac2ac6b5444" - integrity sha512-5qXnXNTtsnTx7L6COlcEThZN1KHm9aL88z4xU9t4E83Dh+UziPSHZ8PTK/Phne1lHzIc7fNtntwr8xRQECyjEA== +"@storybook/csf-tools@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.5.3.tgz#4f3b53bbe38f4a62e1ed07948a632512fb59f41f" + integrity sha512-WotBTvKauVV+i2DZqem4m12D+Ogexg6oFiXt0dlqh0TUGEAGzvocOAPIKk6uciEF2eXu6yn8JE4s+faXLWrXSw== dependencies: "@babel/core" "^7.12.10" "@babel/generator" "^7.12.11" @@ -3530,19 +3314,6 @@ dependencies: lodash "^4.17.15" -"@storybook/docs-tools@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.2.tgz#220f6239d5ea13b9b87f8cf8d9f8beaf6ad6144b" - integrity sha512-7yaKv/gBa+nM5IlZF94grkBF8mnNp0aS6SnP1aO0ANiQZ58Uso4fLiFF4Gf/VrSwHEG+hPVrFIsLXnM4T+eZhg== - dependencies: - "@babel/core" "^7.12.10" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/store" "6.5.2" - core-js "^3.8.2" - doctrine "^3.0.0" - lodash "^4.17.21" - regenerator-runtime "^0.13.7" - "@storybook/docs-tools@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.3.tgz#2460df5d20e4c6670e985268b50bf9c412eb47b7" @@ -3556,20 +3327,20 @@ lodash "^4.17.21" regenerator-runtime "^0.13.7" -"@storybook/manager-webpack4@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.2.tgz#8af1b1f3689d6ccc2e71674ea0da93e55845336f" - integrity sha512-s9NfCMHE9cECK03dbKh235tsjA7/v6Vq/I0D+l5sXLZFVzTlV0e0x5fmXepXPebTpsk002UaT7BQReHWpkLRKw== +"@storybook/manager-webpack4@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.3.tgz#004380031a521f50d5d37740e7d2add3342dbd90" + integrity sha512-kI+6fbCHv9uH1GEYK/SYLtNiAJYVRgm8oh/7Zi/38cqUjnAg8lzUztABul4Iemu3w5aJplkqE08FFu69TTbHPg== dependencies: "@babel/core" "^7.12.10" "@babel/plugin-transform-template-literals" "^7.12.1" "@babel/preset-react" "^7.12.10" - "@storybook/addons" "6.5.2" - "@storybook/core-client" "6.5.2" - "@storybook/core-common" "6.5.2" - "@storybook/node-logger" "6.5.2" - "@storybook/theming" "6.5.2" - "@storybook/ui" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/core-client" "6.5.3" + "@storybook/core-common" "6.5.3" + "@storybook/node-logger" "6.5.3" + "@storybook/theming" "6.5.3" + "@storybook/ui" "6.5.3" "@types/node" "^14.0.10 || ^16.0.0" "@types/webpack" "^4.41.26" babel-loader "^8.0.0" @@ -3652,17 +3423,6 @@ prettier ">=2.2.1 <=2.3.0" ts-dedent "^2.0.0" -"@storybook/node-logger@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.2.tgz#b8a54209b4c53aa2022c45888ce54c9abaa8fea0" - integrity sha512-p7ICWapQYrk1i+wUZUa9thfgrataMPf9iX5QUn/rWj2CtBL0W63qk1E+X6PL49gsww8clGhOU/rFQcylzNodcQ== - dependencies: - "@types/npmlog" "^4.1.2" - chalk "^4.1.0" - core-js "^3.8.2" - npmlog "^5.0.1" - pretty-hrtime "^1.0.3" - "@storybook/node-logger@6.5.3", "@storybook/node-logger@^6.4.22": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.3.tgz#6917bbbdaf2bb3b191bafadfe4f19c3ea3cbfa61" @@ -3693,28 +3453,6 @@ pnp-webpack-plugin "^1.7.0" semver "^7.3.5" -"@storybook/preview-web@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.5.2.tgz#d02e84d34b086ff0960c18ce7fb623481ba39829" - integrity sha512-vRi0GXU3CKTYQjuWkAypktCPyLIDd45oJbwfqc/Fpmi3vK28BS1sB4WW5OJargeC6RSBCV4QKe6so2R/saIQOw== - dependencies: - "@storybook/addons" "6.5.2" - "@storybook/channel-postmessage" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/core-events" "6.5.2" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/store" "6.5.2" - ansi-to-html "^0.6.11" - core-js "^3.8.2" - global "^4.4.0" - lodash "^4.17.21" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - unfetch "^4.2.0" - util-deprecate "^1.0.2" - "@storybook/preview-web@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.5.3.tgz#f54fb17476c6a57d715ad2e46674b6b668e6729f" @@ -3750,24 +3488,24 @@ react-docgen-typescript "^2.1.1" tslib "^2.0.0" -"@storybook/react@^6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.5.2.tgz#b10a630090a20470fc0471532bf4e0c48eccbc66" - integrity sha512-RXSsi3jCV5CpPsdPEPKkmfEO0zdT5AIxHLlt94V0deIs45o3PpXJWIDLdUUvEGwisjwBGBWKk8HkZltweIhFdg== +"@storybook/react@^6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.5.3.tgz#bab65edd22719d3367e136db20a79bd09aab41a0" + integrity sha512-RP9ak2EIrq9sJ80JjaVV/Xab9O663PA/DRqfbILewRLi9uUaG6L/Qby7LktwzqwaybeKbP6dTG0w937cRkuj4w== dependencies: "@babel/preset-flow" "^7.12.1" "@babel/preset-react" "^7.12.10" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.3" - "@storybook/addons" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/core" "6.5.2" - "@storybook/core-common" "6.5.2" + "@storybook/addons" "6.5.3" + "@storybook/client-logger" "6.5.3" + "@storybook/core" "6.5.3" + "@storybook/core-common" "6.5.3" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/docs-tools" "6.5.2" - "@storybook/node-logger" "6.5.2" + "@storybook/docs-tools" "6.5.3" + "@storybook/node-logger" "6.5.3" "@storybook/react-docgen-typescript-plugin" "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.2" + "@storybook/store" "6.5.3" "@types/estree" "^0.0.51" "@types/node" "^14.14.20 || ^16.0.0" "@types/webpack-env" "^1.16.0" @@ -3791,15 +3529,6 @@ util-deprecate "^1.0.2" webpack ">=4.43.0 <6.0.0" -"@storybook/router@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.5.2.tgz#bdcee8771c48da947719e547b8ca1c0a31e3ebf9" - integrity sha512-OtLCXCuDzYa1LyXBcd5iIVT8fnIZJfuIFA7OUWyu/seaTzZaOPqf6Vx9i0cvhdDbir9PQZGPzK1tFLESoG4yVg== - dependencies: - "@storybook/client-logger" "6.5.2" - core-js "^3.8.2" - regenerator-runtime "^0.13.7" - "@storybook/router@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.5.3.tgz#55d8a0a5c3acdef9695482e38cd4d70f6926c261" @@ -3833,27 +3562,6 @@ prettier ">=2.2.1 <=2.3.0" regenerator-runtime "^0.13.7" -"@storybook/store@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.5.2.tgz#9fa55361da041b0dfdcb12999689f23d6f2a6736" - integrity sha512-kRN2ITTcBKEg34DRD935FGvgu/8xgqS/BdiWpOmAjRZzl5AQMyjBPCLKsn4BYtwSnFGuIodOD+TO/E9rFU79qg== - dependencies: - "@storybook/addons" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/core-events" "6.5.2" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - regenerator-runtime "^0.13.7" - slash "^3.0.0" - stable "^0.1.8" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/store@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.5.3.tgz#8bde9d3ad071c3612665b6190ed093784a98d22d" @@ -3875,13 +3583,13 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/telemetry@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.2.tgz#26b7351b75dadfefb829f8077c8b3a0c1ec29e68" - integrity sha512-c41iJI0hdhPUvVG+uCo9Vt/Akzxbrg6KvAtzJyDKsWIwdSJRawSGcBJjeYIpFgzCzd4oOcLMIIBIhDAF9LogfQ== +"@storybook/telemetry@6.5.3": + version "6.5.3" + resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.3.tgz#2440606fa82406d279b0d60261613c5038d3bfbf" + integrity sha512-eXhQ+kRWdg+ZX3sglRaCoOzpzgQ/p9wKS4/vEJd5Fq+JlKIuZkJ7xiJYaxlhR55PLpJGbj+5HCTlnepAtf7Nnw== dependencies: - "@storybook/client-logger" "6.5.2" - "@storybook/core-common" "6.5.2" + "@storybook/client-logger" "6.5.3" + "@storybook/core-common" "6.5.3" chalk "^4.1.0" core-js "^3.8.2" detect-package-manager "^2.0.1" @@ -3893,15 +3601,6 @@ read-pkg-up "^7.0.1" regenerator-runtime "^0.13.7" -"@storybook/theming@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.5.2.tgz#aeff68c156607bb6b0d28ab99219d7242efcc6f0" - integrity sha512-f9f7kFvVWF+ttlNoWT4FRr42TV7rEcTGosXBQ7AMT/s7YJu2w7xbWDxlg6mrGrsdRhcyJZroqqp+zMnfNlsI1A== - dependencies: - "@storybook/client-logger" "6.5.2" - core-js "^3.8.2" - regenerator-runtime "^0.13.7" - "@storybook/theming@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.5.3.tgz#a8df53df2812d49453a3410346123231e028c103" @@ -3911,24 +3610,6 @@ core-js "^3.8.2" regenerator-runtime "^0.13.7" -"@storybook/ui@6.5.2": - version "6.5.2" - resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.2.tgz#034a180604df28d0d1b1d38324bab93de5da8db4" - integrity sha512-CxFYdqFoxHl20l/D5P1eU9exG9xPvFF3ulKe0C5Rdk2/ZL4p77Q2AYL8btvgBloYMBsT5gdSBBNnMsDOFvpbew== - dependencies: - "@storybook/addons" "6.5.2" - "@storybook/api" "6.5.2" - "@storybook/channels" "6.5.2" - "@storybook/client-logger" "6.5.2" - "@storybook/components" "6.5.2" - "@storybook/core-events" "6.5.2" - "@storybook/router" "6.5.2" - "@storybook/semver" "^7.3.2" - "@storybook/theming" "6.5.2" - core-js "^3.8.2" - regenerator-runtime "^0.13.7" - resolve-from "^5.0.0" - "@storybook/ui@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.3.tgz#afa7a327c71350e9f92628b86c7f14d58427ec3c" @@ -5543,6 +5224,11 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= +array-find-index@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" + integrity sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw== + array-flat-polyfill@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/array-flat-polyfill/-/array-flat-polyfill-1.0.1.tgz#1e3a4255be619dfbffbfd1d635c1cf357cd034e7" @@ -6085,6 +5771,11 @@ bfj@^7.0.2: hoopy "^0.1.4" tryer "^1.0.1" +big-integer@^1.6.7: + version "1.6.51" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" + integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== + big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -6188,6 +5879,13 @@ boxen@^6.2.1: widest-line "^4.0.1" wrap-ansi "^8.0.1" +bplist-parser@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.1.1.tgz#d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6" + integrity sha512-2AEM0FXy8ZxVLBuqX0hqt1gDwcnz2zygEkQ6zaD5Wko/sB9paUNwlpawrFtKeHUAQUOzjVy9AO4oeonqIHKA9Q== + dependencies: + big-integer "^1.6.7" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -6498,6 +6196,19 @@ camelcase-css@2.0.1, camelcase-css@^2.0.1: resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== +camelcase-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" + integrity sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ== + dependencies: + camelcase "^2.0.0" + map-obj "^1.0.0" + +camelcase@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw== + camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" @@ -7597,6 +7308,13 @@ csstype@^3.0.2, csstype@^3.0.6: resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33" integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw== +currently-unhandled@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" + integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= + dependencies: + array-find-index "^1.0.1" + cyclist@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" @@ -7766,7 +7484,7 @@ debug@^3.0.0, debug@^3.2.7: dependencies: ms "^2.1.1" -decamelize@^1.2.0: +decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -7808,6 +7526,15 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== +default-browser-id@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-1.0.4.tgz#e59d09a5d157b828b876c26816e61c3d2a2c203a" + integrity sha1-5Z0JpdFXuCi4dsJoFuYcPSosIDo= + dependencies: + bplist-parser "^0.1.0" + meow "^3.1.0" + untildify "^2.0.0" + default-gateway@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" @@ -8332,7 +8059,7 @@ errno@^0.1.3, errno@~0.1.7: dependencies: prr "~1.0.1" -error-ex@^1.3.1: +error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== @@ -9151,6 +8878,14 @@ find-cache-dir@^3.2.0, find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" +find-up@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" + integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= + dependencies: + path-exists "^2.0.0" + pinkie-promise "^2.0.0" + find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -9453,6 +9188,11 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== +get-stdin@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" + integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= + get-stream@^4.0.0, get-stream@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" @@ -10288,6 +10028,13 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= +indent-string@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" + integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= + dependencies: + repeating "^2.0.0" + indent-string@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" @@ -10571,6 +10318,11 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +is-finite@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" + integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== + is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -10763,6 +10515,11 @@ is-typedarray@^1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +is-utf8@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" + integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= + is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -11767,6 +11524,17 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== +load-json-file@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" + integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= + dependencies: + graceful-fs "^4.1.2" + parse-json "^2.2.0" + pify "^2.0.0" + pinkie-promise "^2.0.0" + strip-bom "^2.0.0" + loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" @@ -11947,6 +11715,14 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3 dependencies: js-tokens "^3.0.0 || ^4.0.0" +loud-rejection@^1.0.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" + integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= + dependencies: + currently-unhandled "^0.4.1" + signal-exit "^3.0.0" + lower-case@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" @@ -12037,6 +11813,11 @@ map-cache@^0.2.2: resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= +map-obj@^1.0.0, map-obj@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= + map-or-similar@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/map-or-similar/-/map-or-similar-1.5.0.tgz#6de2653174adfb5d9edc33c69d3e92a1b76faf08" @@ -12174,6 +11955,22 @@ memory-fs@^0.5.0: errno "^0.1.3" readable-stream "^2.0.1" +meow@^3.1.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= + dependencies: + camelcase-keys "^2.0.0" + decamelize "^1.1.2" + loud-rejection "^1.0.0" + map-obj "^1.0.1" + minimist "^1.1.3" + normalize-package-data "^2.3.4" + object-assign "^4.0.1" + read-pkg-up "^1.0.1" + redent "^1.0.0" + trim-newlines "^1.0.0" + merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" @@ -12341,7 +12138,7 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: +minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== @@ -12617,7 +12414,7 @@ node-releases@^2.0.3: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476" integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ== -normalize-package-data@^2.5.0: +normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -12740,7 +12537,7 @@ nyc@^15.1.0: test-exclude "^6.0.0" yargs "^15.0.2" -object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -12931,6 +12728,11 @@ os-browserify@^0.3.0: resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + p-all@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-all/-/p-all-2.1.0.tgz#91419be56b7dee8fe4c5db875d55e0da084244a0" @@ -13132,6 +12934,13 @@ parse-entities@^2.0.0: is-decimal "^1.0.0" is-hexadecimal "^1.0.0" +parse-json@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" + integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= + dependencies: + error-ex "^1.2.0" + parse-json@^5.0.0, parse-json@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" @@ -13197,6 +13006,13 @@ path-dirname@^1.0.0: resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= +path-exists@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" + integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= + dependencies: + pinkie-promise "^2.0.0" + path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -13249,6 +13065,15 @@ path-to-regexp@^1.7.0: dependencies: isarray "0.0.1" +path-type@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" + integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= + dependencies: + graceful-fs "^4.1.2" + pify "^2.0.0" + pinkie-promise "^2.0.0" + path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -13297,6 +13122,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatc resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +pify@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + pify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" @@ -13307,6 +13137,18 @@ pify@^4.0.1: resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== +pinkie-promise@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" + integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= + dependencies: + pinkie "^2.0.0" + +pinkie@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" + integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + pirates@^4.0.1, pirates@^4.0.4, pirates@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" @@ -14682,6 +14524,14 @@ react@^18.0.0, react@^18.1.0: dependencies: loose-envify "^1.1.0" +read-pkg-up@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" + integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= + dependencies: + find-up "^1.0.0" + read-pkg "^1.0.0" + read-pkg-up@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" @@ -14691,6 +14541,15 @@ read-pkg-up@^7.0.1: read-pkg "^5.2.0" type-fest "^0.8.1" +read-pkg@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" + integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= + dependencies: + load-json-file "^1.0.0" + normalize-package-data "^2.3.2" + path-type "^1.0.0" + read-pkg@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" @@ -14770,6 +14629,14 @@ recursive-readdir@^2.2.2: dependencies: minimatch "3.0.4" +redent@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" + integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= + dependencies: + indent-string "^2.1.0" + strip-indent "^1.0.1" + redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -15050,6 +14917,13 @@ repeat-string@^1.0.0, repeat-string@^1.5.4, repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= +repeating@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" + integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + dependencies: + is-finite "^1.0.0" + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -16173,6 +16047,13 @@ strip-bom-string@^1.0.0: resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI= +strip-bom@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= + dependencies: + is-utf8 "^0.2.0" + strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" @@ -16198,6 +16079,13 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +strip-indent@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= + dependencies: + get-stdin "^4.0.1" + strip-indent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" @@ -16696,6 +16584,11 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= +trim-newlines@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" + integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= + trim-trailing-lines@^1.0.0: version "1.1.4" resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" @@ -17114,6 +17007,13 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" +untildify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/untildify/-/untildify-2.1.0.tgz#17eb2807987f76952e9c0485fc311d06a826a2e0" + integrity sha1-F+soB5h/dpUunASF/DEdBqgmouA= + dependencies: + os-homedir "^1.0.0" + upath@^1.1.1, upath@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" @@ -18407,6 +18307,13 @@ ws@^8.2.3, ws@^8.4.2: resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23" integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw== +x-default-browser@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/x-default-browser/-/x-default-browser-0.4.0.tgz#70cf0da85da7c0ab5cb0f15a897f2322a6bdd481" + integrity sha1-cM8NqF2nwKtcsPFaiX8jIqa91IE= + optionalDependencies: + default-browser-id "^1.0.4" + xdg-basedir@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" From 2a176fac268099f37b24275ab151f357fc95dae2 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Fri, 20 May 2022 17:22:43 +0200 Subject: [PATCH 185/340] $indentified defined. Assignment not allowed --- .../Reducer_Peggy_GeneratedParser.js | 415 +++++++++++------- .../Reducer_Peggy_GeneratedParser.peggy | 19 +- 2 files changed, 260 insertions(+), 174 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index c797ff15..c7ad1931 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -283,14 +283,16 @@ function peg$parse(input, options) { var peg$r0 = /^[_a-z]/; var peg$r1 = /^[_a-z0-9]/i; - var peg$r2 = /^[^']/; - var peg$r3 = /^[^"]/; - var peg$r4 = /^[e]/i; - var peg$r5 = /^[0-9]/; - var peg$r6 = /^[^\r\n]/; - var peg$r7 = /^[^*]/; - var peg$r8 = /^[ \t]/; - var peg$r9 = /^[\n\r]/; + var peg$r2 = /^[$_a-z]/; + var peg$r3 = /^[$_a-z0-9]/i; + var peg$r4 = /^[^']/; + var peg$r5 = /^[^"]/; + var peg$r6 = /^[e]/i; + var peg$r7 = /^[0-9]/; + var peg$r8 = /^[^\r\n]/; + var peg$r9 = /^[^*]/; + var peg$r10 = /^[ \t]/; + var peg$r11 = /^[\n\r]/; var peg$e0 = peg$literalExpectation("{", false); var peg$e1 = peg$literalExpectation("}", false); @@ -331,38 +333,41 @@ function peg$parse(input, options) { var peg$e36 = peg$otherExpectation("identifier"); var peg$e37 = peg$classExpectation(["_", ["a", "z"]], false, false); var peg$e38 = peg$classExpectation(["_", ["a", "z"], ["0", "9"]], false, true); - var peg$e39 = peg$otherExpectation("string"); - var peg$e40 = peg$literalExpectation("'", false); - var peg$e41 = peg$classExpectation(["'"], true, false); - var peg$e42 = peg$literalExpectation("\"", false); - var peg$e43 = peg$classExpectation(["\""], true, false); - var peg$e44 = peg$otherExpectation("integer"); - var peg$e45 = peg$classExpectation(["e"], false, true); - var peg$e46 = peg$otherExpectation("float"); - var peg$e47 = peg$classExpectation([["0", "9"]], false, false); - var peg$e48 = peg$otherExpectation("boolean"); - var peg$e49 = peg$literalExpectation("true", false); - var peg$e50 = peg$literalExpectation("false", false); - var peg$e51 = peg$literalExpectation("|", false); - var peg$e52 = peg$otherExpectation("array"); - var peg$e53 = peg$otherExpectation("record"); - var peg$e54 = peg$otherExpectation("optional whitespace"); - var peg$e55 = peg$otherExpectation("optional whitespace or newline"); - var peg$e56 = peg$otherExpectation("whitespace"); - var peg$e57 = peg$otherExpectation("whitespace or newline"); - var peg$e58 = peg$otherExpectation("statement separator"); - var peg$e59 = peg$literalExpectation(";", false); - var peg$e60 = peg$otherExpectation("line comment"); - var peg$e61 = peg$literalExpectation("//", false); - var peg$e62 = peg$literalExpectation("#", false); - var peg$e63 = peg$classExpectation(["\r", "\n"], true, false); - var peg$e64 = peg$otherExpectation("comment"); - var peg$e65 = peg$literalExpectation("/*", false); - var peg$e66 = peg$classExpectation(["*"], true, false); - var peg$e67 = peg$literalExpectation("*/", false); - var peg$e68 = peg$classExpectation([" ", "\t"], false, false); - var peg$e69 = peg$otherExpectation("newline"); - var peg$e70 = peg$classExpectation(["\n", "\r"], false, false); + var peg$e39 = peg$otherExpectation("$identifier"); + var peg$e40 = peg$classExpectation(["$", "_", ["a", "z"]], false, false); + var peg$e41 = peg$classExpectation(["$", "_", ["a", "z"], ["0", "9"]], false, true); + var peg$e42 = peg$otherExpectation("string"); + var peg$e43 = peg$literalExpectation("'", false); + var peg$e44 = peg$classExpectation(["'"], true, false); + var peg$e45 = peg$literalExpectation("\"", false); + var peg$e46 = peg$classExpectation(["\""], true, false); + var peg$e47 = peg$otherExpectation("integer"); + var peg$e48 = peg$classExpectation(["e"], false, true); + var peg$e49 = peg$otherExpectation("float"); + var peg$e50 = peg$classExpectation([["0", "9"]], false, false); + var peg$e51 = peg$otherExpectation("boolean"); + var peg$e52 = peg$literalExpectation("true", false); + var peg$e53 = peg$literalExpectation("false", false); + var peg$e54 = peg$literalExpectation("|", false); + var peg$e55 = peg$otherExpectation("array"); + var peg$e56 = peg$otherExpectation("record"); + var peg$e57 = peg$otherExpectation("optional whitespace"); + var peg$e58 = peg$otherExpectation("optional whitespace or newline"); + var peg$e59 = peg$otherExpectation("whitespace"); + var peg$e60 = peg$otherExpectation("whitespace or newline"); + var peg$e61 = peg$otherExpectation("statement separator"); + var peg$e62 = peg$literalExpectation(";", false); + var peg$e63 = peg$otherExpectation("line comment"); + var peg$e64 = peg$literalExpectation("//", false); + var peg$e65 = peg$literalExpectation("#", false); + var peg$e66 = peg$classExpectation(["\r", "\n"], true, false); + var peg$e67 = peg$otherExpectation("comment"); + var peg$e68 = peg$literalExpectation("/*", false); + var peg$e69 = peg$classExpectation(["*"], true, false); + var peg$e70 = peg$literalExpectation("*/", false); + var peg$e71 = peg$classExpectation([" ", "\t"], false, false); + var peg$e72 = peg$otherExpectation("newline"); + var peg$e73 = peg$classExpectation(["\n", "\r"], false, false); var peg$f0 = function(start) {return start}; var peg$f1 = function(statements, finalExpression) { if (finalExpression != null) { statements.push(finalExpression) } @@ -397,7 +402,7 @@ function peg$parse(input, options) { }, head)}; var peg$f22 = function(head, arg) {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}}; var peg$f23 = function(expression) {return expression}; - var peg$f24 = function(identifier) {return nodeIdentifier(text())}; + var peg$f24 = function() {return nodeIdentifier(text())}; var peg$f25 = function(characters) {return nodeString(characters.join(''))}; var peg$f26 = function() { return nodeInteger(parseInt(text()))}; var peg$f27 = function() { return nodeFloat(parseFloat(text()))}; @@ -570,7 +575,7 @@ function peg$parse(input, options) { function peg$parsestart() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 0; + var key = peg$currPos * 59 + 0; var cached = peg$resultsCache[key]; if (cached) { @@ -603,7 +608,7 @@ function peg$parse(input, options) { function peg$parsezeroOMoreArgumentsBlockOrExpression() { var s0; - var key = peg$currPos * 58 + 1; + var key = peg$currPos * 59 + 1; var cached = peg$resultsCache[key]; if (cached) { @@ -625,7 +630,7 @@ function peg$parse(input, options) { function peg$parseouterBlock() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 2; + var key = peg$currPos * 59 + 2; var cached = peg$resultsCache[key]; if (cached) { @@ -678,7 +683,7 @@ function peg$parse(input, options) { function peg$parseinnerBlockOrExpression() { var s0, s1; - var key = peg$currPos * 58 + 3; + var key = peg$currPos * 59 + 3; var cached = peg$resultsCache[key]; if (cached) { @@ -706,7 +711,7 @@ function peg$parse(input, options) { function peg$parsequotedInnerBlock() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 58 + 4; + var key = peg$currPos * 59 + 4; var cached = peg$resultsCache[key]; if (cached) { @@ -815,7 +820,7 @@ function peg$parse(input, options) { function peg$parsearray_statements() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 5; + var key = peg$currPos * 59 + 5; var cached = peg$resultsCache[key]; if (cached) { @@ -870,7 +875,7 @@ function peg$parse(input, options) { function peg$parsestatement() { var s0; - var key = peg$currPos * 58 + 6; + var key = peg$currPos * 59 + 6; var cached = peg$resultsCache[key]; if (cached) { @@ -892,7 +897,7 @@ function peg$parse(input, options) { function peg$parseletStatement() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 7; + var key = peg$currPos * 59 + 7; var cached = peg$resultsCache[key]; if (cached) { @@ -939,7 +944,7 @@ function peg$parse(input, options) { function peg$parsedefunStatement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 58 + 8; + var key = peg$currPos * 59 + 8; var cached = peg$resultsCache[key]; if (cached) { @@ -1018,7 +1023,7 @@ function peg$parse(input, options) { function peg$parsearray_parameters() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 9; + var key = peg$currPos * 59 + 9; var cached = peg$resultsCache[key]; if (cached) { @@ -1028,7 +1033,7 @@ function peg$parse(input, options) { } s0 = peg$currPos; - s1 = peg$parseidentifier(); + s1 = peg$parsedollarIdentifier(); if (s1 !== peg$FAILED) { s2 = []; s3 = peg$currPos; @@ -1042,7 +1047,7 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); - s7 = peg$parseidentifier(); + s7 = peg$parsedollarIdentifier(); if (s7 !== peg$FAILED) { s3 = s7; } else { @@ -1066,7 +1071,7 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); - s7 = peg$parseidentifier(); + s7 = peg$parsedollarIdentifier(); if (s7 !== peg$FAILED) { s3 = s7; } else { @@ -1093,7 +1098,7 @@ function peg$parse(input, options) { function peg$parseexpression() { var s0; - var key = peg$currPos * 58 + 10; + var key = peg$currPos * 59 + 10; var cached = peg$resultsCache[key]; if (cached) { @@ -1118,7 +1123,7 @@ function peg$parse(input, options) { function peg$parseifthenelse() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11; - var key = peg$currPos * 58 + 11; + var key = peg$currPos * 59 + 11; var cached = peg$resultsCache[key]; if (cached) { @@ -1226,7 +1231,7 @@ function peg$parse(input, options) { function peg$parseternary() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 58 + 12; + var key = peg$currPos * 59 + 12; var cached = peg$resultsCache[key]; if (cached) { @@ -1296,7 +1301,7 @@ function peg$parse(input, options) { function peg$parselogicalAdditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 13; + var key = peg$currPos * 59 + 13; var cached = peg$resultsCache[key]; if (cached) { @@ -1373,7 +1378,7 @@ function peg$parse(input, options) { function peg$parselogicalMultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 14; + var key = peg$currPos * 59 + 14; var cached = peg$resultsCache[key]; if (cached) { @@ -1450,7 +1455,7 @@ function peg$parse(input, options) { function peg$parseequality() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 15; + var key = peg$currPos * 59 + 15; var cached = peg$resultsCache[key]; if (cached) { @@ -1509,7 +1514,7 @@ function peg$parse(input, options) { function peg$parserelational() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 16; + var key = peg$currPos * 59 + 16; var cached = peg$resultsCache[key]; if (cached) { @@ -1586,7 +1591,7 @@ function peg$parse(input, options) { function peg$parseadditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 17; + var key = peg$currPos * 59 + 17; var cached = peg$resultsCache[key]; if (cached) { @@ -1717,7 +1722,7 @@ function peg$parse(input, options) { function peg$parsemultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 18; + var key = peg$currPos * 59 + 18; var cached = peg$resultsCache[key]; if (cached) { @@ -1848,7 +1853,7 @@ function peg$parse(input, options) { function peg$parsepower() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 19; + var key = peg$currPos * 59 + 19; var cached = peg$resultsCache[key]; if (cached) { @@ -1943,7 +1948,7 @@ function peg$parse(input, options) { function peg$parsecredibleInterval() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 20; + var key = peg$currPos * 59 + 20; var cached = peg$resultsCache[key]; if (cached) { @@ -2040,7 +2045,7 @@ function peg$parse(input, options) { function peg$parsechainFunctionCall() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 21; + var key = peg$currPos * 59 + 21; var cached = peg$resultsCache[key]; if (cached) { @@ -2135,7 +2140,7 @@ function peg$parse(input, options) { function peg$parsechainedFunction() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 58 + 22; + var key = peg$currPos * 59 + 22; var cached = peg$resultsCache[key]; if (cached) { @@ -2145,7 +2150,7 @@ function peg$parse(input, options) { } s0 = peg$currPos; - s1 = peg$parseidentifier(); + s1 = peg$parsedollarIdentifier(); if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 40) { s2 = peg$c3; @@ -2187,7 +2192,7 @@ function peg$parse(input, options) { } if (s0 === peg$FAILED) { s0 = peg$currPos; - s1 = peg$parseidentifier(); + s1 = peg$parsedollarIdentifier(); if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 40) { s2 = peg$c3; @@ -2222,7 +2227,7 @@ function peg$parse(input, options) { } if (s0 === peg$FAILED) { s0 = peg$currPos; - s1 = peg$parseidentifier(); + s1 = peg$parsedollarIdentifier(); if (s1 !== peg$FAILED) { peg$savedPos = s0; s1 = peg$f17(s1); @@ -2239,7 +2244,7 @@ function peg$parse(input, options) { function peg$parseunary() { var s0, s1, s2, s3; - var key = peg$currPos * 58 + 23; + var key = peg$currPos * 59 + 23; var cached = peg$resultsCache[key]; if (cached) { @@ -2279,7 +2284,7 @@ function peg$parse(input, options) { function peg$parseunaryOperator() { var s0; - var key = peg$currPos * 58 + 24; + var key = peg$currPos * 59 + 24; var cached = peg$resultsCache[key]; if (cached) { @@ -2322,7 +2327,7 @@ function peg$parse(input, options) { function peg$parseindexedValue() { var s0; - var key = peg$currPos * 58 + 25; + var key = peg$currPos * 59 + 25; var cached = peg$resultsCache[key]; if (cached) { @@ -2344,7 +2349,7 @@ function peg$parse(input, options) { function peg$parsecollectionElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 58 + 26; + var key = peg$currPos * 59 + 26; var cached = peg$resultsCache[key]; if (cached) { @@ -2553,7 +2558,7 @@ function peg$parse(input, options) { function peg$parsearray_functionArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 27; + var key = peg$currPos * 59 + 27; var cached = peg$resultsCache[key]; if (cached) { @@ -2628,7 +2633,7 @@ function peg$parse(input, options) { function peg$parsemaybeRecordElement() { var s0; - var key = peg$currPos * 58 + 28; + var key = peg$currPos * 59 + 28; var cached = peg$resultsCache[key]; if (cached) { @@ -2650,7 +2655,7 @@ function peg$parse(input, options) { function peg$parserecordElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 58 + 29; + var key = peg$currPos * 59 + 29; var cached = peg$resultsCache[key]; if (cached) { @@ -2660,7 +2665,7 @@ function peg$parse(input, options) { } s0 = peg$currPos; - s1 = peg$parseidentifier(); + s1 = peg$parsedollarIdentifier(); if (s1 !== peg$FAILED) { s2 = peg$currPos; peg$silentFails++; @@ -2692,7 +2697,7 @@ function peg$parse(input, options) { if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); s8 = peg$currPos; - s9 = peg$parseidentifier(); + s9 = peg$parsedollarIdentifier(); if (s9 !== peg$FAILED) { s8 = input.substring(s8, peg$currPos); } else { @@ -2723,7 +2728,7 @@ function peg$parse(input, options) { if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); s8 = peg$currPos; - s9 = peg$parseidentifier(); + s9 = peg$parsedollarIdentifier(); if (s9 !== peg$FAILED) { s8 = input.substring(s8, peg$currPos); } else { @@ -2760,7 +2765,7 @@ function peg$parse(input, options) { function peg$parseatom() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 30; + var key = peg$currPos * 59 + 30; var cached = peg$resultsCache[key]; if (cached) { @@ -2816,7 +2821,7 @@ function peg$parse(input, options) { function peg$parsebasicValue() { var s0; - var key = peg$currPos * 58 + 31; + var key = peg$currPos * 59 + 31; var cached = peg$resultsCache[key]; if (cached) { @@ -2838,7 +2843,7 @@ function peg$parse(input, options) { function peg$parsebasicLiteral() { var s0; - var key = peg$currPos * 58 + 32; + var key = peg$currPos * 59 + 32; var cached = peg$resultsCache[key]; if (cached) { @@ -2855,7 +2860,7 @@ function peg$parse(input, options) { if (s0 === peg$FAILED) { s0 = peg$parseboolean(); if (s0 === peg$FAILED) { - s0 = peg$parseidentifier(); + s0 = peg$parsedollarIdentifier(); } } } @@ -2869,7 +2874,7 @@ function peg$parse(input, options) { function peg$parseidentifier() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 33; + var key = peg$currPos * 59 + 33; var cached = peg$resultsCache[key]; if (cached) { @@ -2930,7 +2935,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f24(s1); + s1 = peg$f24(); } s0 = s1; peg$silentFails--; @@ -2944,10 +2949,88 @@ function peg$parse(input, options) { return s0; } + function peg$parsedollarIdentifier() { + var s0, s1, s2, s3, s4; + + var key = peg$currPos * 59 + 34; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + s1 = peg$currPos; + s2 = []; + if (peg$r2.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e40); } + } + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + if (peg$r2.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e40); } + } + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = []; + if (peg$r3.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e41); } + } + while (s4 !== peg$FAILED) { + s3.push(s4); + if (peg$r3.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e41); } + } + } + s2 = [s2, s3]; + s1 = s2; + } else { + peg$currPos = s1; + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f24(); + } + s0 = s1; + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e39); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parsestring() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 34; + var key = peg$currPos * 59 + 35; var cached = peg$resultsCache[key]; if (cached) { @@ -2964,25 +3047,25 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } + if (peg$silentFails === 0) { peg$fail(peg$e43); } } if (s2 !== peg$FAILED) { s3 = []; - if (peg$r2.test(input.charAt(peg$currPos))) { + if (peg$r4.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } + if (peg$silentFails === 0) { peg$fail(peg$e44); } } while (s4 !== peg$FAILED) { s3.push(s4); - if (peg$r2.test(input.charAt(peg$currPos))) { + if (peg$r4.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } + if (peg$silentFails === 0) { peg$fail(peg$e44); } } } if (input.charCodeAt(peg$currPos) === 39) { @@ -2990,7 +3073,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } + if (peg$silentFails === 0) { peg$fail(peg$e43); } } if (s4 !== peg$FAILED) { s1 = s3; @@ -3015,25 +3098,25 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e42); } + if (peg$silentFails === 0) { peg$fail(peg$e45); } } if (s2 !== peg$FAILED) { s3 = []; - if (peg$r3.test(input.charAt(peg$currPos))) { + if (peg$r5.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } + if (peg$silentFails === 0) { peg$fail(peg$e46); } } while (s4 !== peg$FAILED) { s3.push(s4); - if (peg$r3.test(input.charAt(peg$currPos))) { + if (peg$r5.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } + if (peg$silentFails === 0) { peg$fail(peg$e46); } } } if (input.charCodeAt(peg$currPos) === 34) { @@ -3041,7 +3124,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e42); } + if (peg$silentFails === 0) { peg$fail(peg$e45); } } if (s4 !== peg$FAILED) { s1 = s3; @@ -3062,7 +3145,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e39); } + if (peg$silentFails === 0) { peg$fail(peg$e42); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3073,7 +3156,7 @@ function peg$parse(input, options) { function peg$parseinteger() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 35; + var key = peg$currPos * 59 + 36; var cached = peg$resultsCache[key]; if (cached) { @@ -3114,12 +3197,12 @@ function peg$parse(input, options) { if (s2 !== peg$FAILED) { s3 = peg$currPos; peg$silentFails++; - if (peg$r4.test(input.charAt(peg$currPos))) { + if (peg$r6.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } + if (peg$silentFails === 0) { peg$fail(peg$e48); } } peg$silentFails--; if (s4 === peg$FAILED) { @@ -3146,7 +3229,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } + if (peg$silentFails === 0) { peg$fail(peg$e47); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3157,7 +3240,7 @@ function peg$parse(input, options) { function peg$parsefloat() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 36; + var key = peg$currPos * 59 + 37; var cached = peg$resultsCache[key]; if (cached) { @@ -3288,7 +3371,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } + if (peg$silentFails === 0) { peg$fail(peg$e49); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3299,7 +3382,7 @@ function peg$parse(input, options) { function peg$parsefloatExponent() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 37; + var key = peg$currPos * 59 + 38; var cached = peg$resultsCache[key]; if (cached) { @@ -3309,12 +3392,12 @@ function peg$parse(input, options) { } s0 = peg$currPos; - if (peg$r4.test(input.charAt(peg$currPos))) { + if (peg$r6.test(input.charAt(peg$currPos))) { s1 = input.charAt(peg$currPos); peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } + if (peg$silentFails === 0) { peg$fail(peg$e48); } } if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 45) { @@ -3357,7 +3440,7 @@ function peg$parse(input, options) { function peg$parsed() { var s0; - var key = peg$currPos * 58 + 38; + var key = peg$currPos * 59 + 39; var cached = peg$resultsCache[key]; if (cached) { @@ -3366,12 +3449,12 @@ function peg$parse(input, options) { return cached.result; } - if (peg$r5.test(input.charAt(peg$currPos))) { + if (peg$r7.test(input.charAt(peg$currPos))) { s0 = input.charAt(peg$currPos); peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } + if (peg$silentFails === 0) { peg$fail(peg$e50); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3382,7 +3465,7 @@ function peg$parse(input, options) { function peg$parseboolean() { var s0, s1; - var key = peg$currPos * 58 + 39; + var key = peg$currPos * 59 + 40; var cached = peg$resultsCache[key]; if (cached) { @@ -3398,7 +3481,7 @@ function peg$parse(input, options) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } + if (peg$silentFails === 0) { peg$fail(peg$e52); } } if (s1 === peg$FAILED) { if (input.substr(peg$currPos, 5) === peg$c39) { @@ -3406,7 +3489,7 @@ function peg$parse(input, options) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e50); } + if (peg$silentFails === 0) { peg$fail(peg$e53); } } } if (s1 !== peg$FAILED) { @@ -3417,7 +3500,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } + if (peg$silentFails === 0) { peg$fail(peg$e51); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3428,7 +3511,7 @@ function peg$parse(input, options) { function peg$parsevalueConstructor() { var s0; - var key = peg$currPos * 58 + 40; + var key = peg$currPos * 59 + 41; var cached = peg$resultsCache[key]; if (cached) { @@ -3456,7 +3539,7 @@ function peg$parse(input, options) { function peg$parselambda() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12; - var key = peg$currPos * 58 + 41; + var key = peg$currPos * 59 + 42; var cached = peg$resultsCache[key]; if (cached) { @@ -3480,7 +3563,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } + if (peg$silentFails === 0) { peg$fail(peg$e54); } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -3492,7 +3575,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } + if (peg$silentFails === 0) { peg$fail(peg$e54); } } if (s7 !== peg$FAILED) { s8 = peg$parse_nl(); @@ -3568,7 +3651,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } + if (peg$silentFails === 0) { peg$fail(peg$e54); } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -3580,7 +3663,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } + if (peg$silentFails === 0) { peg$fail(peg$e54); } } if (s7 !== peg$FAILED) { s8 = peg$parse_nl(); @@ -3631,7 +3714,7 @@ function peg$parse(input, options) { function peg$parsearrayConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 42; + var key = peg$currPos * 59 + 43; var cached = peg$resultsCache[key]; if (cached) { @@ -3709,7 +3792,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e52); } + if (peg$silentFails === 0) { peg$fail(peg$e55); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3720,7 +3803,7 @@ function peg$parse(input, options) { function peg$parsearray_elements() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 43; + var key = peg$currPos * 59 + 44; var cached = peg$resultsCache[key]; if (cached) { @@ -3795,7 +3878,7 @@ function peg$parse(input, options) { function peg$parserecordConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 44; + var key = peg$currPos * 59 + 45; var cached = peg$resultsCache[key]; if (cached) { @@ -3843,7 +3926,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e53); } + if (peg$silentFails === 0) { peg$fail(peg$e56); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3854,7 +3937,7 @@ function peg$parse(input, options) { function peg$parsearray_recordArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 45; + var key = peg$currPos * 59 + 46; var cached = peg$resultsCache[key]; if (cached) { @@ -3929,7 +4012,7 @@ function peg$parse(input, options) { function peg$parsekeyValuePair() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 46; + var key = peg$currPos * 59 + 47; var cached = peg$resultsCache[key]; if (cached) { @@ -3976,7 +4059,7 @@ function peg$parse(input, options) { function peg$parse_() { var s0, s1; - var key = peg$currPos * 58 + 47; + var key = peg$currPos * 59 + 48; var cached = peg$resultsCache[key]; if (cached) { @@ -3994,7 +4077,7 @@ function peg$parse(input, options) { } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } + if (peg$silentFails === 0) { peg$fail(peg$e57); } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4004,7 +4087,7 @@ function peg$parse(input, options) { function peg$parse_nl() { var s0, s1; - var key = peg$currPos * 58 + 48; + var key = peg$currPos * 59 + 49; var cached = peg$resultsCache[key]; if (cached) { @@ -4028,7 +4111,7 @@ function peg$parse(input, options) { } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e55); } + if (peg$silentFails === 0) { peg$fail(peg$e58); } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4038,7 +4121,7 @@ function peg$parse(input, options) { function peg$parse__() { var s0, s1; - var key = peg$currPos * 58 + 49; + var key = peg$currPos * 59 + 50; var cached = peg$resultsCache[key]; if (cached) { @@ -4061,7 +4144,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e56); } + if (peg$silentFails === 0) { peg$fail(peg$e59); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4072,7 +4155,7 @@ function peg$parse(input, options) { function peg$parse__nl() { var s0, s1; - var key = peg$currPos * 58 + 50; + var key = peg$currPos * 59 + 51; var cached = peg$resultsCache[key]; if (cached) { @@ -4101,7 +4184,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } + if (peg$silentFails === 0) { peg$fail(peg$e60); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4112,7 +4195,7 @@ function peg$parse(input, options) { function peg$parsestatementSeparator() { var s0, s1, s2, s3; - var key = peg$currPos * 58 + 51; + var key = peg$currPos * 59 + 52; var cached = peg$resultsCache[key]; if (cached) { @@ -4130,7 +4213,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e59); } + if (peg$silentFails === 0) { peg$fail(peg$e62); } } if (s3 === peg$FAILED) { s3 = peg$parsecommentOrNewLine(); @@ -4143,7 +4226,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e59); } + if (peg$silentFails === 0) { peg$fail(peg$e62); } } if (s3 === peg$FAILED) { s3 = peg$parsecommentOrNewLine(); @@ -4163,7 +4246,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e58); } + if (peg$silentFails === 0) { peg$fail(peg$e61); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4174,7 +4257,7 @@ function peg$parse(input, options) { function peg$parsecommentOrNewLine() { var s0, s1, s2; - var key = peg$currPos * 58 + 52; + var key = peg$currPos * 59 + 53; var cached = peg$resultsCache[key]; if (cached) { @@ -4205,7 +4288,7 @@ function peg$parse(input, options) { function peg$parsefinalComment() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 53; + var key = peg$currPos * 59 + 54; var cached = peg$resultsCache[key]; if (cached) { @@ -4222,7 +4305,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e61); } + if (peg$silentFails === 0) { peg$fail(peg$e64); } } if (s2 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 35) { @@ -4230,26 +4313,26 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e62); } + if (peg$silentFails === 0) { peg$fail(peg$e65); } } } if (s2 !== peg$FAILED) { s3 = []; - if (peg$r6.test(input.charAt(peg$currPos))) { + if (peg$r8.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e63); } + if (peg$silentFails === 0) { peg$fail(peg$e66); } } while (s4 !== peg$FAILED) { s3.push(s4); - if (peg$r6.test(input.charAt(peg$currPos))) { + if (peg$r8.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e63); } + if (peg$silentFails === 0) { peg$fail(peg$e66); } } } s0 = s3; @@ -4260,7 +4343,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } + if (peg$silentFails === 0) { peg$fail(peg$e63); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4271,7 +4354,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharactersOrComment() { var s0; - var key = peg$currPos * 58 + 54; + var key = peg$currPos * 59 + 55; var cached = peg$resultsCache[key]; if (cached) { @@ -4293,7 +4376,7 @@ function peg$parse(input, options) { function peg$parsedelimitedComment() { var s0, s1, s2, s3; - var key = peg$currPos * 58 + 55; + var key = peg$currPos * 59 + 56; var cached = peg$resultsCache[key]; if (cached) { @@ -4309,25 +4392,25 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e65); } + if (peg$silentFails === 0) { peg$fail(peg$e68); } } if (s1 !== peg$FAILED) { s2 = []; - if (peg$r7.test(input.charAt(peg$currPos))) { + if (peg$r9.test(input.charAt(peg$currPos))) { s3 = input.charAt(peg$currPos); peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e66); } + if (peg$silentFails === 0) { peg$fail(peg$e69); } } while (s3 !== peg$FAILED) { s2.push(s3); - if (peg$r7.test(input.charAt(peg$currPos))) { + if (peg$r9.test(input.charAt(peg$currPos))) { s3 = input.charAt(peg$currPos); peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e66); } + if (peg$silentFails === 0) { peg$fail(peg$e69); } } } if (input.substr(peg$currPos, 2) === peg$c45) { @@ -4335,7 +4418,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e67); } + if (peg$silentFails === 0) { peg$fail(peg$e70); } } if (s3 !== peg$FAILED) { s0 = s2; @@ -4350,7 +4433,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } + if (peg$silentFails === 0) { peg$fail(peg$e67); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4361,7 +4444,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharacters() { var s0; - var key = peg$currPos * 58 + 56; + var key = peg$currPos * 59 + 57; var cached = peg$resultsCache[key]; if (cached) { @@ -4370,12 +4453,12 @@ function peg$parse(input, options) { return cached.result; } - if (peg$r8.test(input.charAt(peg$currPos))) { + if (peg$r10.test(input.charAt(peg$currPos))) { s0 = input.charAt(peg$currPos); peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } + if (peg$silentFails === 0) { peg$fail(peg$e71); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4386,7 +4469,7 @@ function peg$parse(input, options) { function peg$parsenewLine() { var s0, s1; - var key = peg$currPos * 58 + 57; + var key = peg$currPos * 59 + 58; var cached = peg$resultsCache[key]; if (cached) { @@ -4396,17 +4479,17 @@ function peg$parse(input, options) { } peg$silentFails++; - if (peg$r9.test(input.charAt(peg$currPos))) { + if (peg$r11.test(input.charAt(peg$currPos))) { s0 = input.charAt(peg$currPos); peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e70); } + if (peg$silentFails === 0) { peg$fail(peg$e73); } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e69); } + if (peg$silentFails === 0) { peg$fail(peg$e72); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy index 7f47c761..bc2004d6 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy @@ -108,7 +108,7 @@ defunStatement return nodeLetStatment(variable, value) } array_parameters - = head:identifier tail:(_ ',' _nl @identifier)* + = head:dollarIdentifier tail:(_ ',' _nl @dollarIdentifier)* { return [head, ...tail]; } expression = ifthenelse / ternary / logicalAdditive @@ -177,11 +177,11 @@ chainFunctionCall }, head)} chainedFunction - = fn:identifier '(' _nl args:array_functionArguments _nl ')' + = fn:dollarIdentifier '(' _nl args:array_functionArguments _nl ')' { return {fnName: fn.value, args: args}} - / fn:identifier '(' _nl ')' + / fn:dollarIdentifier '(' _nl ')' { return {fnName: fn.value, args: []}} - / fn:identifier + / fn:dollarIdentifier { return {fnName: fn.value, args: []}} // end of binary operators @@ -219,8 +219,8 @@ maybeRecordElement / atom recordElement - = head:identifier &'.' - tail:(_ '.' _nl arg:$identifier {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}})* + = head:dollarIdentifier &'.' + tail:(_ '.' _nl arg:$dollarIdentifier {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}})* { return tail.reduce(function(result, element) { return makeFunctionCall(element.fn, [result, ...element.args]) }, head)} @@ -236,10 +236,13 @@ basicLiteral / float / integer / boolean - / identifier + / dollarIdentifier identifier 'identifier' - = identifier:([_a-z]+[_a-z0-9]i*) {return nodeIdentifier(text())} + = ([_a-z]+[_a-z0-9]i*) {return nodeIdentifier(text())} + +dollarIdentifier '$identifier' + = ([\$_a-z]+[\$_a-z0-9]i*) {return nodeIdentifier(text())} string 'string' = characters:("'" @([^'])* "'") {return nodeString(characters.join(''))} From 7005e9228021f7316095d4290ad7e05446da27b5 Mon Sep 17 00:00:00 2001 From: Quinn Date: Fri, 20 May 2022 11:35:50 -0400 Subject: [PATCH 186/340] Hotfix: relative paths --- packages/website/docs/Features/Language.mdx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/website/docs/Features/Language.mdx b/packages/website/docs/Features/Language.mdx index 31ff041d..54bfc4ac 100644 --- a/packages/website/docs/Features/Language.mdx +++ b/packages/website/docs/Features/Language.mdx @@ -49,6 +49,6 @@ ozzie_estimate(1) * nuno_estimate(1, 1)`} ## See more -- [Distribution creation](./Distributions) -- [Functions reference](./Functions) -- [Gallery](../Discussions/Gallery) +- [Distribution creation](./../Distributions) +- [Functions reference](./../Functions) +- [Gallery](./../../Discussions/Gallery) From 9f5443f76c956220dc9fa46af51d54c340e4d4ac Mon Sep 17 00:00:00 2001 From: Quinn Date: Fri, 20 May 2022 11:41:20 -0400 Subject: [PATCH 187/340] hotfix: relative paths 2 --- packages/website/docs/Features/Language.mdx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/website/docs/Features/Language.mdx b/packages/website/docs/Features/Language.mdx index 54bfc4ac..42827d7e 100644 --- a/packages/website/docs/Features/Language.mdx +++ b/packages/website/docs/Features/Language.mdx @@ -49,6 +49,6 @@ ozzie_estimate(1) * nuno_estimate(1, 1)`} ## See more -- [Distribution creation](./../Distributions) -- [Functions reference](./../Functions) -- [Gallery](./../../Discussions/Gallery) +- [Distribution creation](../Distributions) +- [Functions reference](../Functions) +- [Gallery](../../Discussions/Gallery) From a314cd46fb6d29c78addfd59aa3daf3bb0e508a2 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Fri, 20 May 2022 17:46:02 +0200 Subject: [PATCH 188/340] . became a post operator that can operate on any expression Because of $x.y[0][0].w + $x.z + $u.v --- .../Reducer_Peggy_GeneratedParser.js | 328 ++++++++++-------- .../Reducer_Peggy_GeneratedParser.peggy | 22 +- 2 files changed, 200 insertions(+), 150 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index c7ad1931..80cd0e2f 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -268,8 +268,8 @@ function peg$parse(input, options) { var peg$c31 = "|>"; var peg$c32 = "!"; var peg$c33 = "["; - var peg$c34 = "]"; - var peg$c35 = "."; + var peg$c34 = "."; + var peg$c35 = "]"; var peg$c36 = "'"; var peg$c37 = "\""; var peg$c38 = "true"; @@ -328,8 +328,8 @@ function peg$parse(input, options) { var peg$e31 = peg$literalExpectation("|>", false); var peg$e32 = peg$literalExpectation("!", false); var peg$e33 = peg$literalExpectation("[", false); - var peg$e34 = peg$literalExpectation("]", false); - var peg$e35 = peg$literalExpectation(".", false); + var peg$e34 = peg$literalExpectation(".", false); + var peg$e35 = peg$literalExpectation("]", false); var peg$e36 = peg$otherExpectation("identifier"); var peg$e37 = peg$classExpectation(["_", ["a", "z"]], false, false); var peg$e38 = peg$classExpectation(["_", ["a", "z"], ["0", "9"]], false, true); @@ -397,23 +397,27 @@ function peg$parse(input, options) { var peg$f18 = function(unaryOperator, right) { return makeFunctionCall(unaryToFunction[unaryOperator], [right])}; var peg$f19 = function(head, arg) {return {fn: postOperatorToFunction['[]'], args: [arg]}}; var peg$f20 = function(head, args) {return {fn: postOperatorToFunction['()'], args: args}}; - var peg$f21 = function(head, tail) { return tail.reduce(function(result, element) { + var peg$f21 = function(head, arg) {return {fn: postOperatorToFunction['[]'], args: [nodeString(arg)]}}; + var peg$f22 = function(head, tail) { return tail.reduce(function(result, element) { return makeFunctionCall(element.fn, [result, ...element.args]) }, head)}; - var peg$f22 = function(head, arg) {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}}; - var peg$f23 = function(expression) {return expression}; - var peg$f24 = function() {return nodeIdentifier(text())}; - var peg$f25 = function(characters) {return nodeString(characters.join(''))}; - var peg$f26 = function() { return nodeInteger(parseInt(text()))}; - var peg$f27 = function() { return nodeFloat(parseFloat(text()))}; - var peg$f28 = function() { return nodeBoolean(text() === 'true')}; - var peg$f29 = function(args, statements, finalExpression) { statements.push(finalExpression) + var peg$f23 = function(head, arg) {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}}; + var peg$f24 = function(head, tail) { return tail.reduce(function(result, element) { + return makeFunctionCall(element.fn, [result, ...element.args]) + }, head)}; + var peg$f25 = function(expression) {return expression}; + var peg$f26 = function() {return nodeIdentifier(text())}; + var peg$f27 = function(characters) {return nodeString(characters.join(''))}; + var peg$f28 = function() { return nodeInteger(parseInt(text()))}; + var peg$f29 = function() { return nodeFloat(parseFloat(text()))}; + var peg$f30 = function() { return nodeBoolean(text() === 'true')}; + var peg$f31 = function(args, statements, finalExpression) { statements.push(finalExpression) return nodeLambda(args, nodeBlock(statements)) }; - var peg$f30 = function(args, finalExpression) { return nodeLambda(args, nodeBlock([finalExpression])) }; - var peg$f31 = function() { return makeFunctionCall('$_constructArray_$', [nodeExpression([])])}; - var peg$f32 = function(args) { return makeFunctionCall('$_constructArray_$', [nodeExpression(args)])}; - var peg$f33 = function(args) { return makeFunctionCall('$_constructRecord_$', [nodeExpression(args)])}; - var peg$f34 = function(key, value) { return nodeKeyValue(key, value)}; + var peg$f32 = function(args, finalExpression) { return nodeLambda(args, nodeBlock([finalExpression])) }; + var peg$f33 = function() { return makeFunctionCall('$_constructArray_$', [nodeExpression([])])}; + var peg$f34 = function(args) { return makeFunctionCall('$_constructArray_$', [nodeExpression(args)])}; + var peg$f35 = function(args) { return makeFunctionCall('$_constructRecord_$', [nodeExpression(args)])}; + var peg$f36 = function(key, value) { return nodeKeyValue(key, value)}; var peg$currPos = 0; var peg$savedPos = 0; @@ -575,7 +579,7 @@ function peg$parse(input, options) { function peg$parsestart() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 59 + 0; + var key = peg$currPos * 58 + 0; var cached = peg$resultsCache[key]; if (cached) { @@ -608,7 +612,7 @@ function peg$parse(input, options) { function peg$parsezeroOMoreArgumentsBlockOrExpression() { var s0; - var key = peg$currPos * 59 + 1; + var key = peg$currPos * 58 + 1; var cached = peg$resultsCache[key]; if (cached) { @@ -630,7 +634,7 @@ function peg$parse(input, options) { function peg$parseouterBlock() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 59 + 2; + var key = peg$currPos * 58 + 2; var cached = peg$resultsCache[key]; if (cached) { @@ -683,7 +687,7 @@ function peg$parse(input, options) { function peg$parseinnerBlockOrExpression() { var s0, s1; - var key = peg$currPos * 59 + 3; + var key = peg$currPos * 58 + 3; var cached = peg$resultsCache[key]; if (cached) { @@ -711,7 +715,7 @@ function peg$parse(input, options) { function peg$parsequotedInnerBlock() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 59 + 4; + var key = peg$currPos * 58 + 4; var cached = peg$resultsCache[key]; if (cached) { @@ -820,7 +824,7 @@ function peg$parse(input, options) { function peg$parsearray_statements() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 59 + 5; + var key = peg$currPos * 58 + 5; var cached = peg$resultsCache[key]; if (cached) { @@ -875,7 +879,7 @@ function peg$parse(input, options) { function peg$parsestatement() { var s0; - var key = peg$currPos * 59 + 6; + var key = peg$currPos * 58 + 6; var cached = peg$resultsCache[key]; if (cached) { @@ -897,7 +901,7 @@ function peg$parse(input, options) { function peg$parseletStatement() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 59 + 7; + var key = peg$currPos * 58 + 7; var cached = peg$resultsCache[key]; if (cached) { @@ -944,7 +948,7 @@ function peg$parse(input, options) { function peg$parsedefunStatement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 59 + 8; + var key = peg$currPos * 58 + 8; var cached = peg$resultsCache[key]; if (cached) { @@ -1023,7 +1027,7 @@ function peg$parse(input, options) { function peg$parsearray_parameters() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 9; + var key = peg$currPos * 58 + 9; var cached = peg$resultsCache[key]; if (cached) { @@ -1098,7 +1102,7 @@ function peg$parse(input, options) { function peg$parseexpression() { var s0; - var key = peg$currPos * 59 + 10; + var key = peg$currPos * 58 + 10; var cached = peg$resultsCache[key]; if (cached) { @@ -1123,7 +1127,7 @@ function peg$parse(input, options) { function peg$parseifthenelse() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11; - var key = peg$currPos * 59 + 11; + var key = peg$currPos * 58 + 11; var cached = peg$resultsCache[key]; if (cached) { @@ -1231,7 +1235,7 @@ function peg$parse(input, options) { function peg$parseternary() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 59 + 12; + var key = peg$currPos * 58 + 12; var cached = peg$resultsCache[key]; if (cached) { @@ -1301,7 +1305,7 @@ function peg$parse(input, options) { function peg$parselogicalAdditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 13; + var key = peg$currPos * 58 + 13; var cached = peg$resultsCache[key]; if (cached) { @@ -1378,7 +1382,7 @@ function peg$parse(input, options) { function peg$parselogicalMultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 14; + var key = peg$currPos * 58 + 14; var cached = peg$resultsCache[key]; if (cached) { @@ -1455,7 +1459,7 @@ function peg$parse(input, options) { function peg$parseequality() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 59 + 15; + var key = peg$currPos * 58 + 15; var cached = peg$resultsCache[key]; if (cached) { @@ -1514,7 +1518,7 @@ function peg$parse(input, options) { function peg$parserelational() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 59 + 16; + var key = peg$currPos * 58 + 16; var cached = peg$resultsCache[key]; if (cached) { @@ -1591,7 +1595,7 @@ function peg$parse(input, options) { function peg$parseadditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 17; + var key = peg$currPos * 58 + 17; var cached = peg$resultsCache[key]; if (cached) { @@ -1722,7 +1726,7 @@ function peg$parse(input, options) { function peg$parsemultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 18; + var key = peg$currPos * 58 + 18; var cached = peg$resultsCache[key]; if (cached) { @@ -1853,7 +1857,7 @@ function peg$parse(input, options) { function peg$parsepower() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 19; + var key = peg$currPos * 58 + 19; var cached = peg$resultsCache[key]; if (cached) { @@ -1948,7 +1952,7 @@ function peg$parse(input, options) { function peg$parsecredibleInterval() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 20; + var key = peg$currPos * 58 + 20; var cached = peg$resultsCache[key]; if (cached) { @@ -2045,7 +2049,7 @@ function peg$parse(input, options) { function peg$parsechainFunctionCall() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 21; + var key = peg$currPos * 58 + 21; var cached = peg$resultsCache[key]; if (cached) { @@ -2140,7 +2144,7 @@ function peg$parse(input, options) { function peg$parsechainedFunction() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 59 + 22; + var key = peg$currPos * 58 + 22; var cached = peg$resultsCache[key]; if (cached) { @@ -2244,7 +2248,7 @@ function peg$parse(input, options) { function peg$parseunary() { var s0, s1, s2, s3; - var key = peg$currPos * 59 + 23; + var key = peg$currPos * 58 + 23; var cached = peg$resultsCache[key]; if (cached) { @@ -2284,7 +2288,7 @@ function peg$parse(input, options) { function peg$parseunaryOperator() { var s0; - var key = peg$currPos * 59 + 24; + var key = peg$currPos * 58 + 24; var cached = peg$resultsCache[key]; if (cached) { @@ -2327,7 +2331,7 @@ function peg$parse(input, options) { function peg$parseindexedValue() { var s0; - var key = peg$currPos * 59 + 25; + var key = peg$currPos * 58 + 25; var cached = peg$resultsCache[key]; if (cached) { @@ -2338,7 +2342,10 @@ function peg$parse(input, options) { s0 = peg$parsecollectionElement(); if (s0 === peg$FAILED) { - s0 = peg$parsemaybeRecordElement(); + s0 = peg$parserecordElement(); + if (s0 === peg$FAILED) { + s0 = peg$parseatom(); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -2349,7 +2356,7 @@ function peg$parse(input, options) { function peg$parsecollectionElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 59 + 26; + var key = peg$currPos * 58 + 26; var cached = peg$resultsCache[key]; if (cached) { @@ -2359,7 +2366,7 @@ function peg$parse(input, options) { } s0 = peg$currPos; - s1 = peg$parsemaybeRecordElement(); + s1 = peg$parseatom(); if (s1 !== peg$FAILED) { s2 = peg$currPos; peg$silentFails++; @@ -2378,6 +2385,15 @@ function peg$parse(input, options) { s3 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$e3); } } + if (s3 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 46) { + s3 = peg$c34; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e34); } + } + } } peg$silentFails--; if (s3 !== peg$FAILED) { @@ -2403,11 +2419,11 @@ function peg$parse(input, options) { if (s8 !== peg$FAILED) { s9 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 93) { - s10 = peg$c34; + s10 = peg$c35; peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e35); } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2461,6 +2477,35 @@ function peg$parse(input, options) { peg$currPos = s4; s4 = peg$FAILED; } + if (s4 === peg$FAILED) { + s4 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 46) { + s5 = peg$c34; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e34); } + } + if (s5 !== peg$FAILED) { + s6 = peg$currPos; + s7 = peg$parsedollarIdentifier(); + if (s7 !== peg$FAILED) { + s6 = input.substring(s6, peg$currPos); + } else { + s6 = s7; + } + if (s6 !== peg$FAILED) { + peg$savedPos = s4; + s4 = peg$f21(s1, s6); + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -2479,11 +2524,11 @@ function peg$parse(input, options) { if (s8 !== peg$FAILED) { s9 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 93) { - s10 = peg$c34; + s10 = peg$c35; peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e35); } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2537,10 +2582,39 @@ function peg$parse(input, options) { peg$currPos = s4; s4 = peg$FAILED; } + if (s4 === peg$FAILED) { + s4 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 46) { + s5 = peg$c34; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e34); } + } + if (s5 !== peg$FAILED) { + s6 = peg$currPos; + s7 = peg$parsedollarIdentifier(); + if (s7 !== peg$FAILED) { + s6 = input.substring(s6, peg$currPos); + } else { + s6 = s7; + } + if (s6 !== peg$FAILED) { + peg$savedPos = s4; + s4 = peg$f21(s1, s6); + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } } } peg$savedPos = s0; - s0 = peg$f21(s1, s3); + s0 = peg$f22(s1, s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2558,7 +2632,7 @@ function peg$parse(input, options) { function peg$parsearray_functionArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 27; + var key = peg$currPos * 58 + 27; var cached = peg$resultsCache[key]; if (cached) { @@ -2630,32 +2704,10 @@ function peg$parse(input, options) { return s0; } - function peg$parsemaybeRecordElement() { - var s0; - - var key = peg$currPos * 59 + 28; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parserecordElement(); - if (s0 === peg$FAILED) { - s0 = peg$parseatom(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - function peg$parserecordElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 59 + 29; + var key = peg$currPos * 58 + 28; var cached = peg$resultsCache[key]; if (cached) { @@ -2670,11 +2722,11 @@ function peg$parse(input, options) { s2 = peg$currPos; peg$silentFails++; if (input.charCodeAt(peg$currPos) === 46) { - s3 = peg$c35; + s3 = peg$c34; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e34); } } peg$silentFails--; if (s3 !== peg$FAILED) { @@ -2688,11 +2740,11 @@ function peg$parse(input, options) { s4 = peg$currPos; s5 = peg$parse_(); if (input.charCodeAt(peg$currPos) === 46) { - s6 = peg$c35; + s6 = peg$c34; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e34); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2705,7 +2757,7 @@ function peg$parse(input, options) { } if (s8 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f22(s1, s8); + s4 = peg$f23(s1, s8); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -2719,11 +2771,11 @@ function peg$parse(input, options) { s4 = peg$currPos; s5 = peg$parse_(); if (input.charCodeAt(peg$currPos) === 46) { - s6 = peg$c35; + s6 = peg$c34; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e34); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2736,7 +2788,7 @@ function peg$parse(input, options) { } if (s8 !== peg$FAILED) { peg$savedPos = s4; - s4 = peg$f22(s1, s8); + s4 = peg$f23(s1, s8); } else { peg$currPos = s4; s4 = peg$FAILED; @@ -2747,7 +2799,7 @@ function peg$parse(input, options) { } } peg$savedPos = s0; - s0 = peg$f21(s1, s3); + s0 = peg$f24(s1, s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2765,7 +2817,7 @@ function peg$parse(input, options) { function peg$parseatom() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 59 + 30; + var key = peg$currPos * 58 + 29; var cached = peg$resultsCache[key]; if (cached) { @@ -2796,7 +2848,7 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f23(s3); + s0 = peg$f25(s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -2821,7 +2873,7 @@ function peg$parse(input, options) { function peg$parsebasicValue() { var s0; - var key = peg$currPos * 59 + 31; + var key = peg$currPos * 58 + 30; var cached = peg$resultsCache[key]; if (cached) { @@ -2843,7 +2895,7 @@ function peg$parse(input, options) { function peg$parsebasicLiteral() { var s0; - var key = peg$currPos * 59 + 32; + var key = peg$currPos * 58 + 31; var cached = peg$resultsCache[key]; if (cached) { @@ -2874,7 +2926,7 @@ function peg$parse(input, options) { function peg$parseidentifier() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 59 + 33; + var key = peg$currPos * 58 + 32; var cached = peg$resultsCache[key]; if (cached) { @@ -2935,7 +2987,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f24(); + s1 = peg$f26(); } s0 = s1; peg$silentFails--; @@ -2952,7 +3004,7 @@ function peg$parse(input, options) { function peg$parsedollarIdentifier() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 59 + 34; + var key = peg$currPos * 58 + 33; var cached = peg$resultsCache[key]; if (cached) { @@ -3013,7 +3065,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f24(); + s1 = peg$f26(); } s0 = s1; peg$silentFails--; @@ -3030,7 +3082,7 @@ function peg$parse(input, options) { function peg$parsestring() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 59 + 35; + var key = peg$currPos * 58 + 34; var cached = peg$resultsCache[key]; if (cached) { @@ -3087,7 +3139,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f25(s1); + s1 = peg$f27(s1); } s0 = s1; if (s0 === peg$FAILED) { @@ -3138,7 +3190,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f25(s1); + s1 = peg$f27(s1); } s0 = s1; } @@ -3156,7 +3208,7 @@ function peg$parse(input, options) { function peg$parseinteger() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 59 + 36; + var key = peg$currPos * 58 + 35; var cached = peg$resultsCache[key]; if (cached) { @@ -3181,11 +3233,11 @@ function peg$parse(input, options) { s2 = peg$currPos; peg$silentFails++; if (input.charCodeAt(peg$currPos) === 46) { - s3 = peg$c35; + s3 = peg$c34; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e34); } } peg$silentFails--; if (s3 === peg$FAILED) { @@ -3213,7 +3265,7 @@ function peg$parse(input, options) { } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f26(); + s0 = peg$f28(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3240,7 +3292,7 @@ function peg$parse(input, options) { function peg$parsefloat() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 37; + var key = peg$currPos * 58 + 36; var cached = peg$resultsCache[key]; if (cached) { @@ -3266,11 +3318,11 @@ function peg$parse(input, options) { } if (s4 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 46) { - s5 = peg$c35; + s5 = peg$c34; peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e34); } } if (s5 !== peg$FAILED) { s6 = []; @@ -3292,11 +3344,11 @@ function peg$parse(input, options) { if (s3 === peg$FAILED) { s3 = peg$currPos; if (input.charCodeAt(peg$currPos) === 46) { - s4 = peg$c35; + s4 = peg$c34; peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e34); } } if (s4 !== peg$FAILED) { s5 = []; @@ -3365,7 +3417,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f27(); + s1 = peg$f29(); } s0 = s1; peg$silentFails--; @@ -3382,7 +3434,7 @@ function peg$parse(input, options) { function peg$parsefloatExponent() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 59 + 38; + var key = peg$currPos * 58 + 37; var cached = peg$resultsCache[key]; if (cached) { @@ -3440,7 +3492,7 @@ function peg$parse(input, options) { function peg$parsed() { var s0; - var key = peg$currPos * 59 + 39; + var key = peg$currPos * 58 + 38; var cached = peg$resultsCache[key]; if (cached) { @@ -3465,7 +3517,7 @@ function peg$parse(input, options) { function peg$parseboolean() { var s0, s1; - var key = peg$currPos * 59 + 40; + var key = peg$currPos * 58 + 39; var cached = peg$resultsCache[key]; if (cached) { @@ -3494,7 +3546,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f28(); + s1 = peg$f30(); } s0 = s1; peg$silentFails--; @@ -3511,7 +3563,7 @@ function peg$parse(input, options) { function peg$parsevalueConstructor() { var s0; - var key = peg$currPos * 59 + 41; + var key = peg$currPos * 58 + 40; var cached = peg$resultsCache[key]; if (cached) { @@ -3539,7 +3591,7 @@ function peg$parse(input, options) { function peg$parselambda() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12; - var key = peg$currPos * 59 + 42; + var key = peg$currPos * 58 + 41; var cached = peg$resultsCache[key]; if (cached) { @@ -3606,7 +3658,7 @@ function peg$parse(input, options) { } if (s12 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f29(s5, s9, s10); + s0 = peg$f31(s5, s9, s10); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3679,7 +3731,7 @@ function peg$parse(input, options) { } if (s11 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f30(s5, s9); + s0 = peg$f32(s5, s9); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3714,7 +3766,7 @@ function peg$parse(input, options) { function peg$parsearrayConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 59 + 43; + var key = peg$currPos * 58 + 42; var cached = peg$resultsCache[key]; if (cached) { @@ -3735,15 +3787,15 @@ function peg$parse(input, options) { if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 93) { - s3 = peg$c34; + s3 = peg$c35; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e35); } } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f31(); + s0 = peg$f33(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3767,15 +3819,15 @@ function peg$parse(input, options) { if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 93) { - s5 = peg$c34; + s5 = peg$c35; peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e35); } } if (s5 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f32(s3); + s0 = peg$f34(s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3803,7 +3855,7 @@ function peg$parse(input, options) { function peg$parsearray_elements() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 44; + var key = peg$currPos * 58 + 43; var cached = peg$resultsCache[key]; if (cached) { @@ -3878,7 +3930,7 @@ function peg$parse(input, options) { function peg$parserecordConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 59 + 45; + var key = peg$currPos * 58 + 44; var cached = peg$resultsCache[key]; if (cached) { @@ -3910,7 +3962,7 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f33(s3); + s0 = peg$f35(s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3937,7 +3989,7 @@ function peg$parse(input, options) { function peg$parsearray_recordArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 59 + 46; + var key = peg$currPos * 58 + 45; var cached = peg$resultsCache[key]; if (cached) { @@ -4012,7 +4064,7 @@ function peg$parse(input, options) { function peg$parsekeyValuePair() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 59 + 47; + var key = peg$currPos * 58 + 46; var cached = peg$resultsCache[key]; if (cached) { @@ -4037,7 +4089,7 @@ function peg$parse(input, options) { s5 = peg$parseexpression(); if (s5 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f34(s1, s5); + s0 = peg$f36(s1, s5); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4059,7 +4111,7 @@ function peg$parse(input, options) { function peg$parse_() { var s0, s1; - var key = peg$currPos * 59 + 48; + var key = peg$currPos * 58 + 47; var cached = peg$resultsCache[key]; if (cached) { @@ -4087,7 +4139,7 @@ function peg$parse(input, options) { function peg$parse_nl() { var s0, s1; - var key = peg$currPos * 59 + 49; + var key = peg$currPos * 58 + 48; var cached = peg$resultsCache[key]; if (cached) { @@ -4121,7 +4173,7 @@ function peg$parse(input, options) { function peg$parse__() { var s0, s1; - var key = peg$currPos * 59 + 50; + var key = peg$currPos * 58 + 49; var cached = peg$resultsCache[key]; if (cached) { @@ -4155,7 +4207,7 @@ function peg$parse(input, options) { function peg$parse__nl() { var s0, s1; - var key = peg$currPos * 59 + 51; + var key = peg$currPos * 58 + 50; var cached = peg$resultsCache[key]; if (cached) { @@ -4195,7 +4247,7 @@ function peg$parse(input, options) { function peg$parsestatementSeparator() { var s0, s1, s2, s3; - var key = peg$currPos * 59 + 52; + var key = peg$currPos * 58 + 51; var cached = peg$resultsCache[key]; if (cached) { @@ -4257,7 +4309,7 @@ function peg$parse(input, options) { function peg$parsecommentOrNewLine() { var s0, s1, s2; - var key = peg$currPos * 59 + 53; + var key = peg$currPos * 58 + 52; var cached = peg$resultsCache[key]; if (cached) { @@ -4288,7 +4340,7 @@ function peg$parse(input, options) { function peg$parsefinalComment() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 59 + 54; + var key = peg$currPos * 58 + 53; var cached = peg$resultsCache[key]; if (cached) { @@ -4354,7 +4406,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharactersOrComment() { var s0; - var key = peg$currPos * 59 + 55; + var key = peg$currPos * 58 + 54; var cached = peg$resultsCache[key]; if (cached) { @@ -4376,7 +4428,7 @@ function peg$parse(input, options) { function peg$parsedelimitedComment() { var s0, s1, s2, s3; - var key = peg$currPos * 59 + 56; + var key = peg$currPos * 58 + 55; var cached = peg$resultsCache[key]; if (cached) { @@ -4444,7 +4496,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharacters() { var s0; - var key = peg$currPos * 59 + 57; + var key = peg$currPos * 58 + 56; var cached = peg$resultsCache[key]; if (cached) { @@ -4469,7 +4521,7 @@ function peg$parse(input, options) { function peg$parsenewLine() { var s0, s1; - var key = peg$currPos * 59 + 58; + var key = peg$currPos * 58 + 57; var cached = peg$resultsCache[key]; if (cached) { diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy index bc2004d6..35fac4fd 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy @@ -198,13 +198,15 @@ postOperator = indexedValue indexedValue = collectionElement - / maybeRecordElement + / recordElement + / atom collectionElement - = head:maybeRecordElement &('['/'(') + = head:atom &('['/'('/'.') tail:( _ '[' _nl arg:expression _nl ']' {return {fn: postOperatorToFunction['[]'], args: [arg]}} / _ '(' _nl args:array_functionArguments _nl ')' {return {fn: postOperatorToFunction['()'], args: args}} + / '.' arg:$dollarIdentifier {return {fn: postOperatorToFunction['[]'], args: [nodeString(arg)]}} )* { return tail.reduce(function(result, element) { return makeFunctionCall(element.fn, [result, ...element.args]) @@ -214,16 +216,12 @@ indexedValue = head:expression tail:(_ ',' _nl @expression)* { return [head, ...tail]; } -maybeRecordElement - = recordElement - / atom - - recordElement - = head:dollarIdentifier &'.' - tail:(_ '.' _nl arg:$dollarIdentifier {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}})* - { return tail.reduce(function(result, element) { - return makeFunctionCall(element.fn, [result, ...element.args]) - }, head)} +recordElement + = head:dollarIdentifier &'.' + tail:(_ '.' _nl arg:$dollarIdentifier {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}})* + { return tail.reduce(function(result, element) { + return makeFunctionCall(element.fn, [result, ...element.args]) + }, head)} atom = '(' _nl expression:expression _nl ')' {return expression} From e901d42aff3477fd11f1d55f322be744a6bec634 Mon Sep 17 00:00:00 2001 From: Quinn Date: Fri, 20 May 2022 11:46:10 -0400 Subject: [PATCH 189/340] Hotfix: relative paths 3 --- packages/website/docs/Features/Language.mdx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/website/docs/Features/Language.mdx b/packages/website/docs/Features/Language.mdx index 42827d7e..ab30be3e 100644 --- a/packages/website/docs/Features/Language.mdx +++ b/packages/website/docs/Features/Language.mdx @@ -49,6 +49,6 @@ ozzie_estimate(1) * nuno_estimate(1, 1)`} ## See more -- [Distribution creation](../Distributions) -- [Functions reference](../Functions) -- [Gallery](../../Discussions/Gallery) +- [Distribution creation](/Distributions) +- [Functions reference](/Functions) +- [Gallery](../Discussions/Gallery) From 7ead53813e1321cd5f880db221a1e5bfd9e140f3 Mon Sep 17 00:00:00 2001 From: Quinn Date: Fri, 20 May 2022 11:50:53 -0400 Subject: [PATCH 190/340] Hotfix: relative paths 4 --- packages/website/docs/Features/Language.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/website/docs/Features/Language.mdx b/packages/website/docs/Features/Language.mdx index ab30be3e..31ff041d 100644 --- a/packages/website/docs/Features/Language.mdx +++ b/packages/website/docs/Features/Language.mdx @@ -49,6 +49,6 @@ ozzie_estimate(1) * nuno_estimate(1, 1)`} ## See more -- [Distribution creation](/Distributions) -- [Functions reference](/Functions) +- [Distribution creation](./Distributions) +- [Functions reference](./Functions) - [Gallery](../Discussions/Gallery) From a17ea3f5a12c57c054332d36bb06127f500205b3 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Fri, 20 May 2022 17:56:26 +0200 Subject: [PATCH 191/340] simplify error messages --- .../Reducer_Peggy_GeneratedParser.js | 1322 +++++++++-------- .../Reducer_Peggy_GeneratedParser.peggy | 43 +- 2 files changed, 755 insertions(+), 610 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index 80cd0e2f..67fa36a1 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -236,9 +236,9 @@ function peg$parse(input, options) { var peg$c0 = "{"; var peg$c1 = "}"; - var peg$c2 = "="; - var peg$c3 = "("; - var peg$c4 = ")"; + var peg$c2 = "("; + var peg$c3 = ")"; + var peg$c4 = "="; var peg$c5 = ","; var peg$c6 = "if"; var peg$c7 = "then"; @@ -296,78 +296,80 @@ function peg$parse(input, options) { var peg$e0 = peg$literalExpectation("{", false); var peg$e1 = peg$literalExpectation("}", false); - var peg$e2 = peg$literalExpectation("=", false); - var peg$e3 = peg$literalExpectation("(", false); - var peg$e4 = peg$literalExpectation(")", false); - var peg$e5 = peg$literalExpectation(",", false); - var peg$e6 = peg$literalExpectation("if", false); - var peg$e7 = peg$literalExpectation("then", false); - var peg$e8 = peg$literalExpectation("else", false); - var peg$e9 = peg$literalExpectation("?", false); - var peg$e10 = peg$literalExpectation(":", false); - var peg$e11 = peg$literalExpectation("||", false); - var peg$e12 = peg$literalExpectation("&&", false); - var peg$e13 = peg$literalExpectation("==", false); - var peg$e14 = peg$literalExpectation("!=", false); - var peg$e15 = peg$literalExpectation("<=", false); - var peg$e16 = peg$literalExpectation("<", false); - var peg$e17 = peg$literalExpectation(">=", false); - var peg$e18 = peg$literalExpectation(">", false); - var peg$e19 = peg$literalExpectation("+", false); - var peg$e20 = peg$literalExpectation("-", false); - var peg$e21 = peg$literalExpectation(".+", false); - var peg$e22 = peg$literalExpectation(".-", false); - var peg$e23 = peg$literalExpectation("*", false); - var peg$e24 = peg$literalExpectation("/", false); - var peg$e25 = peg$literalExpectation(".*", false); - var peg$e26 = peg$literalExpectation("./", false); - var peg$e27 = peg$literalExpectation("^", false); - var peg$e28 = peg$literalExpectation(".^", false); - var peg$e29 = peg$literalExpectation("to", false); - var peg$e30 = peg$literalExpectation("->", false); - var peg$e31 = peg$literalExpectation("|>", false); - var peg$e32 = peg$literalExpectation("!", false); - var peg$e33 = peg$literalExpectation("[", false); - var peg$e34 = peg$literalExpectation(".", false); - var peg$e35 = peg$literalExpectation("]", false); - var peg$e36 = peg$otherExpectation("identifier"); - var peg$e37 = peg$classExpectation(["_", ["a", "z"]], false, false); - var peg$e38 = peg$classExpectation(["_", ["a", "z"], ["0", "9"]], false, true); - var peg$e39 = peg$otherExpectation("$identifier"); - var peg$e40 = peg$classExpectation(["$", "_", ["a", "z"]], false, false); - var peg$e41 = peg$classExpectation(["$", "_", ["a", "z"], ["0", "9"]], false, true); - var peg$e42 = peg$otherExpectation("string"); - var peg$e43 = peg$literalExpectation("'", false); - var peg$e44 = peg$classExpectation(["'"], true, false); - var peg$e45 = peg$literalExpectation("\"", false); - var peg$e46 = peg$classExpectation(["\""], true, false); - var peg$e47 = peg$otherExpectation("integer"); - var peg$e48 = peg$classExpectation(["e"], false, true); - var peg$e49 = peg$otherExpectation("float"); - var peg$e50 = peg$classExpectation([["0", "9"]], false, false); - var peg$e51 = peg$otherExpectation("boolean"); - var peg$e52 = peg$literalExpectation("true", false); - var peg$e53 = peg$literalExpectation("false", false); - var peg$e54 = peg$literalExpectation("|", false); - var peg$e55 = peg$otherExpectation("array"); - var peg$e56 = peg$otherExpectation("record"); - var peg$e57 = peg$otherExpectation("optional whitespace"); - var peg$e58 = peg$otherExpectation("optional whitespace or newline"); - var peg$e59 = peg$otherExpectation("whitespace"); - var peg$e60 = peg$otherExpectation("whitespace or newline"); - var peg$e61 = peg$otherExpectation("statement separator"); - var peg$e62 = peg$literalExpectation(";", false); - var peg$e63 = peg$otherExpectation("line comment"); - var peg$e64 = peg$literalExpectation("//", false); - var peg$e65 = peg$literalExpectation("#", false); - var peg$e66 = peg$classExpectation(["\r", "\n"], true, false); - var peg$e67 = peg$otherExpectation("comment"); - var peg$e68 = peg$literalExpectation("/*", false); - var peg$e69 = peg$classExpectation(["*"], true, false); - var peg$e70 = peg$literalExpectation("*/", false); - var peg$e71 = peg$classExpectation([" ", "\t"], false, false); - var peg$e72 = peg$otherExpectation("newline"); - var peg$e73 = peg$classExpectation(["\n", "\r"], false, false); + var peg$e2 = peg$literalExpectation("(", false); + var peg$e3 = peg$literalExpectation(")", false); + var peg$e4 = peg$otherExpectation("assignment"); + var peg$e5 = peg$literalExpectation("=", false); + var peg$e6 = peg$literalExpectation(",", false); + var peg$e7 = peg$literalExpectation("if", false); + var peg$e8 = peg$literalExpectation("then", false); + var peg$e9 = peg$literalExpectation("else", false); + var peg$e10 = peg$literalExpectation("?", false); + var peg$e11 = peg$literalExpectation(":", false); + var peg$e12 = peg$otherExpectation("operator"); + var peg$e13 = peg$literalExpectation("||", false); + var peg$e14 = peg$literalExpectation("&&", false); + var peg$e15 = peg$literalExpectation("==", false); + var peg$e16 = peg$literalExpectation("!=", false); + var peg$e17 = peg$literalExpectation("<=", false); + var peg$e18 = peg$literalExpectation("<", false); + var peg$e19 = peg$literalExpectation(">=", false); + var peg$e20 = peg$literalExpectation(">", false); + var peg$e21 = peg$literalExpectation("+", false); + var peg$e22 = peg$literalExpectation("-", false); + var peg$e23 = peg$literalExpectation(".+", false); + var peg$e24 = peg$literalExpectation(".-", false); + var peg$e25 = peg$literalExpectation("*", false); + var peg$e26 = peg$literalExpectation("/", false); + var peg$e27 = peg$literalExpectation(".*", false); + var peg$e28 = peg$literalExpectation("./", false); + var peg$e29 = peg$literalExpectation("^", false); + var peg$e30 = peg$literalExpectation(".^", false); + var peg$e31 = peg$literalExpectation("to", false); + var peg$e32 = peg$literalExpectation("->", false); + var peg$e33 = peg$literalExpectation("|>", false); + var peg$e34 = peg$otherExpectation("unary operator"); + var peg$e35 = peg$literalExpectation("!", false); + var peg$e36 = peg$literalExpectation("[", false); + var peg$e37 = peg$literalExpectation(".", false); + var peg$e38 = peg$literalExpectation("]", false); + var peg$e39 = peg$otherExpectation("identifier"); + var peg$e40 = peg$classExpectation(["_", ["a", "z"]], false, false); + var peg$e41 = peg$classExpectation(["_", ["a", "z"], ["0", "9"]], false, true); + var peg$e42 = peg$otherExpectation("$identifier"); + var peg$e43 = peg$classExpectation(["$", "_", ["a", "z"]], false, false); + var peg$e44 = peg$classExpectation(["$", "_", ["a", "z"], ["0", "9"]], false, true); + var peg$e45 = peg$otherExpectation("string"); + var peg$e46 = peg$literalExpectation("'", false); + var peg$e47 = peg$classExpectation(["'"], true, false); + var peg$e48 = peg$literalExpectation("\"", false); + var peg$e49 = peg$classExpectation(["\""], true, false); + var peg$e50 = peg$otherExpectation("integer"); + var peg$e51 = peg$classExpectation(["e"], false, true); + var peg$e52 = peg$otherExpectation("float"); + var peg$e53 = peg$classExpectation([["0", "9"]], false, false); + var peg$e54 = peg$otherExpectation("boolean"); + var peg$e55 = peg$literalExpectation("true", false); + var peg$e56 = peg$literalExpectation("false", false); + var peg$e57 = peg$literalExpectation("|", false); + var peg$e58 = peg$otherExpectation("array"); + var peg$e59 = peg$otherExpectation("record"); + var peg$e60 = peg$otherExpectation("whitespace"); + var peg$e61 = peg$otherExpectation("optional whitespace or newline"); + var peg$e62 = peg$otherExpectation("whitespace or newline"); + var peg$e63 = peg$otherExpectation("statement separator"); + var peg$e64 = peg$literalExpectation(";", false); + var peg$e65 = peg$otherExpectation("line comment"); + var peg$e66 = peg$literalExpectation("//", false); + var peg$e67 = peg$literalExpectation("#", false); + var peg$e68 = peg$classExpectation(["\r", "\n"], true, false); + var peg$e69 = peg$otherExpectation("comment"); + var peg$e70 = peg$literalExpectation("/*", false); + var peg$e71 = peg$classExpectation(["*"], true, false); + var peg$e72 = peg$literalExpectation("*/", false); + var peg$e73 = peg$classExpectation([" ", "\t"], false, false); + var peg$e74 = peg$otherExpectation("newline"); + var peg$e75 = peg$classExpectation(["\n", "\r"], false, false); var peg$f0 = function(start) {return start}; var peg$f1 = function(statements, finalExpression) { if (finalExpression != null) { statements.push(finalExpression) } @@ -579,7 +581,7 @@ function peg$parse(input, options) { function peg$parsestart() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 0; + var key = peg$currPos * 67 + 0; var cached = peg$resultsCache[key]; if (cached) { @@ -612,7 +614,7 @@ function peg$parse(input, options) { function peg$parsezeroOMoreArgumentsBlockOrExpression() { var s0; - var key = peg$currPos * 58 + 1; + var key = peg$currPos * 67 + 1; var cached = peg$resultsCache[key]; if (cached) { @@ -634,7 +636,7 @@ function peg$parse(input, options) { function peg$parseouterBlock() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 2; + var key = peg$currPos * 67 + 2; var cached = peg$resultsCache[key]; if (cached) { @@ -687,7 +689,7 @@ function peg$parse(input, options) { function peg$parseinnerBlockOrExpression() { var s0, s1; - var key = peg$currPos * 58 + 3; + var key = peg$currPos * 67 + 3; var cached = peg$resultsCache[key]; if (cached) { @@ -715,7 +717,7 @@ function peg$parse(input, options) { function peg$parsequotedInnerBlock() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 58 + 4; + var key = peg$currPos * 67 + 4; var cached = peg$resultsCache[key]; if (cached) { @@ -824,7 +826,7 @@ function peg$parse(input, options) { function peg$parsearray_statements() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 5; + var key = peg$currPos * 67 + 5; var cached = peg$resultsCache[key]; if (cached) { @@ -879,7 +881,7 @@ function peg$parse(input, options) { function peg$parsestatement() { var s0; - var key = peg$currPos * 58 + 6; + var key = peg$currPos * 67 + 6; var cached = peg$resultsCache[key]; if (cached) { @@ -901,7 +903,7 @@ function peg$parse(input, options) { function peg$parseletStatement() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 7; + var key = peg$currPos * 67 + 7; var cached = peg$resultsCache[key]; if (cached) { @@ -914,13 +916,7 @@ function peg$parse(input, options) { s1 = peg$parseidentifier(); if (s1 !== peg$FAILED) { s2 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 61) { - s3 = peg$c2; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } + s3 = peg$parseassignmentOp(); if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); s5 = peg$parsezeroOMoreArgumentsBlockOrExpression(); @@ -948,7 +944,7 @@ function peg$parse(input, options) { function peg$parsedefunStatement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 58 + 8; + var key = peg$currPos * 67 + 8; var cached = peg$resultsCache[key]; if (cached) { @@ -961,11 +957,11 @@ function peg$parse(input, options) { s1 = peg$parseidentifier(); if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 40) { - s2 = peg$c3; + s2 = peg$c2; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s2 !== peg$FAILED) { s3 = peg$parse_nl(); @@ -973,21 +969,15 @@ function peg$parse(input, options) { if (s4 !== peg$FAILED) { s5 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 41) { - s6 = peg$c4; + s6 = peg$c3; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e4); } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s6 !== peg$FAILED) { s7 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 61) { - s8 = peg$c2; - peg$currPos++; - } else { - s8 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } + s8 = peg$parseassignmentOp(); if (s8 !== peg$FAILED) { s9 = peg$parse_nl(); s10 = peg$parseinnerBlockOrExpression(); @@ -1024,10 +1014,41 @@ function peg$parse(input, options) { return s0; } + function peg$parseassignmentOp() { + var s0, s1; + + var key = peg$currPos * 67 + 9; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + if (input.charCodeAt(peg$currPos) === 61) { + s0 = peg$c4; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e5); } + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e4); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parsearray_parameters() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 9; + var key = peg$currPos * 67 + 10; var cached = peg$resultsCache[key]; if (cached) { @@ -1047,7 +1068,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e5); } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -1071,7 +1092,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e5); } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -1102,7 +1123,7 @@ function peg$parse(input, options) { function peg$parseexpression() { var s0; - var key = peg$currPos * 58 + 10; + var key = peg$currPos * 67 + 11; var cached = peg$resultsCache[key]; if (cached) { @@ -1127,7 +1148,7 @@ function peg$parse(input, options) { function peg$parseifthenelse() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11; - var key = peg$currPos * 58 + 11; + var key = peg$currPos * 67 + 12; var cached = peg$resultsCache[key]; if (cached) { @@ -1142,7 +1163,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } + if (peg$silentFails === 0) { peg$fail(peg$e7); } } if (s1 !== peg$FAILED) { s2 = peg$parse__nl(); @@ -1156,7 +1177,7 @@ function peg$parse(input, options) { peg$currPos += 4; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e7); } + if (peg$silentFails === 0) { peg$fail(peg$e8); } } if (s5 !== peg$FAILED) { s6 = peg$parse__nl(); @@ -1170,7 +1191,7 @@ function peg$parse(input, options) { peg$currPos += 4; } else { s9 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e8); } + if (peg$silentFails === 0) { peg$fail(peg$e9); } } if (s9 !== peg$FAILED) { s10 = peg$parse__nl(); @@ -1235,7 +1256,7 @@ function peg$parse(input, options) { function peg$parseternary() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 58 + 12; + var key = peg$currPos * 67 + 13; var cached = peg$resultsCache[key]; if (cached) { @@ -1253,7 +1274,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e9); } + if (peg$silentFails === 0) { peg$fail(peg$e10); } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -1265,7 +1286,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e10); } + if (peg$silentFails === 0) { peg$fail(peg$e11); } } if (s7 !== peg$FAILED) { s8 = peg$parse_nl(); @@ -1305,7 +1326,7 @@ function peg$parse(input, options) { function peg$parselogicalAdditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 13; + var key = peg$currPos * 67 + 14; var cached = peg$resultsCache[key]; if (cached) { @@ -1320,13 +1341,7 @@ function peg$parse(input, options) { s2 = []; s3 = peg$currPos; s4 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c11) { - s5 = peg$c11; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e11); } - } + s5 = peg$parselogicalAdditiveOp(); if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); s7 = peg$parselogicalMultiplicative(); @@ -1345,13 +1360,7 @@ function peg$parse(input, options) { s2.push(s3); s3 = peg$currPos; s4 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c11) { - s5 = peg$c11; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e11); } - } + s5 = peg$parselogicalAdditiveOp(); if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); s7 = peg$parselogicalMultiplicative(); @@ -1379,10 +1388,41 @@ function peg$parse(input, options) { return s0; } + function peg$parselogicalAdditiveOp() { + var s0, s1; + + var key = peg$currPos * 67 + 15; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + if (input.substr(peg$currPos, 2) === peg$c11) { + s0 = peg$c11; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e13); } + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parselogicalMultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 14; + var key = peg$currPos * 67 + 16; var cached = peg$resultsCache[key]; if (cached) { @@ -1397,13 +1437,7 @@ function peg$parse(input, options) { s2 = []; s3 = peg$currPos; s4 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c12) { - s5 = peg$c12; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } + s5 = peg$parselogicalMultiplicativeOp(); if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); s7 = peg$parseequality(); @@ -1422,13 +1456,7 @@ function peg$parse(input, options) { s2.push(s3); s3 = peg$currPos; s4 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c12) { - s5 = peg$c12; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } + s5 = peg$parselogicalMultiplicativeOp(); if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); s7 = peg$parseequality(); @@ -1456,10 +1484,41 @@ function peg$parse(input, options) { return s0; } + function peg$parselogicalMultiplicativeOp() { + var s0, s1; + + var key = peg$currPos * 67 + 17; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + if (input.substr(peg$currPos, 2) === peg$c12) { + s0 = peg$c12; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e14); } + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parseequality() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 15; + var key = peg$currPos * 67 + 18; var cached = peg$resultsCache[key]; if (cached) { @@ -1472,22 +1531,7 @@ function peg$parse(input, options) { s1 = peg$parserelational(); if (s1 !== peg$FAILED) { s2 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c13) { - s3 = peg$c13; - peg$currPos += 2; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e13); } - } - if (s3 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c14) { - s3 = peg$c14; - peg$currPos += 2; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e14); } - } - } + s3 = peg$parseequalityOp(); if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); s5 = peg$parserelational(); @@ -1515,10 +1559,50 @@ function peg$parse(input, options) { return s0; } + function peg$parseequalityOp() { + var s0, s1; + + var key = peg$currPos * 67 + 19; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + if (input.substr(peg$currPos, 2) === peg$c13) { + s0 = peg$c13; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e15); } + } + if (s0 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c14) { + s0 = peg$c14; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e16); } + } + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parserelational() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 16; + var key = peg$currPos * 67 + 20; var cached = peg$resultsCache[key]; if (cached) { @@ -1531,40 +1615,7 @@ function peg$parse(input, options) { s1 = peg$parseadditive(); if (s1 !== peg$FAILED) { s2 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c15) { - s3 = peg$c15; - peg$currPos += 2; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e15); } - } - if (s3 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 60) { - s3 = peg$c16; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e16); } - } - if (s3 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c17) { - s3 = peg$c17; - peg$currPos += 2; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e17); } - } - if (s3 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 62) { - s3 = peg$c18; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e18); } - } - } - } - } + s3 = peg$parserelationalOp(); if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); s5 = peg$parseadditive(); @@ -1592,10 +1643,68 @@ function peg$parse(input, options) { return s0; } + function peg$parserelationalOp() { + var s0, s1; + + var key = peg$currPos * 67 + 21; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + if (input.substr(peg$currPos, 2) === peg$c15) { + s0 = peg$c15; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e17); } + } + if (s0 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 60) { + s0 = peg$c16; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e18); } + } + if (s0 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c17) { + s0 = peg$c17; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e19); } + } + if (s0 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 62) { + s0 = peg$c18; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e20); } + } + } + } + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parseadditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 17; + var key = peg$currPos * 67 + 22; var cached = peg$resultsCache[key]; if (cached) { @@ -1610,40 +1719,7 @@ function peg$parse(input, options) { s2 = []; s3 = peg$currPos; s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 43) { - s5 = peg$c19; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e19); } - } - if (s5 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 45) { - s5 = peg$c20; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e20); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c21) { - s5 = peg$c21; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e21); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c22) { - s5 = peg$c22; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } - } - } - } - } + s5 = peg$parseadditiveOp(); if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); s7 = peg$parsemultiplicative(); @@ -1662,40 +1738,7 @@ function peg$parse(input, options) { s2.push(s3); s3 = peg$currPos; s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 43) { - s5 = peg$c19; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e19); } - } - if (s5 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 45) { - s5 = peg$c20; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e20); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c21) { - s5 = peg$c21; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e21); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c22) { - s5 = peg$c22; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } - } - } - } - } + s5 = peg$parseadditiveOp(); if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); s7 = peg$parsemultiplicative(); @@ -1723,10 +1766,68 @@ function peg$parse(input, options) { return s0; } + function peg$parseadditiveOp() { + var s0, s1; + + var key = peg$currPos * 67 + 23; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + if (input.charCodeAt(peg$currPos) === 43) { + s0 = peg$c19; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e21); } + } + if (s0 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 45) { + s0 = peg$c20; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e22); } + } + if (s0 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c21) { + s0 = peg$c21; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e23); } + } + if (s0 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c22) { + s0 = peg$c22; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e24); } + } + } + } + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parsemultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 18; + var key = peg$currPos * 67 + 24; var cached = peg$resultsCache[key]; if (cached) { @@ -1741,40 +1842,7 @@ function peg$parse(input, options) { s2 = []; s3 = peg$currPos; s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 42) { - s5 = peg$c23; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e23); } - } - if (s5 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 47) { - s5 = peg$c24; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e24); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c25) { - s5 = peg$c25; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e25); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c26) { - s5 = peg$c26; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e26); } - } - } - } - } + s5 = peg$parsemultiplicativeOp(); if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); s7 = peg$parsepower(); @@ -1793,40 +1861,7 @@ function peg$parse(input, options) { s2.push(s3); s3 = peg$currPos; s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 42) { - s5 = peg$c23; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e23); } - } - if (s5 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 47) { - s5 = peg$c24; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e24); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c25) { - s5 = peg$c25; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e25); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c26) { - s5 = peg$c26; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e26); } - } - } - } - } + s5 = peg$parsemultiplicativeOp(); if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); s7 = peg$parsepower(); @@ -1854,10 +1889,68 @@ function peg$parse(input, options) { return s0; } + function peg$parsemultiplicativeOp() { + var s0, s1; + + var key = peg$currPos * 67 + 25; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + if (input.charCodeAt(peg$currPos) === 42) { + s0 = peg$c23; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e25); } + } + if (s0 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 47) { + s0 = peg$c24; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e26); } + } + if (s0 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c25) { + s0 = peg$c25; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e27); } + } + if (s0 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c26) { + s0 = peg$c26; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e28); } + } + } + } + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parsepower() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 19; + var key = peg$currPos * 67 + 26; var cached = peg$resultsCache[key]; if (cached) { @@ -1872,22 +1965,7 @@ function peg$parse(input, options) { s2 = []; s3 = peg$currPos; s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 94) { - s5 = peg$c27; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e27); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c28) { - s5 = peg$c28; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e28); } - } - } + s5 = peg$parsepowerOp(); if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); s7 = peg$parsecredibleInterval(); @@ -1906,22 +1984,7 @@ function peg$parse(input, options) { s2.push(s3); s3 = peg$currPos; s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 94) { - s5 = peg$c27; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e27); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c28) { - s5 = peg$c28; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e28); } - } - } + s5 = peg$parsepowerOp(); if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); s7 = peg$parsecredibleInterval(); @@ -1949,10 +2012,50 @@ function peg$parse(input, options) { return s0; } + function peg$parsepowerOp() { + var s0, s1; + + var key = peg$currPos * 67 + 27; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + if (input.charCodeAt(peg$currPos) === 94) { + s0 = peg$c27; + peg$currPos++; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e29); } + } + if (s0 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c28) { + s0 = peg$c28; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e30); } + } + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parsecredibleInterval() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 20; + var key = peg$currPos * 67 + 28; var cached = peg$resultsCache[key]; if (cached) { @@ -1968,13 +2071,7 @@ function peg$parse(input, options) { s3 = peg$currPos; s4 = peg$parse__(); if (s4 !== peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c29) { - s5 = peg$c29; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e29); } - } + s5 = peg$parsecredibleIntervalOp(); if (s5 !== peg$FAILED) { s6 = peg$parse__nl(); if (s6 !== peg$FAILED) { @@ -2003,13 +2100,7 @@ function peg$parse(input, options) { s3 = peg$currPos; s4 = peg$parse__(); if (s4 !== peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c29) { - s5 = peg$c29; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e29); } - } + s5 = peg$parsecredibleIntervalOp(); if (s5 !== peg$FAILED) { s6 = peg$parse__nl(); if (s6 !== peg$FAILED) { @@ -2046,10 +2137,41 @@ function peg$parse(input, options) { return s0; } + function peg$parsecredibleIntervalOp() { + var s0, s1; + + var key = peg$currPos * 67 + 29; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + if (input.substr(peg$currPos, 2) === peg$c29) { + s0 = peg$c29; + peg$currPos += 2; + } else { + s0 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e31); } + } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parsechainFunctionCall() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 21; + var key = peg$currPos * 67 + 30; var cached = peg$resultsCache[key]; if (cached) { @@ -2069,7 +2191,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e30); } + if (peg$silentFails === 0) { peg$fail(peg$e32); } } if (s5 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c31) { @@ -2077,7 +2199,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e31); } + if (peg$silentFails === 0) { peg$fail(peg$e33); } } } if (s5 !== peg$FAILED) { @@ -2103,7 +2225,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e30); } + if (peg$silentFails === 0) { peg$fail(peg$e32); } } if (s5 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c31) { @@ -2111,7 +2233,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e31); } + if (peg$silentFails === 0) { peg$fail(peg$e33); } } } if (s5 !== peg$FAILED) { @@ -2144,7 +2266,7 @@ function peg$parse(input, options) { function peg$parsechainedFunction() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 58 + 22; + var key = peg$currPos * 67 + 31; var cached = peg$resultsCache[key]; if (cached) { @@ -2157,11 +2279,11 @@ function peg$parse(input, options) { s1 = peg$parsedollarIdentifier(); if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 40) { - s2 = peg$c3; + s2 = peg$c2; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s2 !== peg$FAILED) { s3 = peg$parse_nl(); @@ -2169,11 +2291,11 @@ function peg$parse(input, options) { if (s4 !== peg$FAILED) { s5 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 41) { - s6 = peg$c4; + s6 = peg$c3; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e4); } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s6 !== peg$FAILED) { peg$savedPos = s0; @@ -2199,20 +2321,20 @@ function peg$parse(input, options) { s1 = peg$parsedollarIdentifier(); if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 40) { - s2 = peg$c3; + s2 = peg$c2; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s2 !== peg$FAILED) { s3 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 41) { - s4 = peg$c4; + s4 = peg$c3; peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e4); } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s4 !== peg$FAILED) { peg$savedPos = s0; @@ -2248,7 +2370,7 @@ function peg$parse(input, options) { function peg$parseunary() { var s0, s1, s2, s3; - var key = peg$currPos * 58 + 23; + var key = peg$currPos * 67 + 32; var cached = peg$resultsCache[key]; if (cached) { @@ -2286,9 +2408,9 @@ function peg$parse(input, options) { } function peg$parseunaryOperator() { - var s0; + var s0, s1; - var key = peg$currPos * 58 + 24; + var key = peg$currPos * 67 + 33; var cached = peg$resultsCache[key]; if (cached) { @@ -2297,12 +2419,13 @@ function peg$parse(input, options) { return cached.result; } + peg$silentFails++; if (input.charCodeAt(peg$currPos) === 45) { s0 = peg$c20; peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e20); } + if (peg$silentFails === 0) { peg$fail(peg$e22); } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c22) { @@ -2310,7 +2433,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } + if (peg$silentFails === 0) { peg$fail(peg$e24); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 33) { @@ -2318,10 +2441,15 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e32); } + if (peg$silentFails === 0) { peg$fail(peg$e35); } } } } + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e34); } + } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -2331,7 +2459,7 @@ function peg$parse(input, options) { function peg$parseindexedValue() { var s0; - var key = peg$currPos * 58 + 25; + var key = peg$currPos * 67 + 34; var cached = peg$resultsCache[key]; if (cached) { @@ -2356,7 +2484,7 @@ function peg$parse(input, options) { function peg$parsecollectionElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 58 + 26; + var key = peg$currPos * 67 + 35; var cached = peg$resultsCache[key]; if (cached) { @@ -2375,15 +2503,15 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s3 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 40) { - s3 = peg$c3; + s3 = peg$c2; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s3 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 46) { @@ -2391,7 +2519,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } } } @@ -2411,7 +2539,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2423,7 +2551,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e38); } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2444,11 +2572,11 @@ function peg$parse(input, options) { s4 = peg$currPos; s5 = peg$parse_(); if (input.charCodeAt(peg$currPos) === 40) { - s6 = peg$c3; + s6 = peg$c2; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2456,11 +2584,11 @@ function peg$parse(input, options) { if (s8 !== peg$FAILED) { s9 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 41) { - s10 = peg$c4; + s10 = peg$c3; peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e4); } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2484,7 +2612,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s5 !== peg$FAILED) { s6 = peg$currPos; @@ -2516,7 +2644,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2528,7 +2656,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e38); } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2549,11 +2677,11 @@ function peg$parse(input, options) { s4 = peg$currPos; s5 = peg$parse_(); if (input.charCodeAt(peg$currPos) === 40) { - s6 = peg$c3; + s6 = peg$c2; peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2561,11 +2689,11 @@ function peg$parse(input, options) { if (s8 !== peg$FAILED) { s9 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 41) { - s10 = peg$c4; + s10 = peg$c3; peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e4); } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2589,7 +2717,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s5 !== peg$FAILED) { s6 = peg$currPos; @@ -2632,7 +2760,7 @@ function peg$parse(input, options) { function peg$parsearray_functionArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 27; + var key = peg$currPos * 67 + 36; var cached = peg$resultsCache[key]; if (cached) { @@ -2652,7 +2780,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e5); } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -2676,7 +2804,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e5); } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -2707,7 +2835,7 @@ function peg$parse(input, options) { function peg$parserecordElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 58 + 28; + var key = peg$currPos * 67 + 37; var cached = peg$resultsCache[key]; if (cached) { @@ -2726,7 +2854,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } peg$silentFails--; if (s3 !== peg$FAILED) { @@ -2744,7 +2872,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2775,7 +2903,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2817,7 +2945,7 @@ function peg$parse(input, options) { function peg$parseatom() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 29; + var key = peg$currPos * 67 + 38; var cached = peg$resultsCache[key]; if (cached) { @@ -2828,11 +2956,11 @@ function peg$parse(input, options) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 40) { - s1 = peg$c3; + s1 = peg$c2; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -2840,11 +2968,11 @@ function peg$parse(input, options) { if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); if (input.charCodeAt(peg$currPos) === 41) { - s5 = peg$c4; + s5 = peg$c3; peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e4); } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s5 !== peg$FAILED) { peg$savedPos = s0; @@ -2873,7 +3001,7 @@ function peg$parse(input, options) { function peg$parsebasicValue() { var s0; - var key = peg$currPos * 58 + 30; + var key = peg$currPos * 67 + 39; var cached = peg$resultsCache[key]; if (cached) { @@ -2895,7 +3023,7 @@ function peg$parse(input, options) { function peg$parsebasicLiteral() { var s0; - var key = peg$currPos * 58 + 31; + var key = peg$currPos * 67 + 40; var cached = peg$resultsCache[key]; if (cached) { @@ -2926,7 +3054,7 @@ function peg$parse(input, options) { function peg$parseidentifier() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 32; + var key = peg$currPos * 67 + 41; var cached = peg$resultsCache[key]; if (cached) { @@ -2942,84 +3070,6 @@ function peg$parse(input, options) { if (peg$r0.test(input.charAt(peg$currPos))) { s3 = input.charAt(peg$currPos); peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - if (peg$r0.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = []; - if (peg$r1.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - if (peg$r1.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } - } - } - s2 = [s2, s3]; - s1 = s2; - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f26(); - } - s0 = s1; - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsedollarIdentifier() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 58 + 33; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$currPos; - s2 = []; - if (peg$r2.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; } else { s3 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$e40); } @@ -3027,7 +3077,7 @@ function peg$parse(input, options) { if (s3 !== peg$FAILED) { while (s3 !== peg$FAILED) { s2.push(s3); - if (peg$r2.test(input.charAt(peg$currPos))) { + if (peg$r0.test(input.charAt(peg$currPos))) { s3 = input.charAt(peg$currPos); peg$currPos++; } else { @@ -3040,7 +3090,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { s3 = []; - if (peg$r3.test(input.charAt(peg$currPos))) { + if (peg$r1.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { @@ -3049,7 +3099,7 @@ function peg$parse(input, options) { } while (s4 !== peg$FAILED) { s3.push(s4); - if (peg$r3.test(input.charAt(peg$currPos))) { + if (peg$r1.test(input.charAt(peg$currPos))) { s4 = input.charAt(peg$currPos); peg$currPos++; } else { @@ -3079,10 +3129,88 @@ function peg$parse(input, options) { return s0; } + function peg$parsedollarIdentifier() { + var s0, s1, s2, s3, s4; + + var key = peg$currPos * 67 + 42; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + peg$silentFails++; + s0 = peg$currPos; + s1 = peg$currPos; + s2 = []; + if (peg$r2.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e43); } + } + if (s3 !== peg$FAILED) { + while (s3 !== peg$FAILED) { + s2.push(s3); + if (peg$r2.test(input.charAt(peg$currPos))) { + s3 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e43); } + } + } + } else { + s2 = peg$FAILED; + } + if (s2 !== peg$FAILED) { + s3 = []; + if (peg$r3.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e44); } + } + while (s4 !== peg$FAILED) { + s3.push(s4); + if (peg$r3.test(input.charAt(peg$currPos))) { + s4 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e44); } + } + } + s2 = [s2, s3]; + s1 = s2; + } else { + peg$currPos = s1; + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f26(); + } + s0 = s1; + peg$silentFails--; + if (s0 === peg$FAILED) { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e42); } + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parsestring() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 34; + var key = peg$currPos * 67 + 43; var cached = peg$resultsCache[key]; if (cached) { @@ -3099,7 +3227,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } + if (peg$silentFails === 0) { peg$fail(peg$e46); } } if (s2 !== peg$FAILED) { s3 = []; @@ -3108,7 +3236,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } + if (peg$silentFails === 0) { peg$fail(peg$e47); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3117,7 +3245,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } + if (peg$silentFails === 0) { peg$fail(peg$e47); } } } if (input.charCodeAt(peg$currPos) === 39) { @@ -3125,7 +3253,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } + if (peg$silentFails === 0) { peg$fail(peg$e46); } } if (s4 !== peg$FAILED) { s1 = s3; @@ -3150,7 +3278,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } + if (peg$silentFails === 0) { peg$fail(peg$e48); } } if (s2 !== peg$FAILED) { s3 = []; @@ -3159,7 +3287,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } + if (peg$silentFails === 0) { peg$fail(peg$e49); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3168,7 +3296,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } + if (peg$silentFails === 0) { peg$fail(peg$e49); } } } if (input.charCodeAt(peg$currPos) === 34) { @@ -3176,7 +3304,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } + if (peg$silentFails === 0) { peg$fail(peg$e48); } } if (s4 !== peg$FAILED) { s1 = s3; @@ -3197,7 +3325,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e42); } + if (peg$silentFails === 0) { peg$fail(peg$e45); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3208,7 +3336,7 @@ function peg$parse(input, options) { function peg$parseinteger() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 35; + var key = peg$currPos * 67 + 44; var cached = peg$resultsCache[key]; if (cached) { @@ -3237,7 +3365,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } peg$silentFails--; if (s3 === peg$FAILED) { @@ -3254,7 +3382,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } + if (peg$silentFails === 0) { peg$fail(peg$e51); } } peg$silentFails--; if (s4 === peg$FAILED) { @@ -3281,7 +3409,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } + if (peg$silentFails === 0) { peg$fail(peg$e50); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3292,7 +3420,7 @@ function peg$parse(input, options) { function peg$parsefloat() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 36; + var key = peg$currPos * 67 + 45; var cached = peg$resultsCache[key]; if (cached) { @@ -3322,7 +3450,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s5 !== peg$FAILED) { s6 = []; @@ -3348,7 +3476,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s4 !== peg$FAILED) { s5 = []; @@ -3423,7 +3551,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } + if (peg$silentFails === 0) { peg$fail(peg$e52); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3434,7 +3562,7 @@ function peg$parse(input, options) { function peg$parsefloatExponent() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 37; + var key = peg$currPos * 67 + 46; var cached = peg$resultsCache[key]; if (cached) { @@ -3449,7 +3577,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } + if (peg$silentFails === 0) { peg$fail(peg$e51); } } if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 45) { @@ -3457,7 +3585,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e20); } + if (peg$silentFails === 0) { peg$fail(peg$e22); } } if (s2 === peg$FAILED) { s2 = null; @@ -3492,7 +3620,7 @@ function peg$parse(input, options) { function peg$parsed() { var s0; - var key = peg$currPos * 58 + 38; + var key = peg$currPos * 67 + 47; var cached = peg$resultsCache[key]; if (cached) { @@ -3506,7 +3634,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e50); } + if (peg$silentFails === 0) { peg$fail(peg$e53); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3517,7 +3645,7 @@ function peg$parse(input, options) { function peg$parseboolean() { var s0, s1; - var key = peg$currPos * 58 + 39; + var key = peg$currPos * 67 + 48; var cached = peg$resultsCache[key]; if (cached) { @@ -3533,7 +3661,7 @@ function peg$parse(input, options) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e52); } + if (peg$silentFails === 0) { peg$fail(peg$e55); } } if (s1 === peg$FAILED) { if (input.substr(peg$currPos, 5) === peg$c39) { @@ -3541,7 +3669,7 @@ function peg$parse(input, options) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e53); } + if (peg$silentFails === 0) { peg$fail(peg$e56); } } } if (s1 !== peg$FAILED) { @@ -3552,7 +3680,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } + if (peg$silentFails === 0) { peg$fail(peg$e54); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3563,7 +3691,7 @@ function peg$parse(input, options) { function peg$parsevalueConstructor() { var s0; - var key = peg$currPos * 58 + 40; + var key = peg$currPos * 67 + 49; var cached = peg$resultsCache[key]; if (cached) { @@ -3591,7 +3719,7 @@ function peg$parse(input, options) { function peg$parselambda() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12; - var key = peg$currPos * 58 + 41; + var key = peg$currPos * 67 + 50; var cached = peg$resultsCache[key]; if (cached) { @@ -3615,7 +3743,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -3627,7 +3755,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s7 !== peg$FAILED) { s8 = peg$parse_nl(); @@ -3703,7 +3831,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -3715,7 +3843,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s7 !== peg$FAILED) { s8 = peg$parse_nl(); @@ -3766,7 +3894,7 @@ function peg$parse(input, options) { function peg$parsearrayConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 42; + var key = peg$currPos * 67 + 51; var cached = peg$resultsCache[key]; if (cached) { @@ -3782,7 +3910,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -3791,7 +3919,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e38); } } if (s3 !== peg$FAILED) { peg$savedPos = s0; @@ -3811,7 +3939,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -3823,7 +3951,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { peg$fail(peg$e38); } } if (s5 !== peg$FAILED) { peg$savedPos = s0; @@ -3844,7 +3972,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e55); } + if (peg$silentFails === 0) { peg$fail(peg$e58); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3855,7 +3983,7 @@ function peg$parse(input, options) { function peg$parsearray_elements() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 43; + var key = peg$currPos * 67 + 52; var cached = peg$resultsCache[key]; if (cached) { @@ -3875,7 +4003,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e5); } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -3899,7 +4027,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e5); } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -3930,7 +4058,7 @@ function peg$parse(input, options) { function peg$parserecordConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 44; + var key = peg$currPos * 67 + 53; var cached = peg$resultsCache[key]; if (cached) { @@ -3978,7 +4106,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e56); } + if (peg$silentFails === 0) { peg$fail(peg$e59); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3989,7 +4117,7 @@ function peg$parse(input, options) { function peg$parsearray_recordArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 58 + 45; + var key = peg$currPos * 67 + 54; var cached = peg$resultsCache[key]; if (cached) { @@ -4009,7 +4137,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e5); } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -4033,7 +4161,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e5); } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -4064,7 +4192,7 @@ function peg$parse(input, options) { function peg$parsekeyValuePair() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 58 + 46; + var key = peg$currPos * 67 + 55; var cached = peg$resultsCache[key]; if (cached) { @@ -4082,7 +4210,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e10); } + if (peg$silentFails === 0) { peg$fail(peg$e11); } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -4111,7 +4239,7 @@ function peg$parse(input, options) { function peg$parse_() { var s0, s1; - var key = peg$currPos * 58 + 47; + var key = peg$currPos * 67 + 56; var cached = peg$resultsCache[key]; if (cached) { @@ -4129,7 +4257,7 @@ function peg$parse(input, options) { } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } + if (peg$silentFails === 0) { peg$fail(peg$e60); } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4139,7 +4267,7 @@ function peg$parse(input, options) { function peg$parse_nl() { var s0, s1; - var key = peg$currPos * 58 + 48; + var key = peg$currPos * 67 + 57; var cached = peg$resultsCache[key]; if (cached) { @@ -4163,7 +4291,7 @@ function peg$parse(input, options) { } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e58); } + if (peg$silentFails === 0) { peg$fail(peg$e61); } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4173,7 +4301,7 @@ function peg$parse(input, options) { function peg$parse__() { var s0, s1; - var key = peg$currPos * 58 + 49; + var key = peg$currPos * 67 + 58; var cached = peg$resultsCache[key]; if (cached) { @@ -4196,7 +4324,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e59); } + if (peg$silentFails === 0) { peg$fail(peg$e60); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4207,7 +4335,7 @@ function peg$parse(input, options) { function peg$parse__nl() { var s0, s1; - var key = peg$currPos * 58 + 50; + var key = peg$currPos * 67 + 59; var cached = peg$resultsCache[key]; if (cached) { @@ -4236,7 +4364,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } + if (peg$silentFails === 0) { peg$fail(peg$e62); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4247,7 +4375,7 @@ function peg$parse(input, options) { function peg$parsestatementSeparator() { var s0, s1, s2, s3; - var key = peg$currPos * 58 + 51; + var key = peg$currPos * 67 + 60; var cached = peg$resultsCache[key]; if (cached) { @@ -4265,7 +4393,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e62); } + if (peg$silentFails === 0) { peg$fail(peg$e64); } } if (s3 === peg$FAILED) { s3 = peg$parsecommentOrNewLine(); @@ -4278,7 +4406,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e62); } + if (peg$silentFails === 0) { peg$fail(peg$e64); } } if (s3 === peg$FAILED) { s3 = peg$parsecommentOrNewLine(); @@ -4298,7 +4426,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e61); } + if (peg$silentFails === 0) { peg$fail(peg$e63); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4309,7 +4437,7 @@ function peg$parse(input, options) { function peg$parsecommentOrNewLine() { var s0, s1, s2; - var key = peg$currPos * 58 + 52; + var key = peg$currPos * 67 + 61; var cached = peg$resultsCache[key]; if (cached) { @@ -4340,7 +4468,7 @@ function peg$parse(input, options) { function peg$parsefinalComment() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 58 + 53; + var key = peg$currPos * 67 + 62; var cached = peg$resultsCache[key]; if (cached) { @@ -4357,7 +4485,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } + if (peg$silentFails === 0) { peg$fail(peg$e66); } } if (s2 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 35) { @@ -4365,7 +4493,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e65); } + if (peg$silentFails === 0) { peg$fail(peg$e67); } } } if (s2 !== peg$FAILED) { @@ -4375,7 +4503,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e66); } + if (peg$silentFails === 0) { peg$fail(peg$e68); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -4384,7 +4512,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e66); } + if (peg$silentFails === 0) { peg$fail(peg$e68); } } } s0 = s3; @@ -4395,7 +4523,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e63); } + if (peg$silentFails === 0) { peg$fail(peg$e65); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4406,7 +4534,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharactersOrComment() { var s0; - var key = peg$currPos * 58 + 54; + var key = peg$currPos * 67 + 63; var cached = peg$resultsCache[key]; if (cached) { @@ -4428,7 +4556,7 @@ function peg$parse(input, options) { function peg$parsedelimitedComment() { var s0, s1, s2, s3; - var key = peg$currPos * 58 + 55; + var key = peg$currPos * 67 + 64; var cached = peg$resultsCache[key]; if (cached) { @@ -4444,7 +4572,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } + if (peg$silentFails === 0) { peg$fail(peg$e70); } } if (s1 !== peg$FAILED) { s2 = []; @@ -4453,7 +4581,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e69); } + if (peg$silentFails === 0) { peg$fail(peg$e71); } } while (s3 !== peg$FAILED) { s2.push(s3); @@ -4462,7 +4590,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e69); } + if (peg$silentFails === 0) { peg$fail(peg$e71); } } } if (input.substr(peg$currPos, 2) === peg$c45) { @@ -4470,7 +4598,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e70); } + if (peg$silentFails === 0) { peg$fail(peg$e72); } } if (s3 !== peg$FAILED) { s0 = s2; @@ -4485,7 +4613,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e67); } + if (peg$silentFails === 0) { peg$fail(peg$e69); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4496,7 +4624,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharacters() { var s0; - var key = peg$currPos * 58 + 56; + var key = peg$currPos * 67 + 65; var cached = peg$resultsCache[key]; if (cached) { @@ -4510,7 +4638,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } + if (peg$silentFails === 0) { peg$fail(peg$e73); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4521,7 +4649,7 @@ function peg$parse(input, options) { function peg$parsenewLine() { var s0, s1; - var key = peg$currPos * 58 + 57; + var key = peg$currPos * 67 + 66; var cached = peg$resultsCache[key]; if (cached) { @@ -4536,12 +4664,12 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e73); } + if (peg$silentFails === 0) { peg$fail(peg$e75); } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e72); } + if (peg$silentFails === 0) { peg$fail(peg$e74); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy index 35fac4fd..5d3392b3 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy @@ -98,15 +98,16 @@ statement / defunStatement letStatement - = variable:identifier _ '=' _nl value:zeroOMoreArgumentsBlockOrExpression - + = variable:identifier _ assignmentOp _nl value:zeroOMoreArgumentsBlockOrExpression { return nodeLetStatment(variable, value) } defunStatement - = variable:identifier '(' _nl args:array_parameters _nl ')' _ '=' _nl body:innerBlockOrExpression + = variable:identifier '(' _nl args:array_parameters _nl ')' _ assignmentOp _nl body:innerBlockOrExpression { var value = nodeLambda(args, body) return nodeLetStatment(variable, value) } + assignmentOp "assignment" = '=' + array_parameters = head:dollarIdentifier tail:(_ ',' _nl @dollarIdentifier)* { return [head, ...tail]; } @@ -124,52 +125,68 @@ ternary { return nodeTernary(condition, trueExpression, falseExpression) } logicalAdditive - = head:logicalMultiplicative tail:(_ operator:'||' _nl arg:logicalMultiplicative {return {operator: operator, right: arg}})* + = head:logicalMultiplicative tail:(_ operator:logicalAdditiveOp _nl arg:logicalMultiplicative {return {operator: operator, right: arg}})* { return tail.reduce(function(result, element) { return makeFunctionCall(toFunction[element.operator], [result, element.right]) }, head)} + logicalAdditiveOp "operator" = '||' + // start binary operators logicalMultiplicative - = head:equality tail:(_ operator:'&&' _nl arg:equality {return {operator: operator, right: arg}})* + = head:equality tail:(_ operator:logicalMultiplicativeOp _nl arg:equality {return {operator: operator, right: arg}})* { return tail.reduce(function(result, element) { return makeFunctionCall(toFunction[element.operator], [result, element.right]) }, head)} + logicalMultiplicativeOp "operator" = '&&' + equality - = left:relational _ operator:('=='/'!=') _nl right:relational + = left:relational _ operator:equalityOp _nl right:relational { return makeFunctionCall(toFunction[operator], [left, right])} / relational + equalityOp "operator" = '=='/'!=' + relational - = left:additive _ operator:('<='/'<'/'>='/'>') _nl right:additive + = left:additive _ operator:relationalOp _nl right:additive { return makeFunctionCall(toFunction[operator], [left, right])} / additive + relationalOp "operator" = '<='/'<'/'>='/'>' + additive - = head:multiplicative tail:(_ operator:('+' / '-' / '.+' / '.-') _nl arg:multiplicative {return {operator: operator, right: arg}})* + = head:multiplicative tail:(_ operator:additiveOp _nl arg:multiplicative {return {operator: operator, right: arg}})* { return tail.reduce(function(result, element) { return makeFunctionCall(toFunction[element.operator], [result, element.right]) }, head)} + additiveOp "operator" = '+' / '-' / '.+' / '.-' + multiplicative - = head:power tail:(_ operator:('*' / '/' / '.*' / './') _nl arg:power {return {operator: operator, right: arg}})* + = head:power tail:(_ operator:multiplicativeOp _nl arg:power {return {operator: operator, right: arg}})* { return tail.reduce(function(result, element) { return makeFunctionCall(toFunction[element.operator], [result, element.right]) }, head)} + multiplicativeOp "operator" = '*' / '/' / '.*' / './' + power - = head:credibleInterval tail:(_ operator:('^' / '.^') _nl arg:credibleInterval {return {operator: operator, right: arg}})* + = head:credibleInterval tail:(_ operator:powerOp _nl arg:credibleInterval {return {operator: operator, right: arg}})* { return tail.reduce(function(result, element) { return makeFunctionCall(toFunction[element.operator], [result, element.right]) }, head)} + powerOp "operator" = '^' / '.^' + credibleInterval - = head:chainFunctionCall tail:(__ operator:('to') __nl arg:chainFunctionCall {return {operator: operator, right: arg}})* + = head:chainFunctionCall tail:(__ operator:credibleIntervalOp __nl arg:chainFunctionCall {return {operator: operator, right: arg}})* { return tail.reduce(function(result, element) { return makeFunctionCall(toFunction[element.operator], [result, element.right]) }, head)} + credibleIntervalOp "operator" = 'to' + chainFunctionCall = head:unary tail:(_ ('->'/'|>') _nl chained:chainedFunction {return chained})* { return tail.reduce(function(result, element) { @@ -191,7 +208,7 @@ unary { return makeFunctionCall(unaryToFunction[unaryOperator], [right])} / postOperator - unaryOperator + unaryOperator "unary operator" = ('-' / '.-' / '!' ) postOperator = indexedValue @@ -296,7 +313,7 @@ recordConstructor 'record' = key:expression _ ':' _nl value:expression { return nodeKeyValue(key, value)} -_ 'optional whitespace' +_ 'whitespace' = whiteSpaceCharactersOrComment* _nl 'optional whitespace or newline' From feb0284a899c76b8de8b12ad922e62e0fbba2dc9 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Fri, 20 May 2022 18:20:00 +0200 Subject: [PATCH 192/340] format --- .../Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res | 7 +++++-- .../Reducer_Peggy/Reducer_Peggy_ToExpression_test.res | 8 ++++++-- .../__tests__/Reducer/Reducer_functionAssignment_test.res | 5 ++++- .../ReducerInterface_Distribution_test.res | 5 ++++- .../Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res | 3 ++- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 3c2381cb..168be4d8 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -131,7 +131,10 @@ describe("Peggy parse", () => { describe("ternary operator", () => { testParse("true ? 2 : 3", "{(::$$_ternary_$$ true 2 3)}") - testParse("false ? 2 : false ? 4 : 5", "{(::$$_ternary_$$ false 2 (::$$_ternary_$$ false 4 5))}") // nested ternary + testParse( + "false ? 2 : false ? 4 : 5", + "{(::$$_ternary_$$ false 2 (::$$_ternary_$$ false 4 5))}", + ) // nested ternary }) describe("if then else", () => { @@ -188,7 +191,7 @@ describe("Peggy parse", () => { testParse("1 -> subtract(2) * 3", "{(::multiply (::subtract 1 2) 3)}") }) - describe("elixir pipe", () => { + describe("elixir pipe", () => { //handled together with -> so there is no need for seperate tests testParse("1 |> add(2)", "{(::add 1 2)}") }) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res index 2c676c8f..81bafd97 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res @@ -80,7 +80,12 @@ describe("Peggy to Expression", () => { (), ) // Function definitions become lambda assignments testToExpression("identity(x)", "(:$$_block_$$ (:identity :x))", ()) // Note value returns error properly - testToExpression("f(x) = x> 2 ? 0 : 1; f(3)", "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ (:$$_ternary_$$ (:larger :x 2) 0 1)))) (:f 3))", ~v="0", ()) + testToExpression( + "f(x) = x> 2 ? 0 : 1; f(3)", + "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ (:$$_ternary_$$ (:larger :x 2) 0 1)))) (:f 3))", + ~v="0", + (), + ) }) describe("arrays", () => { @@ -184,7 +189,6 @@ describe("Peggy to Expression", () => { ~v="{x: 1,y: 99}", (), ) - }) describe("lambda", () => { diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res index 2bd1498a..0f280265 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res @@ -3,7 +3,10 @@ open Reducer_TestHelpers describe("Parse function assignment", () => { testParseToBe("f(x)=x", "Ok((:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ :x)))))") - testParseToBe("f(x)=2*x", "Ok((:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ (:multiply 2 :x))))))") + testParseToBe( + "f(x)=2*x", + "Ok((:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ (:multiply 2 :x))))))", + ) //MathJs does not allow blocks in function definitions }) diff --git a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res index 4e4d12ff..bc95f160 100644 --- a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res +++ b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res @@ -147,7 +147,10 @@ describe("parse on distribution functions", () => { "normal(5,2) ./ normal(5,1)", "Ok((:$$_block_$$ (:dotDivide (:normal 5 2) (:normal 5 1))))", ) - testParse("normal(5,2) .^ normal(5,1)", "Ok((:$$_block_$$ (:dotPow (:normal 5 2) (:normal 5 1))))") + testParse( + "normal(5,2) .^ normal(5,1)", + "Ok((:$$_block_$$ (:dotPow (:normal 5 2) (:normal 5 1))))", + ) }) describe("equality", () => { testParse("5 == normal(5,2)", "Ok((:$$_block_$$ (:equal 5 (:normal 5 2))))") diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res index f0fd08b3..1fba533f 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res @@ -174,7 +174,8 @@ let dispatchMacroCall = ( | list{ExpressionT.EValue(EvCall("$$_bindExpression_$$")), expression} => // bindings of the context are used when there is no binding expression doBindExpression(eRecord(Bindings.toExternalBindings(bindings)), expression, environment) - | list{ExpressionT.EValue(EvCall("$$_block_$$")), ...exprs} => doBlock(exprs, bindings, environment) + | list{ExpressionT.EValue(EvCall("$$_block_$$")), ...exprs} => + doBlock(exprs, bindings, environment) | list{ ExpressionT.EValue(EvCall("$$_lambda_$$")), ExpressionT.EValue(EvArrayString(parameters)), From d9cbe37a5a4990b1d939259e7df26c7a672ffe9a Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 20 May 2022 17:36:40 -0400 Subject: [PATCH 193/340] Added main distributions --- .../FunctionRegistry_Helpers.res | 29 +++++++- .../FunctionRegistry_Library.res | 74 +++++++++---------- .../ReducerInterface_GenericDistribution.res | 26 ------- 3 files changed, 61 insertions(+), 68 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index 487fa811..aa2fa4b1 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -88,4 +88,31 @@ module Process = { ) => { twoDistsOrNumbersToDist(~fn=r => r->fn->E.R2.fmap(Wrappers.symbolic), ~values) } -} \ No newline at end of file +} + +module TwoArgDist = { + let process = (~fn, r) => + r->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_)) + + let mkRegular = (name, fn) => { + Function.makeDefinition(~name, ~inputs=[I_DistOrNumber, I_DistOrNumber], ~run=inputs => + inputs->Prepare.twoDistOrNumber->process(~fn) + ) + } + + let mkDef90th = (name, fn) => { + Function.makeDefinition( + ~name, + ~inputs=[I_Record([("p5", I_DistOrNumber), ("p95", I_DistOrNumber)])], + ~run=inputs => inputs->Prepare.twoDistOrNumberFromRecord->process(~fn), + ) + } + + let mkDefMeanStdev = (name, fn) => { + Function.makeDefinition( + ~name, + ~inputs=[I_Record([("mean", I_DistOrNumber), ("stdev", I_DistOrNumber)])], + ~run=inputs => inputs->Prepare.twoDistOrNumberFromRecord->process(~fn), + ) + } +} diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index f0ac6b9a..fe579f2c 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -3,65 +3,57 @@ open FunctionRegistry_Helpers let twoArgs = (fn, (a1, a2)) => fn(a1, a2) -let process = (~fn, r) => - r->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_)) - module NormalFn = { let fnName = "normal" - let mainInputType = I_DistOrNumber let toFn = Function.make( ~name="Normal", ~definitions=[ - Function.makeDefinition(~name=fnName, ~inputs=[mainInputType, mainInputType], ~run=inputs => { - inputs->Prepare.twoDistOrNumber->process(~fn=twoArgs(SymbolicDist.Normal.make)) - }), - Function.makeDefinition( - ~name=fnName, - ~inputs=[I_Record([("mean", mainInputType), ("stdev", mainInputType)])], - ~run=inputs => - inputs->Prepare.twoDistOrNumberFromRecord->process(~fn=twoArgs(SymbolicDist.Normal.make)), - ), - Function.makeDefinition( - ~name=fnName, - ~inputs=[I_Record([("p5", mainInputType), ("p95", mainInputType)])], - ~run=inputs => - inputs - ->Prepare.twoDistOrNumberFromRecord - ->process(~fn=r => twoArgs(SymbolicDist.Normal.from90PercentCI, r)->Ok), - ), + TwoArgDist.mkRegular(fnName, twoArgs(SymbolicDist.Normal.make)), + TwoArgDist.mkDef90th(fnName, r => twoArgs(SymbolicDist.Normal.from90PercentCI, r)->Ok), + TwoArgDist.mkDefMeanStdev(fnName, twoArgs(SymbolicDist.Normal.make)), ], ) } module LognormalFn = { let fnName = "lognormal" - let mainInputType = I_DistOrNumber let toFn = Function.make( ~name="Lognormal", ~definitions=[ - Function.makeDefinition(~name=fnName, ~inputs=[mainInputType, mainInputType], ~run=inputs => - inputs->Prepare.twoDistOrNumber->process(~fn=twoArgs(SymbolicDist.Lognormal.make)) - ), - Function.makeDefinition( - ~name=fnName, - ~inputs=[I_Record([("p5", mainInputType), ("p95", mainInputType)])], - ~run=inputs => - inputs - ->Prepare.twoDistOrNumberFromRecord - ->process(~fn=r => twoArgs(SymbolicDist.Lognormal.from90PercentCI, r)->Ok), - ), - Function.makeDefinition( - ~name=fnName, - ~inputs=[I_Record([("mean", mainInputType), ("stdev", mainInputType)])], - ~run=inputs => - inputs - ->Prepare.twoDistOrNumberFromRecord - ->process(~fn=twoArgs(SymbolicDist.Lognormal.fromMeanAndStdev)), - ), + TwoArgDist.mkRegular(fnName, twoArgs(SymbolicDist.Lognormal.make)), + TwoArgDist.mkDef90th(fnName, r => twoArgs(SymbolicDist.Lognormal.from90PercentCI, r)->Ok), + TwoArgDist.mkDefMeanStdev(fnName, twoArgs(SymbolicDist.Lognormal.fromMeanAndStdev)), ], ) } +let more = [ + Function.make( + ~name="Uniform", + ~definitions=[TwoArgDist.mkRegular("uniform", twoArgs(SymbolicDist.Uniform.make))], + ), + Function.make( + ~name="Beta", + ~definitions=[TwoArgDist.mkRegular("beta", twoArgs(SymbolicDist.Beta.make))], + ), + Function.make( + ~name="Cauchy", + ~definitions=[TwoArgDist.mkRegular("cauchy", twoArgs(SymbolicDist.Cauchy.make))], + ), + Function.make( + ~name="Gamma", + ~definitions=[TwoArgDist.mkRegular("gamma", twoArgs(SymbolicDist.Gamma.make))], + ), + Function.make( + ~name="Logistic", + ~definitions=[TwoArgDist.mkRegular("logistic", twoArgs(SymbolicDist.Logistic.make))], + ), + Function.make( + ~name="To", + ~definitions=[TwoArgDist.mkRegular("cauchy", twoArgs(SymbolicDist.From90thPercentile.make))], + ) +] + let allFunctions = [NormalFn.toFn, LognormalFn.toFn] diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 0beb236e..714ad47b 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -186,19 +186,6 @@ module SymbolicConstructors = { | _ => Error("Unreachable state") } - let twoFloat = name => - switch name { - | "normal" => Ok(SymbolicDist.Normal.make) - | "uniform" => Ok(SymbolicDist.Uniform.make) - | "beta" => Ok(SymbolicDist.Beta.make) - | "lognormal" => Ok(SymbolicDist.Lognormal.make) - | "logistic" => Ok(SymbolicDist.Logistic.make) - | "cauchy" => Ok(SymbolicDist.Cauchy.make) - | "gamma" => Ok(SymbolicDist.Gamma.make) - | "to" => Ok(SymbolicDist.From90thPercentile.make) - | _ => Error("Unreachable state") - } - let threeFloat = name => switch name { | "triangular" => Ok(SymbolicDist.Triangular.make) @@ -226,19 +213,6 @@ let dispatchToGenericOutput = ( ->SymbolicConstructors.symbolicResultToOutput | ("delta", [EvNumber(f)]) => SymbolicDist.Float.makeSafe(f)->SymbolicConstructors.symbolicResultToOutput - | ( - ("uniform" - | "beta" - | "lognormal" - | "cauchy" - | "gamma" - | "to" - | "logistic") as fnName, - [EvNumber(f1), EvNumber(f2)], - ) => - SymbolicConstructors.twoFloat(fnName) - ->E.R.bind(r => r(f1, f2)) - ->SymbolicConstructors.symbolicResultToOutput | ("triangular" as fnName, [EvNumber(f1), EvNumber(f2), EvNumber(f3)]) => SymbolicConstructors.threeFloat(fnName) ->E.R.bind(r => r(f1, f2, f3)) From c9d6302cbfd23dbde28b332eb2670c05c0d46253 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 20 May 2022 18:05:45 -0400 Subject: [PATCH 194/340] Add better error message when wrong arguments passed --- .../FunctionRegistry_Core.res | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res index 1afd9a66..23e1e780 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res @@ -10,6 +10,21 @@ type rec itype = and iRecord = array and iRecordParam = (string, itype) +module Itype = { + let rec toString = (t: itype) => + switch t { + | I_Number => "number" + | I_Numeric => "numeric" + | I_DistOrNumber => "distOrNumber" + | I_Record(r) => { + let input = ((name, itype): iRecordParam) => `${name}: ${toString(itype)}` + `record({${r->E.A2.fmap(input)->E.A2.joinWith(", ")}})` + } + | I_Array(r) => `record(${r->E.A2.fmap(toString)->E.A2.joinWith(", ")})` + | I_Option(v) => `option(${toString(v)})` + } +} + type rec value = | Number(float) | Dist(DistributionTypes.genericDist) @@ -202,7 +217,7 @@ module Matcher = { } } - let fullMatchToDef = (registry: registry, {fnName, inputIndex}: RegistryMatch.match): option< + let matchToDef = (registry: registry, {fnName, inputIndex}: RegistryMatch.match): option< fnDefinition, > => registry @@ -212,9 +227,10 @@ module Matcher = { } module FnDefinition = { - let getArgValues = (f: fnDefinition, args: array): option> => { - let mainInputTypes = f.inputs - if E.A.length(f.inputs) !== E.A.length(args) { + type t = fnDefinition + let getArgValues = (t: t, args: array): option> => { + let mainInputTypes = t.inputs + if E.A.length(t.inputs) !== E.A.length(args) { None } else { E.A.zip(mainInputTypes, args) @@ -222,10 +238,13 @@ module FnDefinition = { ->E.A.O.openIfAllSome } } - let run = (f: fnDefinition, args: array) => { - let argValues = getArgValues(f, args) + + let defToString = (t: t) => t.inputs->E.A2.fmap(Itype.toString)->E.A2.joinWith(", ") + + let run = (t: t, args: array) => { + let argValues = getArgValues(t, args) switch argValues { - | Some(values) => f.run(values) + | Some(values) => t.run(values) | None => Error("Impossible") } } @@ -247,11 +266,19 @@ module Function = { module Registry = { let matchAndRun = (r: registry, fnName: string, args: array) => { + let matchToDef = m => Matcher.Registry.matchToDef(r, m) + let showNameMatchDefinitions = matches => { + let defs = + matches + ->E.A2.fmap(matchToDef) + ->E.A.O.concatSomes + ->E.A2.fmap(r => `[${fnName}(${FnDefinition.defToString(r)})]`) + ->E.A2.joinWith("; ") + `There are function matches for ${fnName}(), but with different arguments: ${defs}` + } switch Matcher.Registry.findMatches(r, fnName, args) { - | Matcher.Match.FullMatch(m) => - Matcher.Registry.fullMatchToDef(r, m)->E.O2.fmap(r => { - FnDefinition.run(r, args) - }) + | Matcher.Match.FullMatch(match) => match->matchToDef->E.O2.fmap(FnDefinition.run(_, args)) + | SameNameDifferentArguments(m) => Some(Error(showNameMatchDefinitions(m))) | _ => None } } From 390ac2e2bb54ade3dcdb832f9bf9c750cd75639b Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 20 May 2022 22:53:53 -0400 Subject: [PATCH 195/340] Renamed itype->frType, value-> frValue --- .../FunctionRegistry_Core.res | 188 +++++++++--------- .../FunctionRegistry_Helpers.res | 37 ++-- .../FunctionRegistry_Library.res | 2 +- .../squiggle-lang/src/rescript/Utility/E.res | 3 + 4 files changed, 121 insertions(+), 109 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res index 23e1e780..5e9e877e 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res @@ -1,43 +1,39 @@ type expressionValue = ReducerInterface_ExpressionValue.expressionValue -type rec itype = - | I_Number - | I_Numeric - | I_DistOrNumber - | I_Record(iRecord) - | I_Array(array) - | I_Option(itype) -and iRecord = array -and iRecordParam = (string, itype) +/* + Function Registry "Type". A type, without any other information. + Like, #Float +*/ +type rec frType = + | FRTypeNumber + | FRTypeNumeric + | FRTypeDistOrNumber + | FRTypeRecord(frTypeRecord) + | FRTypeArray(array) + | FRTypeOption(frType) +and frTypeRecord = array +and frTypeRecordParam = (string, frType) -module Itype = { - let rec toString = (t: itype) => - switch t { - | I_Number => "number" - | I_Numeric => "numeric" - | I_DistOrNumber => "distOrNumber" - | I_Record(r) => { - let input = ((name, itype): iRecordParam) => `${name}: ${toString(itype)}` - `record({${r->E.A2.fmap(input)->E.A2.joinWith(", ")}})` - } - | I_Array(r) => `record(${r->E.A2.fmap(toString)->E.A2.joinWith(", ")})` - | I_Option(v) => `option(${toString(v)})` - } +/* + Function Registry "Value". A type, with the information of that type. + Like, #Float(40.0) +*/ +type rec frValue = + | FRValueNumber(float) + | FRValueDist(DistributionTypes.genericDist) + | FRValueOption(option) + | FRValueDistOrNumber(frValueDistOrNumber) + | FRValueRecord(frValueRecord) +and frValueRecord = array +and frValueRecordParam = (string, frValue) +and frValueDistOrNumber = FRValueNumber(float) | FRValueDist(DistributionTypes.genericDist) + +type fnDefinition = { + name: string, + inputs: array, + run: array => result, } -type rec value = - | Number(float) - | Dist(DistributionTypes.genericDist) - | Option(option) - | DistOrNumber(distOrNumber) - | Record(record) -and record = array<(string, value)> -and distOrNumber = Number(float) | Dist(DistributionTypes.genericDist) - -type runFn = array => result - -type fnDefinition = {name: string, inputs: array, run: runFn} - type function = { name: string, definitions: array, @@ -45,31 +41,58 @@ type function = { type registry = array -let rec matchInput = (input: itype, r: expressionValue): option => - switch (input, r) { - | (I_Number, EvNumber(f)) => Some(Number(f)) - | (I_DistOrNumber, EvNumber(f)) => Some(DistOrNumber(Number(f))) - | (I_DistOrNumber, EvDistribution(Symbolic(#Float(f)))) => Some(DistOrNumber(Number(f))) - | (I_DistOrNumber, EvDistribution(f)) => Some(DistOrNumber(Dist(f))) - | (I_Numeric, EvNumber(f)) => Some(Number(f)) - | (I_Numeric, EvDistribution(Symbolic(#Float(f)))) => Some(Number(f)) - | (I_Option(v), _) => Some(Option(matchInput(v, r))) - | (I_Record(recordParams), EvRecord(record)) => { - let getAndMatch = (name, input) => - E.Dict.get(record, name)->E.O.bind(v => matchInput(input, v)) - let arrayOfNameValues: array<(Js.Dict.key, option)> = - recordParams->E.A2.fmap(((name, input)) => (name, getAndMatch(name, input))) - let hasNullValues = E.A.hasBy(arrayOfNameValues, ((_, value)) => E.O.isNone(value)) - if hasNullValues { - None - } else { - arrayOfNameValues - ->E.A2.fmap(((name, value)) => (name, value->E.O2.toExn(""))) - ->(r => Some(Record(r))) +module FRType = { + type t = frType + let rec toString = (t: t) => + switch t { + | FRTypeNumber => "number" + | FRTypeNumeric => "numeric" + | FRTypeDistOrNumber => "frValueDistOrNumber" + | FRTypeRecord(r) => { + let input = ((name, frType): frTypeRecordParam) => `${name}: ${toString(frType)}` + `record({${r->E.A2.fmap(input)->E.A2.joinWith(", ")}})` } + | FRTypeArray(r) => `record(${r->E.A2.fmap(toString)->E.A2.joinWith(", ")})` + | FRTypeOption(v) => `option(${toString(v)})` + } + + let rec matchWithExpressionValue = (input: t, r: expressionValue): option => + switch (input, r) { + | (FRTypeNumber, EvNumber(f)) => Some(FRValueNumber(f)) + | (FRTypeDistOrNumber, EvNumber(f)) => Some(FRValueDistOrNumber(FRValueNumber(f))) + | (FRTypeDistOrNumber, EvDistribution(Symbolic(#Float(f)))) => + Some(FRValueDistOrNumber(FRValueNumber(f))) + | (FRTypeDistOrNumber, EvDistribution(f)) => Some(FRValueDistOrNumber(FRValueDist(f))) + | (FRTypeNumeric, EvNumber(f)) => Some(FRValueNumber(f)) + | (FRTypeNumeric, EvDistribution(Symbolic(#Float(f)))) => Some(FRValueNumber(f)) + | (FRTypeOption(v), _) => Some(FRValueOption(matchWithExpressionValue(v, r))) + | (FRTypeRecord(recordParams), EvRecord(record)) => { + let getAndMatch = (name, input) => + E.Dict.get(record, name)->E.O.bind(matchWithExpressionValue(input)) + //All names in the type must be present. If any are missing, the corresponding + //value will be None, and this function would return None. + let namesAndValues: array> = + recordParams->E.A2.fmap(((name, input)) => + getAndMatch(name, input)->E.O2.fmap(match => (name, match)) + ) + namesAndValues->E.A.O.openIfAllSome->E.O2.fmap(r => FRValueRecord(r)) + } + | _ => None + } + + let matchWithExpressionValueArray = (inputs: array, args: array): option< + array, + > => { + let isSameLength = E.A.length(inputs) == E.A.length(args) + if !isSameLength { + None + } else { + E.A.zip(inputs, args) + ->E.A2.fmap(((input, arg)) => matchWithExpressionValue(input, arg)) + ->E.A.O.openIfAllSome } - | _ => None } +} module Matcher = { module MatchSimple = { @@ -107,19 +130,8 @@ module Matcher = { module FnDefinition = { type definitionMatch = MatchSimple.t - let getArgValues = (f: fnDefinition, args: array): option> => { - let mainInputTypes = f.inputs - if E.A.length(f.inputs) !== E.A.length(args) { - None - } else { - E.A.zip(mainInputTypes, args) - ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) - ->E.A.O.openIfAllSome - } - } - let matchAssumingSameName = (f: fnDefinition, args: array) => { - switch getArgValues(f, args) { + switch FRType.matchWithExpressionValueArray(f.inputs, args) { | Some(_) => MatchSimple.FullMatch | None => MatchSimple.SameNameDifferentArguments } @@ -228,43 +240,37 @@ module Matcher = { module FnDefinition = { type t = fnDefinition - let getArgValues = (t: t, args: array): option> => { - let mainInputTypes = t.inputs - if E.A.length(t.inputs) !== E.A.length(args) { - None - } else { - E.A.zip(mainInputTypes, args) - ->E.A2.fmap(((input, arg)) => matchInput(input, arg)) - ->E.A.O.openIfAllSome - } - } - let defToString = (t: t) => t.inputs->E.A2.fmap(Itype.toString)->E.A2.joinWith(", ") + let defToString = (t: t) => t.inputs->E.A2.fmap(FRType.toString)->E.A2.joinWith(", ") let run = (t: t, args: array) => { - let argValues = getArgValues(t, args) + let argValues = FRType.matchWithExpressionValueArray(t.inputs, args) switch argValues { | Some(values) => t.run(values) - | None => Error("Impossible") + | None => Error("Incorrect Types") } } -} -module Function = { - type definitionId = int - let make = (~name, ~definitions): function => { - name: name, - definitions: definitions, - } - - let makeDefinition = (~name, ~inputs, ~run): fnDefinition => { + let make = (~name, ~inputs, ~run): fnDefinition => { name: name, inputs: inputs, run: run, } } +module Function = { + let make = (~name, ~definitions): function => { + name: name, + definitions: definitions, + } +} + module Registry = { + /* + There's a (potential+minor) bug here: If a function definition is called outside of the calls + to the registry, then it's possible that there could be a match after the registry is + called. However, for now, we could just call the registry last. + */ let matchAndRun = (r: registry, fnName: string, args: array) => { let matchToDef = m => Matcher.Registry.matchToDef(r, m) let showNameMatchDefinitions = matches => { diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index aa2fa4b1..8ef27a6c 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -9,34 +9,37 @@ module Wrappers = { } module Prepare = { - let recordWithTwoArgsToValues = (inputs: array): result, string> => + let recordWithTwoArgsToValues = (inputs: array): result, string> => switch inputs { - | [Record([(_, n1), (_, n2)])] => Ok([n1, n2]) + | [FRValueRecord([(_, n1), (_, n2)])] => Ok([n1, n2]) | _ => Error(impossibleError) } - let twoNumberInputs = (inputs: array): result<(float, float), string> => { + let twoNumberInputs = (inputs: array): result<(float, float), string> => { switch inputs { - | [Number(n1), Number(n2)] => Ok(n1, n2) + | [FRValueNumber(n1), FRValueNumber(n2)] => Ok(n1, n2) | _ => Error(impossibleError) } } - let twoDistOrNumber = (values: array): result<(distOrNumber, distOrNumber), string> => { + let twoDistOrNumber = (values: array): result< + (frValueDistOrNumber, frValueDistOrNumber), + string, + > => { switch values { - | [DistOrNumber(a1), DistOrNumber(a2)] => Ok(a1, a2) + | [FRValueDistOrNumber(a1), FRValueDistOrNumber(a2)] => Ok(a1, a2) | _ => Error(impossibleError) } } - let twoDistOrNumberFromRecord = (values: array) => + let twoDistOrNumberFromRecord = (values: array) => values->recordWithTwoArgsToValues->E.R.bind(twoDistOrNumber) } module Process = { let twoDistsOrNumbersToDist = ( ~fn: ((float, float)) => result, - ~values: (distOrNumber, distOrNumber), + ~values: (frValueDistOrNumber, frValueDistOrNumber), ) => { let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000) let sampleSetToExpressionValue = ( @@ -65,10 +68,10 @@ module Process = { } switch values { - | (Number(a1), Number(a2)) => fn((a1, a2))->E.R2.fmap(Wrappers.evDistribution) - | (Dist(a1), Number(a2)) => singleVarSample(a1, r => fn((r, a2))) - | (Number(a1), Dist(a2)) => singleVarSample(a2, r => fn((a1, r))) - | (Dist(a1), Dist(a2)) => { + | (FRValueNumber(a1), FRValueNumber(a2)) => fn((a1, a2))->E.R2.fmap(Wrappers.evDistribution) + | (FRValueDist(a1), FRValueNumber(a2)) => singleVarSample(a1, r => fn((r, a2))) + | (FRValueNumber(a1), FRValueDist(a2)) => singleVarSample(a2, r => fn((a1, r))) + | (FRValueDist(a1), FRValueDist(a2)) => { let altFn = (a, b) => fn((a, b))->mapFnResult let sampleSetResult = E.R.merge(toSampleSet(a1), toSampleSet(a2)) @@ -95,23 +98,23 @@ module TwoArgDist = { r->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_)) let mkRegular = (name, fn) => { - Function.makeDefinition(~name, ~inputs=[I_DistOrNumber, I_DistOrNumber], ~run=inputs => + FnDefinition.make(~name, ~inputs=[FRTypeDistOrNumber, FRTypeDistOrNumber], ~run=inputs => inputs->Prepare.twoDistOrNumber->process(~fn) ) } let mkDef90th = (name, fn) => { - Function.makeDefinition( + FnDefinition.make( ~name, - ~inputs=[I_Record([("p5", I_DistOrNumber), ("p95", I_DistOrNumber)])], + ~inputs=[FRTypeRecord([("p5", FRTypeDistOrNumber), ("p95", FRTypeDistOrNumber)])], ~run=inputs => inputs->Prepare.twoDistOrNumberFromRecord->process(~fn), ) } let mkDefMeanStdev = (name, fn) => { - Function.makeDefinition( + FnDefinition.make( ~name, - ~inputs=[I_Record([("mean", I_DistOrNumber), ("stdev", I_DistOrNumber)])], + ~inputs=[FRTypeRecord([("mean", FRTypeDistOrNumber), ("stdev", FRTypeDistOrNumber)])], ~run=inputs => inputs->Prepare.twoDistOrNumberFromRecord->process(~fn), ) } diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index fe579f2c..7e77da63 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -52,7 +52,7 @@ let more = [ ), Function.make( ~name="To", - ~definitions=[TwoArgDist.mkRegular("cauchy", twoArgs(SymbolicDist.From90thPercentile.make))], + ~definitions=[TwoArgDist.mkRegular("to", twoArgs(SymbolicDist.From90thPercentile.make))], ) ] diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index afac3bbe..fe00d9bb 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -2,6 +2,9 @@ Some functions from modules `L`, `O`, and `R` below were copied directly from running `rescript convert -all` on Rationale https://github.com/jonlaing/rationale */ + +let equals = (a,b) => a === b + module FloatFloatMap = { module Id = Belt.Id.MakeComparable({ type t = float From 7e2437bfc0a39f0dc32572d9f347db04515a424a Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 20 May 2022 22:54:15 -0400 Subject: [PATCH 196/340] Prettier --- .../squiggle-lang/src/rescript/Distributions/GenericDist.res | 3 +-- .../src/rescript/FunctionRegistry/FunctionRegistry_Library.res | 2 +- packages/squiggle-lang/src/rescript/Utility/E.res | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res index dc50833e..d6920a4e 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res @@ -24,7 +24,6 @@ let isSymbolic = (t: t) => | _ => false } - let sampleN = (t: t, n) => switch t { | PointSet(r) => PointSetDist.sampleNRendered(n, r) @@ -32,7 +31,7 @@ let sampleN = (t: t, n) => | SampleSet(r) => SampleSetDist.sampleN(r, n) } -let sample = (t: t) => sampleN(t, 1) -> E.A.first |> E.O.toExn("Should not have happened") +let sample = (t: t) => sampleN(t, 1)->E.A.first |> E.O.toExn("Should not have happened") let toSampleSetDist = (t: t, n) => SampleSetDist.make(sampleN(t, n))->E.R2.errMap(DistributionTypes.Error.sampleErrorToDistErr) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index 7e77da63..d998191f 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -53,7 +53,7 @@ let more = [ Function.make( ~name="To", ~definitions=[TwoArgDist.mkRegular("to", twoArgs(SymbolicDist.From90thPercentile.make))], - ) + ), ] let allFunctions = [NormalFn.toFn, LognormalFn.toFn] diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index fe00d9bb..1916b8b1 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -3,7 +3,7 @@ Some functions from modules `L`, `O`, and `R` below were copied directly from running `rescript convert -all` on Rationale https://github.com/jonlaing/rationale */ -let equals = (a,b) => a === b +let equals = (a, b) => a === b module FloatFloatMap = { module Id = Belt.Id.MakeComparable({ From 40bf7443c9a0e5e582fa788329912b33079600db Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sat, 21 May 2022 11:41:12 -0400 Subject: [PATCH 197/340] Simple FunctionRegistry cleanup --- .../FunctionRegistry_Core.res | 38 +++++++---- .../FunctionRegistry_Helpers.res | 68 ++++++++++--------- .../FunctionRegistry_Library.res | 4 +- .../squiggle-lang/src/rescript/Utility/E.res | 1 + 4 files changed, 62 insertions(+), 49 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res index 5e9e877e..fcb27cbe 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res @@ -56,8 +56,8 @@ module FRType = { | FRTypeOption(v) => `option(${toString(v)})` } - let rec matchWithExpressionValue = (input: t, r: expressionValue): option => - switch (input, r) { + let rec matchWithExpressionValue = (t: t, r: expressionValue): option => + switch (t, r) { | (FRTypeNumber, EvNumber(f)) => Some(FRValueNumber(f)) | (FRTypeDistOrNumber, EvNumber(f)) => Some(FRValueDistOrNumber(FRValueNumber(f))) | (FRTypeDistOrNumber, EvDistribution(Symbolic(#Float(f)))) => @@ -94,6 +94,11 @@ module FRType = { } } +/* + This module, Matcher, is fairly lengthy. However, only two functions from it + are meant to be used outside of it. These are findMatches and matchToDef in Matches.Registry. + The rest of it is just called from those two functions. +*/ module Matcher = { module MatchSimple = { type t = DifferentName | SameNameDifferentArguments | FullMatch @@ -185,21 +190,18 @@ module Matcher = { } module Registry = { - let findExactMatches = (r: registry, fnName: string, args: array) => { + let _findExactMatches = (r: registry, fnName: string, args: array) => { let functionMatchPairs = r->E.A2.fmap(l => (l, Function.match(l, fnName, args))) - let getFullMatch = E.A.getBy(functionMatchPairs, ((_, match: Function.match)) => - Match.isFullMatch(match) - ) - let fullMatch: option = getFullMatch->E.O.bind(((fn, match)) => + let fullMatch = functionMatchPairs->E.A.getBy(((_, match)) => Match.isFullMatch(match)) + fullMatch->E.O.bind(((fn, match)) => switch match { | FullMatch(index) => Some(RegistryMatch.makeMatch(fn.name, index)) | _ => None } ) - fullMatch } - let findNameMatches = (r: registry, fnName: string, args: array) => { + let _findNameMatches = (r: registry, fnName: string, args: array) => { let functionMatchPairs = r->E.A2.fmap(l => (l, Function.match(l, fnName, args))) let getNameMatches = functionMatchPairs @@ -219,10 +221,10 @@ module Matcher = { } let findMatches = (r: registry, fnName: string, args: array) => { - switch findExactMatches(r, fnName, args) { + switch _findExactMatches(r, fnName, args) { | Some(r) => Match.FullMatch(r) | None => - switch findNameMatches(r, fnName, args) { + switch _findNameMatches(r, fnName, args) { | Some(r) => Match.SameNameDifferentArguments(r) | None => Match.DifferentName } @@ -241,7 +243,10 @@ module Matcher = { module FnDefinition = { type t = fnDefinition - let defToString = (t: t) => t.inputs->E.A2.fmap(FRType.toString)->E.A2.joinWith(", ") + let toString = (t: t) => { + let inputs = t.inputs->E.A2.fmap(FRType.toString)->E.A2.joinWith(", ") + t.name ++ `(${inputs})` + } let run = (t: t, args: array) => { let argValues = FRType.matchWithExpressionValueArray(t.inputs, args) @@ -251,7 +256,7 @@ module FnDefinition = { } } - let make = (~name, ~inputs, ~run): fnDefinition => { + let make = (~name, ~inputs, ~run): t => { name: name, inputs: inputs, run: run, @@ -259,7 +264,9 @@ module FnDefinition = { } module Function = { - let make = (~name, ~definitions): function => { + type t = function + + let make = (~name, ~definitions): t => { name: name, definitions: definitions, } @@ -278,7 +285,8 @@ module Registry = { matches ->E.A2.fmap(matchToDef) ->E.A.O.concatSomes - ->E.A2.fmap(r => `[${fnName}(${FnDefinition.defToString(r)})]`) + ->E.A2.fmap(FnDefinition.toString) + ->E.A2.fmap(r => `[${r}]`) ->E.A2.joinWith("; ") `There are function matches for ${fnName}(), but with different arguments: ${defs}` } diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index 8ef27a6c..6daeace1 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -9,44 +9,43 @@ module Wrappers = { } module Prepare = { - let recordWithTwoArgsToValues = (inputs: array): result, string> => - switch inputs { - | [FRValueRecord([(_, n1), (_, n2)])] => Ok([n1, n2]) - | _ => Error(impossibleError) - } + type ts = array + type err = string - let twoNumberInputs = (inputs: array): result<(float, float), string> => { - switch inputs { - | [FRValueNumber(n1), FRValueNumber(n2)] => Ok(n1, n2) - | _ => Error(impossibleError) + module ToValueArray = { + module Record = { + let twoArgs = (inputs: ts): result => + switch inputs { + | [FRValueRecord([(_, n1), (_, n2)])] => Ok([n1, n2]) + | _ => Error(impossibleError) + } } } - let twoDistOrNumber = (values: array): result< - (frValueDistOrNumber, frValueDistOrNumber), - string, - > => { - switch values { - | [FRValueDistOrNumber(a1), FRValueDistOrNumber(a2)] => Ok(a1, a2) - | _ => Error(impossibleError) + module ToValueTuple = { + let twoDistOrNumber = (values: ts): result<(frValueDistOrNumber, frValueDistOrNumber), err> => { + switch values { + | [FRValueDistOrNumber(a1), FRValueDistOrNumber(a2)] => Ok(a1, a2) + | _ => Error(impossibleError) + } + } + + module Record = { + let twoDistOrNumber = (values: ts): result<(frValueDistOrNumber, frValueDistOrNumber), err> => + values->ToValueArray.Record.twoArgs->E.R.bind(twoDistOrNumber) } } - - let twoDistOrNumberFromRecord = (values: array) => - values->recordWithTwoArgsToValues->E.R.bind(twoDistOrNumber) } module Process = { let twoDistsOrNumbersToDist = ( ~fn: ((float, float)) => result, ~values: (frValueDistOrNumber, frValueDistOrNumber), - ) => { + ): result => { let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000) - let sampleSetToExpressionValue = ( - b: Belt.Result.t, - ) => + let sampleSetToExpressionValue = (b: Belt.Result.t) => switch b { - | Ok(r) => Ok(ReducerInterface_ExpressionValue.EvDistribution(SampleSet(r))) + | Ok(r) => Ok(DistributionTypes.SampleSet(r)) | Error(d) => Error(DistributionTypes.Error.toString(d)) } @@ -56,9 +55,11 @@ module Process = { | Error(r) => Error(Operation.Other(r)) } - let singleVarSample = (a, fn) => { + let singleVarSample = (dist, fn) => { let sampleSetResult = - toSampleSet(a) |> E.R2.bind(dist => + dist + ->toSampleSet + ->E.R.bind(dist => SampleSetDist.samplesMap( ~fn=f => fn(f)->mapFnResult, dist, @@ -68,7 +69,7 @@ module Process = { } switch values { - | (FRValueNumber(a1), FRValueNumber(a2)) => fn((a1, a2))->E.R2.fmap(Wrappers.evDistribution) + | (FRValueNumber(a1), FRValueNumber(a2)) => fn((a1, a2)) | (FRValueDist(a1), FRValueNumber(a2)) => singleVarSample(a1, r => fn((r, a2))) | (FRValueNumber(a1), FRValueDist(a2)) => singleVarSample(a2, r => fn((a1, r))) | (FRValueDist(a1), FRValueDist(a2)) => { @@ -89,17 +90,20 @@ module Process = { ~fn: ((float, float)) => result, ~values, ) => { - twoDistsOrNumbersToDist(~fn=r => r->fn->E.R2.fmap(Wrappers.symbolic), ~values) + let newFn = r => fn(r)->E.R2.fmap(Wrappers.symbolic) + twoDistsOrNumbersToDist(~fn=newFn, ~values) } } module TwoArgDist = { let process = (~fn, r) => - r->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_)) + r + ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_)) + ->E.R2.fmap(Wrappers.evDistribution) let mkRegular = (name, fn) => { FnDefinition.make(~name, ~inputs=[FRTypeDistOrNumber, FRTypeDistOrNumber], ~run=inputs => - inputs->Prepare.twoDistOrNumber->process(~fn) + inputs->Prepare.ToValueTuple.twoDistOrNumber->process(~fn) ) } @@ -107,7 +111,7 @@ module TwoArgDist = { FnDefinition.make( ~name, ~inputs=[FRTypeRecord([("p5", FRTypeDistOrNumber), ("p95", FRTypeDistOrNumber)])], - ~run=inputs => inputs->Prepare.twoDistOrNumberFromRecord->process(~fn), + ~run=inputs => inputs->Prepare.ToValueTuple.Record.twoDistOrNumber->process(~fn), ) } @@ -115,7 +119,7 @@ module TwoArgDist = { FnDefinition.make( ~name, ~inputs=[FRTypeRecord([("mean", FRTypeDistOrNumber), ("stdev", FRTypeDistOrNumber)])], - ~run=inputs => inputs->Prepare.twoDistOrNumberFromRecord->process(~fn), + ~run=inputs => inputs->Prepare.ToValueTuple.Record.twoDistOrNumber->process(~fn), ) } } diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index d998191f..705da963 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -1,7 +1,7 @@ open FunctionRegistry_Core open FunctionRegistry_Helpers -let twoArgs = (fn, (a1, a2)) => fn(a1, a2) +let twoArgs = E.Tuple2.toFnCall module NormalFn = { let fnName = "normal" @@ -56,4 +56,4 @@ let more = [ ), ] -let allFunctions = [NormalFn.toFn, LognormalFn.toFn] +let allFunctions = E.A.append([NormalFn.toFn, LognormalFn.toFn], more) diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 1916b8b1..3357f4f4 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -52,6 +52,7 @@ module Tuple2 = { let (_, b) = v b } + let toFnCall = (fn, (a1, a2)) => fn(a1, a2) } module O = { From 226525453113e7d2a52502f5d98d86cbb6c89a3c Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Sat, 21 May 2022 17:59:15 +0200 Subject: [PATCH 198/340] Filter arguments passed to mathjs calls by type so that error messages are not too weird --- .../Reducer_Dispatch_BuiltIn_test.res | 6 +++ .../Reducer_Dispatch_BuiltIn.res | 3 +- .../rescript/Reducer/Reducer_ErrorValue.res | 2 + .../ReducerInterface_ExpressionValue.res | 49 +++++++++++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) 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 0b4ab55a..535f9e56 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 @@ -29,3 +29,9 @@ describe("builtin exception", () => { expectEvalToBe("testZadanga(1)", "Error(JS Exception: Error: Undefined function testZadanga)") ) }) + +Skip.describe("error reporting from collection functions", () => { + testEval("arr = [normal(3,2)]; map(arr, zarathsuzaWasHere)", "") + // FIXME: returns "Error(Function not found: map(Array,Symbol))" + // Actually this error is correct but not informative +}) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res index 203d2c37..72d599ca 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res @@ -149,7 +149,8 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce | ("reduceReverse", [EvArray(aValueArray), initialValue, EvLambda(aLambdaValue)]) => doReduceReverseArray(aValueArray, initialValue, aLambdaValue) | ("reverse", [EvArray(aValueArray)]) => aValueArray->Belt.Array.reverse->EvArray->Ok - | call => callMathJs(call) + | (_, [EvBool(_)]) | (_, [EvNumber(_)]) | (_, [EvString(_)]) | (_, [EvBool(_), EvBool(_)]) | (_, [EvNumber(_), EvNumber(_)]) | (_, [EvString(_), EvString(_)]) => callMathJs(call) + | call => Error(REFunctionNotFound(call->functionCallToCallSignature->functionCallSignatureToString)) // Report full type signature as error } } diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res index d36ca5c4..fc2f86f1 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res @@ -7,6 +7,7 @@ type errorValue = | REOperationError(Operation.operationError) | REExpressionExpected | REFunctionExpected(string) + | REFunctionNotFound(string) | REJavaScriptExn(option, option) // Javascript Exception | REMacroNotFound(string) | RENotAFunction(string) @@ -29,6 +30,7 @@ let errorToString = err => | REAssignmentExpected => "Assignment expected" | REExpressionExpected => "Expression expected" | REFunctionExpected(msg) => `Function expected: ${msg}` + | REFunctionNotFound(msg) => `Function not found: ${msg}` | REDistributionError(err) => `Distribution Math Error: ${DistributionTypes.Error.toString(err)}` | REOperationError(err) => `Math Error: ${Operation.Error.toString(err)}` | REJavaScriptExn(omsg, oname) => { diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res index 730cac2a..958b99df 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res @@ -104,3 +104,52 @@ type environment = DistributionOperation.env @genType let defaultEnvironment: environment = DistributionOperation.defaultEnv + +type expresionValueType = + | EvtArray + | EvtArrayString + | EvtBool + | EvtCall + | EvtDistribution + | EvtLambda + | EvtNumber + | EvtRecord + | EvtString + | EvtSymbol + +type functionCallSignature = CallSignature(string, array) +type functionDefinitionSignature = FunctionDefinitionSignature(functionCallSignature, expresionValueType) + +let valueToValueType = (value) => switch value { + | EvArray(_) => EvtArray + | EvArrayString(_) => EvtArray + | EvBool(_) => EvtBool + | EvCall(_) => EvtCall + | EvDistribution(_) => EvtDistribution + | EvLambda(_) => EvtLambda + | EvNumber(_) => EvtNumber + | EvRecord(_) => EvtRecord + | EvString(_) => EvtArray + | EvSymbol(_) => EvtSymbol} + +let functionCallToCallSignature = (functionCall: functionCall): functionCallSignature => { + let (fn, args) = functionCall + CallSignature(fn, args->Js.Array2.map(valueToValueType))} + +let valueTypeToString = (valueType: expresionValueType): string => + switch valueType { + | EvtArray => `Array` + | EvtArrayString => `ArrayString` + | EvtBool => `Bool` + | EvtCall => `Call` + | EvtDistribution => `Distribution` + | EvtLambda => `Lambda` + | EvtNumber => `Number` + | EvtRecord => `Record` + | EvtString => `String` + | EvtSymbol => `Symbol` + } + +let functionCallSignatureToString = (functionCallSignature: functionCallSignature): string => { + let CallSignature(fn, args) = functionCallSignature + `${fn}(${args->Js.Array2.map(valueTypeToString)->Js.Array2.toString})`} \ No newline at end of file From ce58cf1bb303e57b04042f0202256b534922f8d0 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sat, 21 May 2022 12:09:49 -0400 Subject: [PATCH 199/340] Beginning cleanup of Process errors --- .../FunctionRegistry_Helpers.res | 48 ++++++++----------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index 6daeace1..fd0acb9b 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -43,12 +43,6 @@ module Process = { ~values: (frValueDistOrNumber, frValueDistOrNumber), ): result => { let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000) - let sampleSetToExpressionValue = (b: Belt.Result.t) => - switch b { - | Ok(r) => Ok(DistributionTypes.SampleSet(r)) - | Error(d) => Error(DistributionTypes.Error.toString(d)) - } - let mapFnResult = r => switch r { | Ok(r) => Ok(GenericDist.sample(r)) @@ -56,33 +50,33 @@ module Process = { } let singleVarSample = (dist, fn) => { - let sampleSetResult = - dist - ->toSampleSet - ->E.R.bind(dist => - SampleSetDist.samplesMap( - ~fn=f => fn(f)->mapFnResult, - dist, - )->E.R2.errMap(r => DistributionTypes.SampleSetError(r)) - ) - sampleSetResult->sampleSetToExpressionValue + switch toSampleSet(dist) { + | Ok(dist) => + switch SampleSetDist.samplesMap(~fn=f => fn(f)->mapFnResult, dist) { + | Ok(r) => Ok(DistributionTypes.SampleSet(r)) + | Error(r) => Error(DistributionTypes.Error.toString(DistributionTypes.SampleSetError(r))) + } + | Error(r) => Error(DistributionTypes.Error.toString(r)) + } + } + + let twoVarSample = (dist1, dist2, fn) => { + let altFn = (a, b) => fn((a, b))->mapFnResult + switch E.R.merge(toSampleSet(dist1), toSampleSet(dist2)) { + | Ok((t1, t2)) => + switch SampleSetDist.map2(~fn=altFn, ~t1, ~t2) { + | Ok(r) => Ok(DistributionTypes.SampleSet(r)) + | Error(r) => Error(Operation.Error.toString(r)) + } + | Error(r) => Error(DistributionTypes.Error.toString(r)) + } } switch values { | (FRValueNumber(a1), FRValueNumber(a2)) => fn((a1, a2)) | (FRValueDist(a1), FRValueNumber(a2)) => singleVarSample(a1, r => fn((r, a2))) | (FRValueNumber(a1), FRValueDist(a2)) => singleVarSample(a2, r => fn((a1, r))) - | (FRValueDist(a1), FRValueDist(a2)) => { - let altFn = (a, b) => fn((a, b))->mapFnResult - let sampleSetResult = - E.R.merge(toSampleSet(a1), toSampleSet(a2)) - ->E.R2.errMap(DistributionTypes.Error.toString) - ->E.R.bind(((t1, t2)) => { - SampleSetDist.map2(~fn=altFn, ~t1, ~t2)->E.R2.errMap(Operation.Error.toString) - }) - ->E.R2.errMap(r => DistributionTypes.OtherError(r)) - sampleSetResult->sampleSetToExpressionValue - } + | (FRValueDist(a1), FRValueDist(a2)) => twoVarSample(a1, a2, fn) } } From 3531005a2b8eab07985e0a3950e62ec1bc6e0339 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sat, 21 May 2022 12:18:54 -0400 Subject: [PATCH 200/340] Added enviornment to Function Registry --- .../FunctionRegistry/FunctionRegistry_Core.res | 15 ++++++++++----- .../FunctionRegistry/FunctionRegistry_Helpers.res | 15 ++++++++------- .../ReducerInterface_GenericDistribution.res | 6 +++--- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res index fcb27cbe..3559fb5c 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res @@ -31,7 +31,7 @@ and frValueDistOrNumber = FRValueNumber(float) | FRValueDist(DistributionTypes.g type fnDefinition = { name: string, inputs: array, - run: array => result, + run: (array, DistributionOperation.env) => result, } type function = { @@ -248,10 +248,10 @@ module FnDefinition = { t.name ++ `(${inputs})` } - let run = (t: t, args: array) => { + let run = (t: t, args: array, env: DistributionOperation.env) => { let argValues = FRType.matchWithExpressionValueArray(t.inputs, args) switch argValues { - | Some(values) => t.run(values) + | Some(values) => t.run(values, env) | None => Error("Incorrect Types") } } @@ -278,7 +278,12 @@ module Registry = { to the registry, then it's possible that there could be a match after the registry is called. However, for now, we could just call the registry last. */ - let matchAndRun = (r: registry, fnName: string, args: array) => { + let matchAndRun = ( + r: registry, + fnName: string, + args: array, + env: DistributionOperation.env, + ) => { let matchToDef = m => Matcher.Registry.matchToDef(r, m) let showNameMatchDefinitions = matches => { let defs = @@ -291,7 +296,7 @@ module Registry = { `There are function matches for ${fnName}(), but with different arguments: ${defs}` } switch Matcher.Registry.findMatches(r, fnName, args) { - | Matcher.Match.FullMatch(match) => match->matchToDef->E.O2.fmap(FnDefinition.run(_, args)) + | Matcher.Match.FullMatch(match) => match->matchToDef->E.O2.fmap(FnDefinition.run(_, args, env)) | SameNameDifferentArguments(m) => Some(Error(showNameMatchDefinitions(m))) | _ => None } diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index fd0acb9b..799d119c 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -41,8 +41,9 @@ module Process = { let twoDistsOrNumbersToDist = ( ~fn: ((float, float)) => result, ~values: (frValueDistOrNumber, frValueDistOrNumber), + ~env: DistributionOperation.env, ): result => { - let toSampleSet = r => GenericDist.toSampleSetDist(r, 1000) + let toSampleSet = r => GenericDist.toSampleSetDist(r, env.sampleCount) let mapFnResult = r => switch r { | Ok(r) => Ok(GenericDist.sample(r)) @@ -90,14 +91,14 @@ module Process = { } module TwoArgDist = { - let process = (~fn, r) => + let process = (~fn, ~env, r) => r - ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_)) + ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_, ~env)) ->E.R2.fmap(Wrappers.evDistribution) let mkRegular = (name, fn) => { - FnDefinition.make(~name, ~inputs=[FRTypeDistOrNumber, FRTypeDistOrNumber], ~run=inputs => - inputs->Prepare.ToValueTuple.twoDistOrNumber->process(~fn) + FnDefinition.make(~name, ~inputs=[FRTypeDistOrNumber, FRTypeDistOrNumber], ~run=(inputs, env) => + inputs->Prepare.ToValueTuple.twoDistOrNumber->process(~fn, ~env) ) } @@ -105,7 +106,7 @@ module TwoArgDist = { FnDefinition.make( ~name, ~inputs=[FRTypeRecord([("p5", FRTypeDistOrNumber), ("p95", FRTypeDistOrNumber)])], - ~run=inputs => inputs->Prepare.ToValueTuple.Record.twoDistOrNumber->process(~fn), + ~run=(inputs, env) => inputs->Prepare.ToValueTuple.Record.twoDistOrNumber->process(~fn, ~env), ) } @@ -113,7 +114,7 @@ module TwoArgDist = { FnDefinition.make( ~name, ~inputs=[FRTypeRecord([("mean", FRTypeDistOrNumber), ("stdev", FRTypeDistOrNumber)])], - ~run=inputs => inputs->Prepare.ToValueTuple.Record.twoDistOrNumber->process(~fn), + ~run=(inputs, env) => inputs->Prepare.ToValueTuple.Record.twoDistOrNumber->process(~fn, ~env), ) } } diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index 714ad47b..d7aaeee9 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -363,8 +363,8 @@ let genericOutputToReducerValue = (o: DistributionOperation.outputType): result< let registered = FunctionRegistry_Library.allFunctions -let tryRegistry = ((fnName, args): ExpressionValue.functionCall) => { - FunctionRegistry_Core.Registry.matchAndRun(registered, fnName, args)->E.O2.fmap( +let tryRegistry = ((fnName, args): ExpressionValue.functionCall, env) => { + FunctionRegistry_Core.Registry.matchAndRun(registered, fnName, args, env)->E.O2.fmap( E.R2.errMap(_, s => Reducer_ErrorValue.RETodo(s)), ) } @@ -374,6 +374,6 @@ let dispatch = (call: ExpressionValue.functionCall, environment) => { dispatchToGenericOutput(call, environment)->E.O2.fmap(genericOutputToReducerValue) switch regularDispatch { | Some(x) => Some(x) - | None => tryRegistry(call) + | None => tryRegistry(call, environment) } } From 949b57c4263466fc0fd0f5f7e96560430f577026 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Sat, 21 May 2022 19:18:39 +0200 Subject: [PATCH 201/340] Error reporting if function arguments are defined map(arr, toSample) now correctly reports toSample not found instead of macro(Array,Symbol) not defined --- .../Reducer_Dispatch_BuiltIn_test.res | 8 ++++++-- .../Reducer/Reducer_functionTricks_test.res | 2 +- .../Reducer_Dispatch_BuiltIn.res | 11 +++++++++-- .../Reducer_Expression/Reducer_Expression.res | 19 ++++++++++++++++--- .../ReducerInterface_ExpressionValue.res | 15 ++++++++++----- 5 files changed, 42 insertions(+), 13 deletions(-) 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 535f9e56..682e1737 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 @@ -30,8 +30,12 @@ describe("builtin exception", () => { ) }) -Skip.describe("error reporting from collection functions", () => { - testEval("arr = [normal(3,2)]; map(arr, zarathsuzaWasHere)", "") +describe("error reporting from collection functions", () => { + testEval("arr=[1,2,3]; map(arr, {|x| x*2})", "Ok([2,4,6])") + testEval( + "arr = [normal(3,2)]; map(arr, zarathsuzaWasHere)", + "Error(zarathsuzaWasHere is not defined)", + ) // FIXME: returns "Error(Function not found: map(Array,Symbol))" // Actually this error is correct but not informative }) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res index ba29e920..fd7485eb 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res @@ -25,7 +25,7 @@ describe("Arity check", () => { ) testEvalToBe("f(x)=x; f(f)", "Ok(lambda(x=>internal code))") testEvalToBe( - "f(x,y)=x(y); f(z)", + "f(x,y)=x(y); f(1)", "Error(2 arguments expected. Instead 1 argument(s) were passed.)", ) }) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res index 72d599ca..141b4a37 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res @@ -149,8 +149,15 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce | ("reduceReverse", [EvArray(aValueArray), initialValue, EvLambda(aLambdaValue)]) => doReduceReverseArray(aValueArray, initialValue, aLambdaValue) | ("reverse", [EvArray(aValueArray)]) => aValueArray->Belt.Array.reverse->EvArray->Ok - | (_, [EvBool(_)]) | (_, [EvNumber(_)]) | (_, [EvString(_)]) | (_, [EvBool(_), EvBool(_)]) | (_, [EvNumber(_), EvNumber(_)]) | (_, [EvString(_), EvString(_)]) => callMathJs(call) - | call => Error(REFunctionNotFound(call->functionCallToCallSignature->functionCallSignatureToString)) // Report full type signature as error + | (_, [EvBool(_)]) + | (_, [EvNumber(_)]) + | (_, [EvString(_)]) + | (_, [EvBool(_), EvBool(_)]) + | (_, [EvNumber(_), EvNumber(_)]) + | (_, [EvString(_), EvString(_)]) => + callMathJs(call) + | call => + Error(REFunctionNotFound(call->functionCallToCallSignature->functionCallSignatureToString)) // Report full type signature as error } } diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res index 1125c193..6e3c7cab 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res @@ -76,17 +76,30 @@ and reduceValueList = (valueList: list, environment): result< 'e, > => switch valueList { - | list{EvCall(fName), ...args} => - (fName, args->Belt.List.toArray)->BuiltIn.dispatch(environment, reduceExpression) + | list{EvCall(fName), ...args} => { + let rCheckedArgs = switch fName == "$_setBindings_$" { + | false => args->Lambda.checkIfReduced + | true => args->Ok + } + rCheckedArgs->Result.flatMap(checkedArgs => + (fName, checkedArgs->Belt.List.toArray)->BuiltIn.dispatch(environment, reduceExpression) + ) + } | list{EvLambda(_)} => + // TODO: remove on solving issue#558 valueList ->Lambda.checkIfReduced ->Result.flatMap(reducedValueList => reducedValueList->Belt.List.toArray->ExpressionValue.EvArray->Ok ) | list{EvLambda(lamdaCall), ...args} => - Lambda.doLambdaCall(lamdaCall, args, environment, reduceExpression) + args + ->Lambda.checkIfReduced + ->Result.flatMap(checkedArgs => + Lambda.doLambdaCall(lamdaCall, checkedArgs, environment, reduceExpression) + ) + | _ => valueList ->Lambda.checkIfReduced diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res index 958b99df..7249b135 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res @@ -118,9 +118,11 @@ type expresionValueType = | EvtSymbol type functionCallSignature = CallSignature(string, array) -type functionDefinitionSignature = FunctionDefinitionSignature(functionCallSignature, expresionValueType) +type functionDefinitionSignature = + FunctionDefinitionSignature(functionCallSignature, expresionValueType) -let valueToValueType = (value) => switch value { +let valueToValueType = value => + switch value { | EvArray(_) => EvtArray | EvArrayString(_) => EvtArray | EvBool(_) => EvtBool @@ -130,11 +132,13 @@ let valueToValueType = (value) => switch value { | EvNumber(_) => EvtNumber | EvRecord(_) => EvtRecord | EvString(_) => EvtArray - | EvSymbol(_) => EvtSymbol} + | EvSymbol(_) => EvtSymbol + } let functionCallToCallSignature = (functionCall: functionCall): functionCallSignature => { let (fn, args) = functionCall - CallSignature(fn, args->Js.Array2.map(valueToValueType))} + CallSignature(fn, args->Js.Array2.map(valueToValueType)) +} let valueTypeToString = (valueType: expresionValueType): string => switch valueType { @@ -152,4 +156,5 @@ let valueTypeToString = (valueType: expresionValueType): string => let functionCallSignatureToString = (functionCallSignature: functionCallSignature): string => { let CallSignature(fn, args) = functionCallSignature - `${fn}(${args->Js.Array2.map(valueTypeToString)->Js.Array2.toString})`} \ No newline at end of file + `${fn}(${args->Js.Array2.map(valueTypeToString)->Js.Array2.toString})` +} From c200259c79265bf555997960d69a768bb03ca0fa Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sat, 21 May 2022 13:52:17 -0400 Subject: [PATCH 202/340] Added simpe README and resi for FunctionRegistry --- .../FunctionRegistry_Core.res | 12 ++-- .../FunctionRegistry_Core.resi | 59 +++++++++++++++++++ .../FunctionRegistry_Helpers.res | 1 + .../src/rescript/FunctionRegistry/README.md | 46 +++++++++++++++ .../ReducerInterface_GenericDistribution.res | 4 +- 5 files changed, 114 insertions(+), 8 deletions(-) create mode 100644 packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi create mode 100644 packages/squiggle-lang/src/rescript/FunctionRegistry/README.md diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res index 3559fb5c..92c575f0 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res @@ -279,12 +279,12 @@ module Registry = { called. However, for now, we could just call the registry last. */ let matchAndRun = ( - r: registry, - fnName: string, - args: array, - env: DistributionOperation.env, + ~registry: registry, + ~fnName: string, + ~args: array, + ~env: DistributionOperation.env, ) => { - let matchToDef = m => Matcher.Registry.matchToDef(r, m) + let matchToDef = m => Matcher.Registry.matchToDef(registry, m) let showNameMatchDefinitions = matches => { let defs = matches @@ -295,7 +295,7 @@ module Registry = { ->E.A2.joinWith("; ") `There are function matches for ${fnName}(), but with different arguments: ${defs}` } - switch Matcher.Registry.findMatches(r, fnName, args) { + switch Matcher.Registry.findMatches(registry, fnName, args) { | Matcher.Match.FullMatch(match) => match->matchToDef->E.O2.fmap(FnDefinition.run(_, args, env)) | SameNameDifferentArguments(m) => Some(Error(showNameMatchDefinitions(m))) | _ => None diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi new file mode 100644 index 00000000..55c060be --- /dev/null +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi @@ -0,0 +1,59 @@ +type expressionValue = ReducerInterface_ExpressionValue.expressionValue + +type rec frType = + | FRTypeNumber + | FRTypeNumeric + | FRTypeDistOrNumber + | FRTypeRecord(frTypeRecord) + | FRTypeArray(array) + | FRTypeOption(frType) +and frTypeRecord = array +and frTypeRecordParam = (string, frType) + +type rec frValue = + | FRValueNumber(float) + | FRValueDist(DistributionTypes.genericDist) + | FRValueOption(option) + | FRValueDistOrNumber(frValueDistOrNumber) + | FRValueRecord(frValueRecord) +and frValueRecord = array +and frValueRecordParam = (string, frValue) +and frValueDistOrNumber = FRValueNumber(float) | FRValueDist(DistributionTypes.genericDist) + +type fnDefinition = { + name: string, + inputs: array, + run: (array, DistributionOperation.env) => result, +} + +type function = { + name: string, + definitions: array, +} + +type registry = array + + +// Note: The function "name" is just used for documentation purposes +module Function: { + type t = function + let make: (~name: string, ~definitions: array) => t +} + +module FnDefinition: { + type t = fnDefinition + let make: ( + ~name: string, + ~inputs: array, + ~run: (array, DistributionOperation.env) => result, + ) => t +} + +module Registry: { + let matchAndRun: ( + ~registry: registry, + ~fnName: string, + ~args: array, + ~env: QuriSquiggleLang.DistributionOperation.env, + ) => option> +} diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index 799d119c..a9644756 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -117,4 +117,5 @@ module TwoArgDist = { ~run=(inputs, env) => inputs->Prepare.ToValueTuple.Record.twoDistOrNumber->process(~fn, ~env), ) } + } diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/README.md b/packages/squiggle-lang/src/rescript/FunctionRegistry/README.md new file mode 100644 index 00000000..3bdc387a --- /dev/null +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/README.md @@ -0,0 +1,46 @@ +# Function Registry + +The function registry is a library for organizing function definitions. + +The main interface is fairly constrained. Basically, write functions like the following, and add them to a big array. + +```rescript + Function.make( + ~name="Normal", + ~definitions=[ + FnDefinition.make( + ~name="Normal", + ~definitions=[ + FnDefinition.make(~name="normal", ~inputs=[FRTypeDistOrNumber, FRTypeDistOrNumber], ~run=( + inputs, + env, + ) => + inputs + ->Prepare.ToValueTuple.twoDistOrNumber + ->E.R.bind( + Process.twoDistsOrNumbersToDistUsingSymbolicDist( + ~fn=E.Tuple2.toFnCall(SymbolicDist.Normal.make), + ~env, + ~values=_, + ), + ) + ->E.R2.fmap(Wrappers.evDistribution) + ), + ], + ) + ], + ) +``` + +The Function name is just there for future documentation. The function defintions + +## Key Files + +**FunctionRegistry_Core** +Key types, internal functionality, and a ``Registry`` module with a ``matchAndRun`` function to call function definitions. + +**FunctionRegistry_Library** +A list of all the Functions defined in the Function Registry. + +**FunctionRegistry_Helpers** +A list of helper functions for the FunctionRegistry_Library. \ No newline at end of file diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index d7aaeee9..c8aeb01c 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -361,10 +361,10 @@ let genericOutputToReducerValue = (o: DistributionOperation.outputType): result< | GenDistError(err) => Error(REDistributionError(err)) } -let registered = FunctionRegistry_Library.allFunctions +let registry = FunctionRegistry_Library.allFunctions let tryRegistry = ((fnName, args): ExpressionValue.functionCall, env) => { - FunctionRegistry_Core.Registry.matchAndRun(registered, fnName, args, env)->E.O2.fmap( + FunctionRegistry_Core.Registry.matchAndRun(~registry, ~fnName, ~args, ~env)->E.O2.fmap( E.R2.errMap(_, s => Reducer_ErrorValue.RETodo(s)), ) } From ee94a054d0dc968ca6ec2474b9c8d52279b5db6f Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 22 May 2022 10:38:17 -0400 Subject: [PATCH 203/340] Minor cleanup --- .../FunctionRegistry_Helpers.res | 6 +-- .../FunctionRegistry_Library.res | 48 ++++++++----------- .../ReducerInterface_GenericDistribution.res | 3 +- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index a9644756..f7184704 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -96,13 +96,13 @@ module TwoArgDist = { ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_, ~env)) ->E.R2.fmap(Wrappers.evDistribution) - let mkRegular = (name, fn) => { + let make = (name, fn) => { FnDefinition.make(~name, ~inputs=[FRTypeDistOrNumber, FRTypeDistOrNumber], ~run=(inputs, env) => inputs->Prepare.ToValueTuple.twoDistOrNumber->process(~fn, ~env) ) } - let mkDef90th = (name, fn) => { + let makeRecordP5P95 = (name, fn) => { FnDefinition.make( ~name, ~inputs=[FRTypeRecord([("p5", FRTypeDistOrNumber), ("p95", FRTypeDistOrNumber)])], @@ -110,7 +110,7 @@ module TwoArgDist = { ) } - let mkDefMeanStdev = (name, fn) => { + let makeRecordMeanStdev = (name, fn) => { FnDefinition.make( ~name, ~inputs=[FRTypeRecord([("mean", FRTypeDistOrNumber), ("stdev", FRTypeDistOrNumber)])], diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index 705da963..1fca69bf 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -3,57 +3,47 @@ open FunctionRegistry_Helpers let twoArgs = E.Tuple2.toFnCall -module NormalFn = { - let fnName = "normal" - - let toFn = Function.make( +let registry = [ + Function.make( ~name="Normal", ~definitions=[ - TwoArgDist.mkRegular(fnName, twoArgs(SymbolicDist.Normal.make)), - TwoArgDist.mkDef90th(fnName, r => twoArgs(SymbolicDist.Normal.from90PercentCI, r)->Ok), - TwoArgDist.mkDefMeanStdev(fnName, twoArgs(SymbolicDist.Normal.make)), + TwoArgDist.make("normal", twoArgs(SymbolicDist.Normal.make)), + TwoArgDist.makeRecordP5P95("normal", r => twoArgs(SymbolicDist.Normal.from90PercentCI, r)->Ok), + TwoArgDist.makeRecordMeanStdev("normal", twoArgs(SymbolicDist.Normal.make)), ], - ) -} - -module LognormalFn = { - let fnName = "lognormal" - - let toFn = Function.make( + ), + Function.make( ~name="Lognormal", ~definitions=[ - TwoArgDist.mkRegular(fnName, twoArgs(SymbolicDist.Lognormal.make)), - TwoArgDist.mkDef90th(fnName, r => twoArgs(SymbolicDist.Lognormal.from90PercentCI, r)->Ok), - TwoArgDist.mkDefMeanStdev(fnName, twoArgs(SymbolicDist.Lognormal.fromMeanAndStdev)), + TwoArgDist.make("lognormal", twoArgs(SymbolicDist.Lognormal.make)), + TwoArgDist.makeRecordP5P95("lognormal", r => + twoArgs(SymbolicDist.Lognormal.from90PercentCI, r)->Ok + ), + TwoArgDist.makeRecordMeanStdev("lognormal", twoArgs(SymbolicDist.Lognormal.fromMeanAndStdev)), ], - ) -} - -let more = [ + ), Function.make( ~name="Uniform", - ~definitions=[TwoArgDist.mkRegular("uniform", twoArgs(SymbolicDist.Uniform.make))], + ~definitions=[TwoArgDist.make("uniform", twoArgs(SymbolicDist.Uniform.make))], ), Function.make( ~name="Beta", - ~definitions=[TwoArgDist.mkRegular("beta", twoArgs(SymbolicDist.Beta.make))], + ~definitions=[TwoArgDist.make("beta", twoArgs(SymbolicDist.Beta.make))], ), Function.make( ~name="Cauchy", - ~definitions=[TwoArgDist.mkRegular("cauchy", twoArgs(SymbolicDist.Cauchy.make))], + ~definitions=[TwoArgDist.make("cauchy", twoArgs(SymbolicDist.Cauchy.make))], ), Function.make( ~name="Gamma", - ~definitions=[TwoArgDist.mkRegular("gamma", twoArgs(SymbolicDist.Gamma.make))], + ~definitions=[TwoArgDist.make("gamma", twoArgs(SymbolicDist.Gamma.make))], ), Function.make( ~name="Logistic", - ~definitions=[TwoArgDist.mkRegular("logistic", twoArgs(SymbolicDist.Logistic.make))], + ~definitions=[TwoArgDist.make("logistic", twoArgs(SymbolicDist.Logistic.make))], ), Function.make( ~name="To", - ~definitions=[TwoArgDist.mkRegular("to", twoArgs(SymbolicDist.From90thPercentile.make))], + ~definitions=[TwoArgDist.make("to", twoArgs(SymbolicDist.From90thPercentile.make))], ), ] - -let allFunctions = E.A.append([NormalFn.toFn, LognormalFn.toFn], more) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index c8aeb01c..dfb3d745 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -361,7 +361,8 @@ let genericOutputToReducerValue = (o: DistributionOperation.outputType): result< | GenDistError(err) => Error(REDistributionError(err)) } -let registry = FunctionRegistry_Library.allFunctions +// I expect that it's important to build this first, so it doesn't get recalculated for each tryRegistry() call. +let registry = FunctionRegistry_Library.registry let tryRegistry = ((fnName, args): ExpressionValue.functionCall, env) => { FunctionRegistry_Core.Registry.matchAndRun(~registry, ~fnName, ~args, ~env)->E.O2.fmap( From 4b99e0135e3da94665d65a97dc32f2959fcb25e3 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 22 May 2022 13:02:20 -0400 Subject: [PATCH 204/340] Minor cleanup --- .../Reducer/Reducer_Expression/Reducer_Expression.res | 4 +--- .../ReducerInterface_ExpressionValue.res | 10 +++++----- yarn.lock | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res index 6e3c7cab..64faa43b 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression.res @@ -21,9 +21,7 @@ type t = expression Converts a Squigle code to expression */ let parse = (peggyCode: string): result => - peggyCode - ->Reducer_Peggy_Parse.parse - ->Result.map(node => Reducer_Peggy_ToExpression.fromNode(node)) + peggyCode->Reducer_Peggy_Parse.parse->Result.map(Reducer_Peggy_ToExpression.fromNode) /* Recursively evaluate/reduce the expression (Lisp AST) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res index 7249b135..7b896509 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res @@ -87,7 +87,7 @@ let toStringResult = x => | Error(m) => `Error(${ErrorValue.errorToString(m)})` } -let toStringResultOkless = codeResult => +let toStringResultOkless = (codeResult: result): string => switch codeResult { | Ok(a) => toString(a) | Error(m) => `Error(${ErrorValue.errorToString(m)})` @@ -105,7 +105,7 @@ type environment = DistributionOperation.env @genType let defaultEnvironment: environment = DistributionOperation.defaultEnv -type expresionValueType = +type expressionValueType = | EvtArray | EvtArrayString | EvtBool @@ -117,9 +117,9 @@ type expresionValueType = | EvtString | EvtSymbol -type functionCallSignature = CallSignature(string, array) +type functionCallSignature = CallSignature(string, array) type functionDefinitionSignature = - FunctionDefinitionSignature(functionCallSignature, expresionValueType) + FunctionDefinitionSignature(functionCallSignature, expressionValueType) let valueToValueType = value => switch value { @@ -140,7 +140,7 @@ let functionCallToCallSignature = (functionCall: functionCall): functionCallSign CallSignature(fn, args->Js.Array2.map(valueToValueType)) } -let valueTypeToString = (valueType: expresionValueType): string => +let valueTypeToString = (valueType: expressionValueType): string => switch valueType { | EvtArray => `Array` | EvtArrayString => `ArrayString` diff --git a/yarn.lock b/yarn.lock index d76e428d..3ba8e213 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4295,7 +4295,7 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.9": +"@types/react@*", "@types/react@^18.0.1", "@types/react@^18.0.9": version "18.0.9" resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== @@ -14522,7 +14522,7 @@ react-vega@^7.5.1: prop-types "^15.8.1" vega-embed "^6.5.1" -react@^18.1.0: +react@^18.0.0, react@^18.1.0: version "18.1.0" resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890" integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ== From f816f3c20007d0d94d544ed02753a0ec89d5c3dd Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 22 May 2022 13:02:54 -0400 Subject: [PATCH 205/340] Ran prettier format --- .../Reducer_Peggy_GeneratedParser.js | 1049 ++++++++++++----- 1 file changed, 749 insertions(+), 300 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index 67fa36a1..3a34dfb2 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -4,71 +4,103 @@ "use strict"; +var toFunction = { + "-": "subtract", + "->": "pipe", + "!=": "unequal", + ".-": "dotSubtract", + ".*": "dotMultiply", + "./": "dotDivide", + ".^": "dotPow", + ".+": "dotAdd", + "*": "multiply", + "/": "divide", + "&&": "and", + "^": "pow", // or xor + "+": "add", + "<": "smaller", + "<=": "smallerEq", + "==": "equal", + ">": "larger", + ">=": "largerEq", + "||": "or", + to: "credibleIntervalToDistribution", +}; - var toFunction = { - '-': 'subtract', - '->': 'pipe', - '!=': 'unequal', - '.-': 'dotSubtract', - '.*': 'dotMultiply', - './': 'dotDivide', - '.^': 'dotPow', - '.+': 'dotAdd', - '*': 'multiply', - '/': 'divide', - '&&': 'and', - '^': 'pow', // or xor - '+': 'add', - '<': 'smaller', - '<=': 'smallerEq', - '==': 'equal', - '>': 'larger', - '>=': 'largerEq', - '||': 'or', - 'to': 'credibleIntervalToDistribution', - } +var unaryToFunction = { + "-": "unaryMinus", + "!": "not", + ".-": "unaryDotMinus", +}; - var unaryToFunction = { - '-': 'unaryMinus', - '!': 'not', - '.-': 'unaryDotMinus', - } +var postOperatorToFunction = { + ".": "$_atIndex_$", + "()": "$$_applyAll_$$", + "[]": "$_atIndex_$", +}; - var postOperatorToFunction = { - '.': '$_atIndex_$', - '()': '$$_applyAll_$$', - '[]': '$_atIndex_$', - } - - function nodeBlock(statements) {return{type: 'Block', statements: statements}} - function nodeBoolean(value) {return {type: 'Boolean', value: value}} - function nodeCallIndentifier(value) {return {type: 'CallIdentifier', value: value}} - function nodeExpression(args) {return {type: 'Expression', nodes: args}} - function nodeFloat(value) {return {type: 'Float', value: value}} - function makeFunctionCall(fn, args) { - if (fn === '$$_applyAll_$$') { - // Any list of values is applied from left to right anyway. - // Like in Haskell and Lisp. - // So we remove the redundant $$_applyAll_$$. - if (args[0].type === "Identifier") {args[0].type = "CallIdentifier"} - return nodeExpression(args) - } else { - return nodeExpression([nodeCallIndentifier(fn), ...args]) +function nodeBlock(statements) { + return { type: "Block", statements: statements }; +} +function nodeBoolean(value) { + return { type: "Boolean", value: value }; +} +function nodeCallIndentifier(value) { + return { type: "CallIdentifier", value: value }; +} +function nodeExpression(args) { + return { type: "Expression", nodes: args }; +} +function nodeFloat(value) { + return { type: "Float", value: value }; +} +function makeFunctionCall(fn, args) { + if (fn === "$$_applyAll_$$") { + // Any list of values is applied from left to right anyway. + // Like in Haskell and Lisp. + // So we remove the redundant $$_applyAll_$$. + if (args[0].type === "Identifier") { + args[0].type = "CallIdentifier"; } + return nodeExpression(args); + } else { + return nodeExpression([nodeCallIndentifier(fn), ...args]); } - function nodeIdentifier(value) {return {type: 'Identifier', value: value}} - function nodeInteger(value) {return {type: 'Integer', value: value}} - function nodeKeyValue(key, value) { - if (key.type === 'Identifier') {key.type = 'String'} - return {type: 'KeyValue', key: key, value: value}} - function nodeLambda(args, body) {return {type: 'Lambda', args: args, body: body}} - function nodeLetStatment(variable, value) {return {type: 'LetStatement', variable: variable, value: value}} - function nodeString(value) {return {type: 'String', value: value}} - function nodeTernary(condition, trueExpression, falseExpression) {return {type: 'Ternary', condition: condition, trueExpression: trueExpression, falseExpression: falseExpression}} - +} +function nodeIdentifier(value) { + return { type: "Identifier", value: value }; +} +function nodeInteger(value) { + return { type: "Integer", value: value }; +} +function nodeKeyValue(key, value) { + if (key.type === "Identifier") { + key.type = "String"; + } + return { type: "KeyValue", key: key, value: value }; +} +function nodeLambda(args, body) { + return { type: "Lambda", args: args, body: body }; +} +function nodeLetStatment(variable, value) { + return { type: "LetStatement", variable: variable, value: value }; +} +function nodeString(value) { + return { type: "String", value: value }; +} +function nodeTernary(condition, trueExpression, falseExpression) { + return { + type: "Ternary", + condition: condition, + trueExpression: trueExpression, + falseExpression: falseExpression, + }; +} function peg$subclass(child, parent) { - function C() { this.constructor = child; } + function C() { + this.constructor = child; + } C.prototype = parent.prototype; child.prototype = new C(); } @@ -89,13 +121,15 @@ peg$subclass(peg$SyntaxError, Error); function peg$padEnd(str, targetLength, padString) { padString = padString || " "; - if (str.length > targetLength) { return str; } + if (str.length > targetLength) { + return str; + } targetLength -= str.length; padString += padString.repeat(targetLength); return str + padString.slice(0, targetLength); } -peg$SyntaxError.prototype.format = function(sources) { +peg$SyntaxError.prototype.format = function (sources) { var str = "Error: " + this.message; if (this.location) { var src = null; @@ -113,11 +147,20 @@ peg$SyntaxError.prototype.format = function(sources) { var filler = peg$padEnd("", s.line.toString().length); var line = src[s.line - 1]; var last = s.line === e.line ? e.column : line.length + 1; - str += "\n --> " + loc + "\n" - + filler + " |\n" - + s.line + " | " + line + "\n" - + filler + " | " + peg$padEnd("", s.column - 1) - + peg$padEnd("", last - s.column, "^"); + str += + "\n --> " + + loc + + "\n" + + filler + + " |\n" + + s.line + + " | " + + line + + "\n" + + filler + + " | " + + peg$padEnd("", s.column - 1) + + peg$padEnd("", last - s.column, "^"); } else { str += "\n at " + loc; } @@ -125,14 +168,14 @@ peg$SyntaxError.prototype.format = function(sources) { return str; }; -peg$SyntaxError.buildMessage = function(expected, found) { +peg$SyntaxError.buildMessage = function (expected, found) { var DESCRIBE_EXPECTATION_FNS = { - literal: function(expectation) { - return "\"" + literalEscape(expectation.text) + "\""; + literal: function (expectation) { + return '"' + literalEscape(expectation.text) + '"'; }, - class: function(expectation) { - var escapedParts = expectation.parts.map(function(part) { + class: function (expectation) { + var escapedParts = expectation.parts.map(function (part) { return Array.isArray(part) ? classEscape(part[0]) + "-" + classEscape(part[1]) : classEscape(part); @@ -141,17 +184,17 @@ peg$SyntaxError.buildMessage = function(expected, found) { return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]"; }, - any: function() { + any: function () { return "any character"; }, - end: function() { + end: function () { return "end of input"; }, - other: function(expectation) { + other: function (expectation) { return expectation.description; - } + }, }; function hex(ch) { @@ -161,13 +204,17 @@ peg$SyntaxError.buildMessage = function(expected, found) { function literalEscape(s) { return s .replace(/\\/g, "\\\\") - .replace(/"/g, "\\\"") + .replace(/"/g, '\\"') .replace(/\0/g, "\\0") .replace(/\t/g, "\\t") .replace(/\n/g, "\\n") .replace(/\r/g, "\\r") - .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) - .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); + .replace(/[\x00-\x0F]/g, function (ch) { + return "\\x0" + hex(ch); + }) + .replace(/[\x10-\x1F\x7F-\x9F]/g, function (ch) { + return "\\x" + hex(ch); + }); } function classEscape(s) { @@ -175,13 +222,17 @@ peg$SyntaxError.buildMessage = function(expected, found) { .replace(/\\/g, "\\\\") .replace(/\]/g, "\\]") .replace(/\^/g, "\\^") - .replace(/-/g, "\\-") + .replace(/-/g, "\\-") .replace(/\0/g, "\\0") .replace(/\t/g, "\\t") .replace(/\n/g, "\\n") .replace(/\r/g, "\\r") - .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) - .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); + .replace(/[\x00-\x0F]/g, function (ch) { + return "\\x0" + hex(ch); + }) + .replace(/[\x10-\x1F\x7F-\x9F]/g, function (ch) { + return "\\x" + hex(ch); + }); } function describeExpectation(expectation) { @@ -212,17 +263,25 @@ peg$SyntaxError.buildMessage = function(expected, found) { return descriptions[0] + " or " + descriptions[1]; default: - return descriptions.slice(0, -1).join(", ") - + ", or " - + descriptions[descriptions.length - 1]; + return ( + descriptions.slice(0, -1).join(", ") + + ", or " + + descriptions[descriptions.length - 1] + ); } } function describeFound(found) { - return found ? "\"" + literalEscape(found) + "\"" : "end of input"; + return found ? '"' + literalEscape(found) + '"' : "end of input"; } - return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found."; + return ( + "Expected " + + describeExpected(expected) + + " but " + + describeFound(found) + + " found." + ); }; function peg$parse(input, options) { @@ -271,7 +330,7 @@ function peg$parse(input, options) { var peg$c34 = "."; var peg$c35 = "]"; var peg$c36 = "'"; - var peg$c37 = "\""; + var peg$c37 = '"'; var peg$c38 = "true"; var peg$c39 = "false"; var peg$c40 = "|"; @@ -335,15 +394,23 @@ function peg$parse(input, options) { var peg$e38 = peg$literalExpectation("]", false); var peg$e39 = peg$otherExpectation("identifier"); var peg$e40 = peg$classExpectation(["_", ["a", "z"]], false, false); - var peg$e41 = peg$classExpectation(["_", ["a", "z"], ["0", "9"]], false, true); + var peg$e41 = peg$classExpectation( + ["_", ["a", "z"], ["0", "9"]], + false, + true + ); var peg$e42 = peg$otherExpectation("$identifier"); var peg$e43 = peg$classExpectation(["$", "_", ["a", "z"]], false, false); - var peg$e44 = peg$classExpectation(["$", "_", ["a", "z"], ["0", "9"]], false, true); + var peg$e44 = peg$classExpectation( + ["$", "_", ["a", "z"], ["0", "9"]], + false, + true + ); var peg$e45 = peg$otherExpectation("string"); var peg$e46 = peg$literalExpectation("'", false); var peg$e47 = peg$classExpectation(["'"], true, false); - var peg$e48 = peg$literalExpectation("\"", false); - var peg$e49 = peg$classExpectation(["\""], true, false); + var peg$e48 = peg$literalExpectation('"', false); + var peg$e49 = peg$classExpectation(['"'], true, false); var peg$e50 = peg$otherExpectation("integer"); var peg$e51 = peg$classExpectation(["e"], false, true); var peg$e52 = peg$otherExpectation("float"); @@ -371,55 +438,134 @@ function peg$parse(input, options) { var peg$e74 = peg$otherExpectation("newline"); var peg$e75 = peg$classExpectation(["\n", "\r"], false, false); - var peg$f0 = function(start) {return start}; - var peg$f1 = function(statements, finalExpression) { if (finalExpression != null) { statements.push(finalExpression) } - return nodeBlock(statements) }; - var peg$f2 = function(finalExpression) { return nodeBlock([finalExpression])}; - var peg$f3 = function(statements, finalExpression) { statements.push(finalExpression) - return nodeBlock(statements) }; - var peg$f4 = function(finalExpression) { return nodeBlock([finalExpression]) }; - var peg$f5 = function(head, tail) { return [head, ...tail] }; - var peg$f6 = function(head) { return [head] }; - var peg$f7 = function(variable, value) { return nodeLetStatment(variable, value) }; - var peg$f8 = function(variable, args, body) { var value = nodeLambda(args, body) - return nodeLetStatment(variable, value) }; - var peg$f9 = function(head, tail) { return [head, ...tail]; }; - var peg$f10 = function(condition, trueExpression, falseExpression) { return nodeTernary(condition, trueExpression, falseExpression) }; - var peg$f11 = function(head, operator, arg) {return {operator: operator, right: arg}}; - var peg$f12 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(toFunction[element.operator], [result, element.right]) - }, head)}; - var peg$f13 = function(left, operator, right) { return makeFunctionCall(toFunction[operator], [left, right])}; - var peg$f14 = function(head, chained) {return chained}; - var peg$f15 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(element.fnName, [result, ...element.args]) - }, head)}; - var peg$f16 = function(fn, args) { return {fnName: fn.value, args: args}}; - var peg$f17 = function(fn) { return {fnName: fn.value, args: []}}; - var peg$f18 = function(unaryOperator, right) { return makeFunctionCall(unaryToFunction[unaryOperator], [right])}; - var peg$f19 = function(head, arg) {return {fn: postOperatorToFunction['[]'], args: [arg]}}; - var peg$f20 = function(head, args) {return {fn: postOperatorToFunction['()'], args: args}}; - var peg$f21 = function(head, arg) {return {fn: postOperatorToFunction['[]'], args: [nodeString(arg)]}}; - var peg$f22 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(element.fn, [result, ...element.args]) - }, head)}; - var peg$f23 = function(head, arg) {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}}; - var peg$f24 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(element.fn, [result, ...element.args]) - }, head)}; - var peg$f25 = function(expression) {return expression}; - var peg$f26 = function() {return nodeIdentifier(text())}; - var peg$f27 = function(characters) {return nodeString(characters.join(''))}; - var peg$f28 = function() { return nodeInteger(parseInt(text()))}; - var peg$f29 = function() { return nodeFloat(parseFloat(text()))}; - var peg$f30 = function() { return nodeBoolean(text() === 'true')}; - var peg$f31 = function(args, statements, finalExpression) { statements.push(finalExpression) - return nodeLambda(args, nodeBlock(statements)) }; - var peg$f32 = function(args, finalExpression) { return nodeLambda(args, nodeBlock([finalExpression])) }; - var peg$f33 = function() { return makeFunctionCall('$_constructArray_$', [nodeExpression([])])}; - var peg$f34 = function(args) { return makeFunctionCall('$_constructArray_$', [nodeExpression(args)])}; - var peg$f35 = function(args) { return makeFunctionCall('$_constructRecord_$', [nodeExpression(args)])}; - var peg$f36 = function(key, value) { return nodeKeyValue(key, value)}; + var peg$f0 = function (start) { + return start; + }; + var peg$f1 = function (statements, finalExpression) { + if (finalExpression != null) { + statements.push(finalExpression); + } + return nodeBlock(statements); + }; + var peg$f2 = function (finalExpression) { + return nodeBlock([finalExpression]); + }; + var peg$f3 = function (statements, finalExpression) { + statements.push(finalExpression); + return nodeBlock(statements); + }; + var peg$f4 = function (finalExpression) { + return nodeBlock([finalExpression]); + }; + var peg$f5 = function (head, tail) { + return [head, ...tail]; + }; + var peg$f6 = function (head) { + return [head]; + }; + var peg$f7 = function (variable, value) { + return nodeLetStatment(variable, value); + }; + var peg$f8 = function (variable, args, body) { + var value = nodeLambda(args, body); + return nodeLetStatment(variable, value); + }; + var peg$f9 = function (head, tail) { + return [head, ...tail]; + }; + var peg$f10 = function (condition, trueExpression, falseExpression) { + return nodeTernary(condition, trueExpression, falseExpression); + }; + var peg$f11 = function (head, operator, arg) { + return { operator: operator, right: arg }; + }; + var peg$f12 = function (head, tail) { + return tail.reduce(function (result, element) { + return makeFunctionCall(toFunction[element.operator], [ + result, + element.right, + ]); + }, head); + }; + var peg$f13 = function (left, operator, right) { + return makeFunctionCall(toFunction[operator], [left, right]); + }; + var peg$f14 = function (head, chained) { + return chained; + }; + var peg$f15 = function (head, tail) { + return tail.reduce(function (result, element) { + return makeFunctionCall(element.fnName, [result, ...element.args]); + }, head); + }; + var peg$f16 = function (fn, args) { + return { fnName: fn.value, args: args }; + }; + var peg$f17 = function (fn) { + return { fnName: fn.value, args: [] }; + }; + var peg$f18 = function (unaryOperator, right) { + return makeFunctionCall(unaryToFunction[unaryOperator], [right]); + }; + var peg$f19 = function (head, arg) { + return { fn: postOperatorToFunction["[]"], args: [arg] }; + }; + var peg$f20 = function (head, args) { + return { fn: postOperatorToFunction["()"], args: args }; + }; + var peg$f21 = function (head, arg) { + return { fn: postOperatorToFunction["[]"], args: [nodeString(arg)] }; + }; + var peg$f22 = function (head, tail) { + return tail.reduce(function (result, element) { + return makeFunctionCall(element.fn, [result, ...element.args]); + }, head); + }; + var peg$f23 = function (head, arg) { + return { fn: postOperatorToFunction["."], args: [nodeString(arg)] }; + }; + var peg$f24 = function (head, tail) { + return tail.reduce(function (result, element) { + return makeFunctionCall(element.fn, [result, ...element.args]); + }, head); + }; + var peg$f25 = function (expression) { + return expression; + }; + var peg$f26 = function () { + return nodeIdentifier(text()); + }; + var peg$f27 = function (characters) { + return nodeString(characters.join("")); + }; + var peg$f28 = function () { + return nodeInteger(parseInt(text())); + }; + var peg$f29 = function () { + return nodeFloat(parseFloat(text())); + }; + var peg$f30 = function () { + return nodeBoolean(text() === "true"); + }; + var peg$f31 = function (args, statements, finalExpression) { + statements.push(finalExpression); + return nodeLambda(args, nodeBlock(statements)); + }; + var peg$f32 = function (args, finalExpression) { + return nodeLambda(args, nodeBlock([finalExpression])); + }; + var peg$f33 = function () { + return makeFunctionCall("$_constructArray_$", [nodeExpression([])]); + }; + var peg$f34 = function (args) { + return makeFunctionCall("$_constructArray_$", [nodeExpression(args)]); + }; + var peg$f35 = function (args) { + return makeFunctionCall("$_constructRecord_$", [nodeExpression(args)]); + }; + var peg$f36 = function (key, value) { + return nodeKeyValue(key, value); + }; var peg$currPos = 0; var peg$savedPos = 0; @@ -434,7 +580,9 @@ function peg$parse(input, options) { if ("startRule" in options) { if (!(options.startRule in peg$startRuleFunctions)) { - throw new Error("Can't start parsing from rule \"" + options.startRule + "\"."); + throw new Error( + "Can't start parsing from rule \"" + options.startRule + '".' + ); } peg$startRuleFunction = peg$startRuleFunctions[options.startRule]; @@ -452,7 +600,7 @@ function peg$parse(input, options) { return { source: peg$source, start: peg$savedPos, - end: peg$currPos + end: peg$currPos, }; } @@ -461,9 +609,10 @@ function peg$parse(input, options) { } function expected(description, location) { - location = location !== undefined - ? location - : peg$computeLocation(peg$savedPos, peg$currPos); + location = + location !== undefined + ? location + : peg$computeLocation(peg$savedPos, peg$currPos); throw peg$buildStructuredError( [peg$otherExpectation(description)], @@ -473,9 +622,10 @@ function peg$parse(input, options) { } function error(message, location) { - location = location !== undefined - ? location - : peg$computeLocation(peg$savedPos, peg$currPos); + location = + location !== undefined + ? location + : peg$computeLocation(peg$savedPos, peg$currPos); throw peg$buildSimpleError(message, location); } @@ -485,7 +635,12 @@ function peg$parse(input, options) { } function peg$classExpectation(parts, inverted, ignoreCase) { - return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase }; + return { + type: "class", + parts: parts, + inverted: inverted, + ignoreCase: ignoreCase, + }; } function peg$anyExpectation() { @@ -515,7 +670,7 @@ function peg$parse(input, options) { details = peg$posDetailsCache[p]; details = { line: details.line, - column: details.column + column: details.column, }; while (p < pos) { @@ -544,18 +699,20 @@ function peg$parse(input, options) { start: { offset: startPos, line: startPosDetails.line, - column: startPosDetails.column + column: startPosDetails.column, }, end: { offset: endPos, line: endPosDetails.line, - column: endPosDetails.column - } + column: endPosDetails.column, + }, }; } function peg$fail(expected) { - if (peg$currPos < peg$maxFailPos) { return; } + if (peg$currPos < peg$maxFailPos) { + return; + } if (peg$currPos > peg$maxFailPos) { peg$maxFailPos = peg$currPos; @@ -732,7 +889,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } + if (peg$silentFails === 0) { + peg$fail(peg$e0); + } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -759,7 +918,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } + if (peg$silentFails === 0) { + peg$fail(peg$e1); + } } if (s6 !== peg$FAILED) { peg$savedPos = s0; @@ -787,7 +948,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } + if (peg$silentFails === 0) { + peg$fail(peg$e0); + } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -799,7 +962,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } + if (peg$silentFails === 0) { + peg$fail(peg$e1); + } } if (s5 !== peg$FAILED) { peg$savedPos = s0; @@ -961,7 +1126,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } + if (peg$silentFails === 0) { + peg$fail(peg$e2); + } } if (s2 !== peg$FAILED) { s3 = peg$parse_nl(); @@ -973,7 +1140,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { + peg$fail(peg$e3); + } } if (s6 !== peg$FAILED) { s7 = peg$parse_(); @@ -1032,12 +1201,16 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e5); } + if (peg$silentFails === 0) { + peg$fail(peg$e5); + } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e4); } + if (peg$silentFails === 0) { + peg$fail(peg$e4); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -1068,7 +1241,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } + if (peg$silentFails === 0) { + peg$fail(peg$e6); + } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -1092,7 +1267,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } + if (peg$silentFails === 0) { + peg$fail(peg$e6); + } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -1163,7 +1340,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e7); } + if (peg$silentFails === 0) { + peg$fail(peg$e7); + } } if (s1 !== peg$FAILED) { s2 = peg$parse__nl(); @@ -1177,7 +1356,9 @@ function peg$parse(input, options) { peg$currPos += 4; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e8); } + if (peg$silentFails === 0) { + peg$fail(peg$e8); + } } if (s5 !== peg$FAILED) { s6 = peg$parse__nl(); @@ -1191,7 +1372,9 @@ function peg$parse(input, options) { peg$currPos += 4; } else { s9 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e9); } + if (peg$silentFails === 0) { + peg$fail(peg$e9); + } } if (s9 !== peg$FAILED) { s10 = peg$parse__nl(); @@ -1274,7 +1457,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e10); } + if (peg$silentFails === 0) { + peg$fail(peg$e10); + } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -1286,7 +1471,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e11); } + if (peg$silentFails === 0) { + peg$fail(peg$e11); + } } if (s7 !== peg$FAILED) { s8 = peg$parse_nl(); @@ -1406,12 +1593,16 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e13); } + if (peg$silentFails === 0) { + peg$fail(peg$e13); + } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } + if (peg$silentFails === 0) { + peg$fail(peg$e12); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -1502,12 +1693,16 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e14); } + if (peg$silentFails === 0) { + peg$fail(peg$e14); + } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } + if (peg$silentFails === 0) { + peg$fail(peg$e12); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -1577,7 +1772,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e15); } + if (peg$silentFails === 0) { + peg$fail(peg$e15); + } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c14) { @@ -1585,13 +1782,17 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e16); } + if (peg$silentFails === 0) { + peg$fail(peg$e16); + } } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } + if (peg$silentFails === 0) { + peg$fail(peg$e12); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -1661,7 +1862,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e17); } + if (peg$silentFails === 0) { + peg$fail(peg$e17); + } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 60) { @@ -1669,7 +1872,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e18); } + if (peg$silentFails === 0) { + peg$fail(peg$e18); + } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c17) { @@ -1677,7 +1882,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e19); } + if (peg$silentFails === 0) { + peg$fail(peg$e19); + } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 62) { @@ -1685,7 +1892,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e20); } + if (peg$silentFails === 0) { + peg$fail(peg$e20); + } } } } @@ -1693,7 +1902,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } + if (peg$silentFails === 0) { + peg$fail(peg$e12); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -1784,7 +1995,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e21); } + if (peg$silentFails === 0) { + peg$fail(peg$e21); + } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 45) { @@ -1792,7 +2005,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } + if (peg$silentFails === 0) { + peg$fail(peg$e22); + } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c21) { @@ -1800,7 +2015,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e23); } + if (peg$silentFails === 0) { + peg$fail(peg$e23); + } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c22) { @@ -1808,7 +2025,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e24); } + if (peg$silentFails === 0) { + peg$fail(peg$e24); + } } } } @@ -1816,7 +2035,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } + if (peg$silentFails === 0) { + peg$fail(peg$e12); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -1907,7 +2128,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e25); } + if (peg$silentFails === 0) { + peg$fail(peg$e25); + } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 47) { @@ -1915,7 +2138,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e26); } + if (peg$silentFails === 0) { + peg$fail(peg$e26); + } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c25) { @@ -1923,7 +2148,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e27); } + if (peg$silentFails === 0) { + peg$fail(peg$e27); + } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c26) { @@ -1931,7 +2158,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e28); } + if (peg$silentFails === 0) { + peg$fail(peg$e28); + } } } } @@ -1939,7 +2168,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } + if (peg$silentFails === 0) { + peg$fail(peg$e12); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -2030,7 +2261,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e29); } + if (peg$silentFails === 0) { + peg$fail(peg$e29); + } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c28) { @@ -2038,13 +2271,17 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e30); } + if (peg$silentFails === 0) { + peg$fail(peg$e30); + } } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } + if (peg$silentFails === 0) { + peg$fail(peg$e12); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -2155,12 +2392,16 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e31); } + if (peg$silentFails === 0) { + peg$fail(peg$e31); + } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } + if (peg$silentFails === 0) { + peg$fail(peg$e12); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -2191,7 +2432,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e32); } + if (peg$silentFails === 0) { + peg$fail(peg$e32); + } } if (s5 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c31) { @@ -2199,7 +2442,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } + if (peg$silentFails === 0) { + peg$fail(peg$e33); + } } } if (s5 !== peg$FAILED) { @@ -2225,7 +2470,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e32); } + if (peg$silentFails === 0) { + peg$fail(peg$e32); + } } if (s5 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c31) { @@ -2233,7 +2480,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } + if (peg$silentFails === 0) { + peg$fail(peg$e33); + } } } if (s5 !== peg$FAILED) { @@ -2283,7 +2532,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } + if (peg$silentFails === 0) { + peg$fail(peg$e2); + } } if (s2 !== peg$FAILED) { s3 = peg$parse_nl(); @@ -2295,7 +2546,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { + peg$fail(peg$e3); + } } if (s6 !== peg$FAILED) { peg$savedPos = s0; @@ -2325,7 +2578,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } + if (peg$silentFails === 0) { + peg$fail(peg$e2); + } } if (s2 !== peg$FAILED) { s3 = peg$parse_nl(); @@ -2334,7 +2589,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { + peg$fail(peg$e3); + } } if (s4 !== peg$FAILED) { peg$savedPos = s0; @@ -2425,7 +2682,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } + if (peg$silentFails === 0) { + peg$fail(peg$e22); + } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c22) { @@ -2433,7 +2692,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e24); } + if (peg$silentFails === 0) { + peg$fail(peg$e24); + } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 33) { @@ -2441,14 +2702,18 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } + if (peg$silentFails === 0) { + peg$fail(peg$e35); + } } } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } + if (peg$silentFails === 0) { + peg$fail(peg$e34); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -2503,7 +2768,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } + if (peg$silentFails === 0) { + peg$fail(peg$e36); + } } if (s3 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 40) { @@ -2511,7 +2778,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } + if (peg$silentFails === 0) { + peg$fail(peg$e2); + } } if (s3 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 46) { @@ -2519,7 +2788,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } + if (peg$silentFails === 0) { + peg$fail(peg$e37); + } } } } @@ -2539,7 +2810,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } + if (peg$silentFails === 0) { + peg$fail(peg$e36); + } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2551,7 +2824,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } + if (peg$silentFails === 0) { + peg$fail(peg$e38); + } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2576,7 +2851,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } + if (peg$silentFails === 0) { + peg$fail(peg$e2); + } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2588,7 +2865,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { + peg$fail(peg$e3); + } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2612,7 +2891,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } + if (peg$silentFails === 0) { + peg$fail(peg$e37); + } } if (s5 !== peg$FAILED) { s6 = peg$currPos; @@ -2644,7 +2925,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } + if (peg$silentFails === 0) { + peg$fail(peg$e36); + } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2656,7 +2939,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } + if (peg$silentFails === 0) { + peg$fail(peg$e38); + } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2681,7 +2966,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } + if (peg$silentFails === 0) { + peg$fail(peg$e2); + } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2693,7 +2980,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { + peg$fail(peg$e3); + } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2717,7 +3006,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } + if (peg$silentFails === 0) { + peg$fail(peg$e37); + } } if (s5 !== peg$FAILED) { s6 = peg$currPos; @@ -2780,7 +3071,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } + if (peg$silentFails === 0) { + peg$fail(peg$e6); + } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -2804,7 +3097,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } + if (peg$silentFails === 0) { + peg$fail(peg$e6); + } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -2854,7 +3149,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } + if (peg$silentFails === 0) { + peg$fail(peg$e37); + } } peg$silentFails--; if (s3 !== peg$FAILED) { @@ -2872,7 +3169,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } + if (peg$silentFails === 0) { + peg$fail(peg$e37); + } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2903,7 +3202,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } + if (peg$silentFails === 0) { + peg$fail(peg$e37); + } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2960,7 +3261,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } + if (peg$silentFails === 0) { + peg$fail(peg$e2); + } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -2972,7 +3275,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } + if (peg$silentFails === 0) { + peg$fail(peg$e3); + } } if (s5 !== peg$FAILED) { peg$savedPos = s0; @@ -3072,7 +3377,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } + if (peg$silentFails === 0) { + peg$fail(peg$e40); + } } if (s3 !== peg$FAILED) { while (s3 !== peg$FAILED) { @@ -3082,7 +3389,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } + if (peg$silentFails === 0) { + peg$fail(peg$e40); + } } } } else { @@ -3095,7 +3404,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } + if (peg$silentFails === 0) { + peg$fail(peg$e41); + } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3104,7 +3415,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } + if (peg$silentFails === 0) { + peg$fail(peg$e41); + } } } s2 = [s2, s3]; @@ -3121,7 +3434,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e39); } + if (peg$silentFails === 0) { + peg$fail(peg$e39); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3150,7 +3465,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } + if (peg$silentFails === 0) { + peg$fail(peg$e43); + } } if (s3 !== peg$FAILED) { while (s3 !== peg$FAILED) { @@ -3160,7 +3477,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } + if (peg$silentFails === 0) { + peg$fail(peg$e43); + } } } } else { @@ -3173,7 +3492,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } + if (peg$silentFails === 0) { + peg$fail(peg$e44); + } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3182,7 +3503,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } + if (peg$silentFails === 0) { + peg$fail(peg$e44); + } } } s2 = [s2, s3]; @@ -3199,7 +3522,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e42); } + if (peg$silentFails === 0) { + peg$fail(peg$e42); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3227,7 +3552,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } + if (peg$silentFails === 0) { + peg$fail(peg$e46); + } } if (s2 !== peg$FAILED) { s3 = []; @@ -3236,7 +3563,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } + if (peg$silentFails === 0) { + peg$fail(peg$e47); + } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3245,7 +3574,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } + if (peg$silentFails === 0) { + peg$fail(peg$e47); + } } } if (input.charCodeAt(peg$currPos) === 39) { @@ -3253,7 +3584,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } + if (peg$silentFails === 0) { + peg$fail(peg$e46); + } } if (s4 !== peg$FAILED) { s1 = s3; @@ -3278,7 +3611,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } + if (peg$silentFails === 0) { + peg$fail(peg$e48); + } } if (s2 !== peg$FAILED) { s3 = []; @@ -3287,7 +3622,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } + if (peg$silentFails === 0) { + peg$fail(peg$e49); + } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3296,7 +3633,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } + if (peg$silentFails === 0) { + peg$fail(peg$e49); + } } } if (input.charCodeAt(peg$currPos) === 34) { @@ -3304,7 +3643,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } + if (peg$silentFails === 0) { + peg$fail(peg$e48); + } } if (s4 !== peg$FAILED) { s1 = s3; @@ -3325,7 +3666,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } + if (peg$silentFails === 0) { + peg$fail(peg$e45); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3365,7 +3708,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } + if (peg$silentFails === 0) { + peg$fail(peg$e37); + } } peg$silentFails--; if (s3 === peg$FAILED) { @@ -3382,7 +3727,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } + if (peg$silentFails === 0) { + peg$fail(peg$e51); + } } peg$silentFails--; if (s4 === peg$FAILED) { @@ -3409,7 +3756,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e50); } + if (peg$silentFails === 0) { + peg$fail(peg$e50); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3450,7 +3799,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } + if (peg$silentFails === 0) { + peg$fail(peg$e37); + } } if (s5 !== peg$FAILED) { s6 = []; @@ -3476,7 +3827,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } + if (peg$silentFails === 0) { + peg$fail(peg$e37); + } } if (s4 !== peg$FAILED) { s5 = []; @@ -3551,7 +3904,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e52); } + if (peg$silentFails === 0) { + peg$fail(peg$e52); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3577,7 +3932,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } + if (peg$silentFails === 0) { + peg$fail(peg$e51); + } } if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 45) { @@ -3585,7 +3942,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } + if (peg$silentFails === 0) { + peg$fail(peg$e22); + } } if (s2 === peg$FAILED) { s2 = null; @@ -3634,7 +3993,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e53); } + if (peg$silentFails === 0) { + peg$fail(peg$e53); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3661,7 +4022,9 @@ function peg$parse(input, options) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e55); } + if (peg$silentFails === 0) { + peg$fail(peg$e55); + } } if (s1 === peg$FAILED) { if (input.substr(peg$currPos, 5) === peg$c39) { @@ -3669,7 +4032,9 @@ function peg$parse(input, options) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e56); } + if (peg$silentFails === 0) { + peg$fail(peg$e56); + } } } if (s1 !== peg$FAILED) { @@ -3680,7 +4045,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } + if (peg$silentFails === 0) { + peg$fail(peg$e54); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3734,7 +4101,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } + if (peg$silentFails === 0) { + peg$fail(peg$e0); + } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -3743,7 +4112,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } + if (peg$silentFails === 0) { + peg$fail(peg$e57); + } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -3755,7 +4126,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } + if (peg$silentFails === 0) { + peg$fail(peg$e57); + } } if (s7 !== peg$FAILED) { s8 = peg$parse_nl(); @@ -3782,7 +4155,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s12 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } + if (peg$silentFails === 0) { + peg$fail(peg$e1); + } } if (s12 !== peg$FAILED) { peg$savedPos = s0; @@ -3822,7 +4197,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } + if (peg$silentFails === 0) { + peg$fail(peg$e0); + } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -3831,7 +4208,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } + if (peg$silentFails === 0) { + peg$fail(peg$e57); + } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -3843,7 +4222,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } + if (peg$silentFails === 0) { + peg$fail(peg$e57); + } } if (s7 !== peg$FAILED) { s8 = peg$parse_nl(); @@ -3855,7 +4236,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s11 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } + if (peg$silentFails === 0) { + peg$fail(peg$e1); + } } if (s11 !== peg$FAILED) { peg$savedPos = s0; @@ -3910,7 +4293,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } + if (peg$silentFails === 0) { + peg$fail(peg$e36); + } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -3919,7 +4304,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } + if (peg$silentFails === 0) { + peg$fail(peg$e38); + } } if (s3 !== peg$FAILED) { peg$savedPos = s0; @@ -3939,7 +4326,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } + if (peg$silentFails === 0) { + peg$fail(peg$e36); + } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -3951,7 +4340,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } + if (peg$silentFails === 0) { + peg$fail(peg$e38); + } } if (s5 !== peg$FAILED) { peg$savedPos = s0; @@ -3972,7 +4363,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e58); } + if (peg$silentFails === 0) { + peg$fail(peg$e58); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4003,7 +4396,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } + if (peg$silentFails === 0) { + peg$fail(peg$e6); + } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -4027,7 +4422,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } + if (peg$silentFails === 0) { + peg$fail(peg$e6); + } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -4074,7 +4471,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } + if (peg$silentFails === 0) { + peg$fail(peg$e0); + } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -4086,7 +4485,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } + if (peg$silentFails === 0) { + peg$fail(peg$e1); + } } if (s5 !== peg$FAILED) { peg$savedPos = s0; @@ -4106,7 +4507,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e59); } + if (peg$silentFails === 0) { + peg$fail(peg$e59); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4137,7 +4540,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } + if (peg$silentFails === 0) { + peg$fail(peg$e6); + } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -4161,7 +4566,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } + if (peg$silentFails === 0) { + peg$fail(peg$e6); + } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -4210,7 +4617,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e11); } + if (peg$silentFails === 0) { + peg$fail(peg$e11); + } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -4257,7 +4666,9 @@ function peg$parse(input, options) { } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } + if (peg$silentFails === 0) { + peg$fail(peg$e60); + } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4291,7 +4702,9 @@ function peg$parse(input, options) { } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e61); } + if (peg$silentFails === 0) { + peg$fail(peg$e61); + } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4324,7 +4737,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } + if (peg$silentFails === 0) { + peg$fail(peg$e60); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4364,7 +4779,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e62); } + if (peg$silentFails === 0) { + peg$fail(peg$e62); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4393,7 +4810,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } + if (peg$silentFails === 0) { + peg$fail(peg$e64); + } } if (s3 === peg$FAILED) { s3 = peg$parsecommentOrNewLine(); @@ -4406,7 +4825,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } + if (peg$silentFails === 0) { + peg$fail(peg$e64); + } } if (s3 === peg$FAILED) { s3 = peg$parsecommentOrNewLine(); @@ -4426,7 +4847,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e63); } + if (peg$silentFails === 0) { + peg$fail(peg$e63); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4485,7 +4908,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e66); } + if (peg$silentFails === 0) { + peg$fail(peg$e66); + } } if (s2 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 35) { @@ -4493,7 +4918,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e67); } + if (peg$silentFails === 0) { + peg$fail(peg$e67); + } } } if (s2 !== peg$FAILED) { @@ -4503,7 +4930,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } + if (peg$silentFails === 0) { + peg$fail(peg$e68); + } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -4512,7 +4941,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } + if (peg$silentFails === 0) { + peg$fail(peg$e68); + } } } s0 = s3; @@ -4523,7 +4954,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e65); } + if (peg$silentFails === 0) { + peg$fail(peg$e65); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4572,7 +5005,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e70); } + if (peg$silentFails === 0) { + peg$fail(peg$e70); + } } if (s1 !== peg$FAILED) { s2 = []; @@ -4581,7 +5016,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } + if (peg$silentFails === 0) { + peg$fail(peg$e71); + } } while (s3 !== peg$FAILED) { s2.push(s3); @@ -4590,7 +5027,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } + if (peg$silentFails === 0) { + peg$fail(peg$e71); + } } } if (input.substr(peg$currPos, 2) === peg$c45) { @@ -4598,7 +5037,9 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e72); } + if (peg$silentFails === 0) { + peg$fail(peg$e72); + } } if (s3 !== peg$FAILED) { s0 = s2; @@ -4613,7 +5054,9 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e69); } + if (peg$silentFails === 0) { + peg$fail(peg$e69); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4638,7 +5081,9 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e73); } + if (peg$silentFails === 0) { + peg$fail(peg$e73); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4664,12 +5109,16 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e75); } + if (peg$silentFails === 0) { + peg$fail(peg$e75); + } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e74); } + if (peg$silentFails === 0) { + peg$fail(peg$e74); + } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4698,5 +5147,5 @@ function peg$parse(input, options) { module.exports = { SyntaxError: peg$SyntaxError, - parse: peg$parse + parse: peg$parse, }; From 364190dc7b4328da77c4e9edd1923b85a1f66133 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 22 May 2022 18:37:07 -0400 Subject: [PATCH 206/340] Simple dateTime integration --- .../src/components/SquiggleChart.tsx | 12 ++++ packages/squiggle-lang/src/js/index.ts | 4 ++ .../squiggle-lang/src/js/rescript_interop.ts | 16 ++++- .../ReducerInterface_DateTime.res | 62 +++++++++++++++++++ .../ReducerInterface_ExpressionValue.res | 12 ++++ .../ReducerInterface_ExternalLibrary.res | 8 ++- .../squiggle-lang/src/rescript/Utility/E.res | 43 +++++++++++++ 7 files changed, 153 insertions(+), 4 deletions(-) create mode 100644 packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index ce562368..5214dafc 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -189,6 +189,18 @@ const SquiggleItem: React.FC = ({ {expression.value.map((r) => `"${r}"`).join(", ")} ); + case "date": + return ( + + {expression.value.toString()} + + ); + case "timeDuration": + return ( + + + + ); case "lambda": return ( | tagged<"distribution", Distribution> | tagged<"number", number> - | tagged<"record", { [key: string]: squiggleExpression }>; + | tagged<"date", Date> + | tagged<"timeDuration", number> + | tagged<"record", { [key: string]: squiggleExpression }> export { lambdaValue }; @@ -127,6 +137,10 @@ export function convertRawToTypescript( return tag("string", result._0); case 9: // EvSymbol return tag("symbol", result._0); + case 10: // EvDate + return tag("date", result._0); + case 11: // EvTimeDuration + return tag("number", result._0); } } diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res new file mode 100644 index 00000000..3f94f3f4 --- /dev/null +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res @@ -0,0 +1,62 @@ +module ExpressionValue = ReducerInterface_ExpressionValue +type expressionValue = ExpressionValue.expressionValue + +let dateDispatch = (call: ExpressionValue.functionCall, env: DistributionOperation.env): option< + result, +> => { + switch call { + | ("toString", [EvDate(t)]) => EvString(E.Date.toString(t))->Ok->Some + | ("makeDateFromYear", [EvNumber(year)]) => + EvDate(E.Date.makeWithYM(~year, ~month=0.0, ()))->Ok->Some + | ("fromMilliseconds", [EvNumber(f)]) => EvDate(E.Date.fromFloat(f))->Ok->Some + | ("toMilliseconds", [EvDate(f)]) => EvNumber(E.Date.toFloat(f))->Ok->Some + | ("subtract", [EvDate(d1), EvDate(d2)]) => + switch E.Date.subtract(d1, d2) { + | Ok(d) => EvTimeDuration(d)->Ok + | Error(e) => Error(RETodo(e)) + }->Some + | ("subtract", [EvDate(d1), EvTimeDuration(d2)]) => + EvDate(E.Date.subtractDuration(d1, d2))->Ok->Some + | ("add", [EvDate(d1), EvTimeDuration(d2)]) => EvDate(E.Date.addDuration(d1, d2))->Ok->Some + | _ => None + } +} + +let durationDispatch = (call: ExpressionValue.functionCall, env: DistributionOperation.env): option< + result, +> => { + switch call { + | ("toString", [EvTimeDuration(t)]) => EvString(E.Duration.toString(t))->Ok->Some + | ("hours", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromHours(f))->Ok->Some + | ("years", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromYears(f))->Ok->Some + | ("toHours", [EvTimeDuration(f)]) => EvNumber(E.Duration.toHours(f))->Ok->Some + | ("toYears", [EvTimeDuration(f)]) => EvNumber(E.Duration.toYears(f))->Ok->Some + | ( + ("add" | "subtract" | "multiply" | "divide") as op, + [EvTimeDuration(d1), EvTimeDuration(d2)], + ) => { + let op = switch op { + | "subtract" => E.Duration.subtract + | "multiply" => E.Duration.multiply + | "divide" => E.Duration.divide + | "add" + | _ => E.Duration.add + } + EvTimeDuration(op(d1, d2))->Ok->Some + } + | _ => None + } +} + +let dispatch = (call: ExpressionValue.functionCall, env: DistributionOperation.env): option< + result, +> => { + switch dateDispatch(call, env) { + | Some(r) => Some(r) + | None => + switch durationDispatch(call, env) { + | Some(r) => Some(r) + | None => None + } + } +} diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res index 7b896509..6da34db1 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res @@ -20,6 +20,8 @@ type rec expressionValue = | EvRecord(record) | EvString(string) | EvSymbol(string) + | EvDate(Js.Date.t) + | EvTimeDuration(float) and record = Js.Dict.t and externalBindings = record and lambdaValue = { @@ -51,6 +53,8 @@ let rec toString = aValue => | EvSymbol(aString) => `:${aString}` | EvRecord(aRecord) => aRecord->toStringRecord | EvDistribution(dist) => GenericDist.toString(dist) + | EvDate(date) => E.Date.toString(date) + | EvTimeDuration(t) => E.Duration.toString(t) } and toStringRecord = aRecord => { let pairs = @@ -73,6 +77,8 @@ let toStringWithType = aValue => | EvRecord(_) => `Record::${toString(aValue)}` | EvString(_) => `String::${toString(aValue)}` | EvSymbol(_) => `Symbol::${toString(aValue)}` + | EvDate(_) => `Date::${toString(aValue)}` + | EvTimeDuration(_) => `Date::${toString(aValue)}` } let argsToString = (args: array): string => { @@ -116,6 +122,8 @@ type expressionValueType = | EvtRecord | EvtString | EvtSymbol + | EvtDate + | EvtTimeDuration type functionCallSignature = CallSignature(string, array) type functionDefinitionSignature = @@ -133,6 +141,8 @@ let valueToValueType = value => | EvRecord(_) => EvtRecord | EvString(_) => EvtArray | EvSymbol(_) => EvtSymbol + | EvDate(_) => EvtDate + | EvTimeDuration(_) => EvtTimeDuration } let functionCallToCallSignature = (functionCall: functionCall): functionCallSignature => { @@ -152,6 +162,8 @@ let valueTypeToString = (valueType: expressionValueType): string => | EvtRecord => `Record` | EvtString => `String` | EvtSymbol => `Symbol` + | EvtDate => `Date` + | EvtTimeDuration => `Duration` } let functionCallSignatureToString = (functionCallSignature: functionCallSignature): string => { diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExternalLibrary.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExternalLibrary.res index 0bdb0748..7e9448f0 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExternalLibrary.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExternalLibrary.res @@ -18,9 +18,11 @@ let dispatch = (call: ExpressionValue.functionCall, environment, chain): result< expressionValue, 'e, > => - ReducerInterface_GenericDistribution.dispatch(call, environment) |> E.O.default( - chain(call, environment), - ) + switch ReducerInterface_GenericDistribution.dispatch(call, environment) { + | Some(r) => r + | None => + ReducerInterface_DateTime.dispatch(call, environment) |> E.O.default(chain(call, environment)) + } /* If your dispatch is too big you can divide it into smaller dispatches and pass the call so that it gets called finally. diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index b08754ef..d2ad62f4 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -833,3 +833,46 @@ module JsArray = { |> Js.Array.map(O.toExn("Warning: This should not have happened")) let filter = Js.Array.filter } + +module Duration = { + //Stores in Unix milliseconds + type t = float + let minute = Belt.Float.fromInt(60 * 1000) + let hour = Belt.Float.fromInt(60 * 60 * 1000) + let day = Belt.Float.fromInt(24 * 60 * 60 * 1000) + let year = Belt.Float.fromInt(24 * 60 * 60 * 1000 * 365) + let fromFloat = (f: float): t => f + let toFloat = (d: t): float => d + let fromHours = (h: float): t => h *. hour + let fromDays = (d: float): t => d *. day + let fromYears = (y: float): t => y *. year + let toHours = (t: t): float => t /. hour + let toDays = (t: t): float => t /. day + let toYears = (t: t): float => t /. year + let toString = (t: t) => `${Float.with2DigitsPrecision(t)}ms` + let add = (t1, t2): t => t1 +. t2 + let subtract = (t1, t2): t => t1 -. t2 + let multiply = (t1, t2): t => t1 *. t2 + let divide = (t1, t2): t => t1 /. t2 +} + +module Date = { + type t = Js.Date.t + type year + let makeWithYM = Js.Date.makeWithYM + let toString = Js.Date.toString + let fromFloat = Js.Date.fromFloat + let toFloat = Js.Date.getTime + let fmap = (t: t, fn: float => float) => t->toFloat->fn->fromFloat + let subtract = (t1: t, t2: t) => { + let (f1, f2) = (toFloat(t1), toFloat(t2)) + let diff = f1 -. f2 + if diff < 0.0 { + Error("Cannot subtract a date by one that is in its future") + } else { + Ok(Duration.fromFloat(diff)) + } + } + let addDuration = (t: t, duration: Duration.t) => fmap(t, t => t +. duration) + let subtractDuration = (t: t, duration: Duration.t) => fmap(t, t => t -. duration) +} From f1d2a1a12f0343759ad4714213959fc9dba5a428 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 22 May 2022 21:40:06 -0400 Subject: [PATCH 207/340] Added better Duration toString and Date makeWithYear functionality --- .../src/components/SquiggleChart.tsx | 5 +-- .../ReducerInterface_DateTime.res | 9 +++-- .../squiggle-lang/src/rescript/Utility/E.res | 36 +++++++++++++++---- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 5214dafc..fe79a018 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -192,15 +192,16 @@ const SquiggleItem: React.FC = ({ case "date": return ( - {expression.value.toString()} + {expression.value.toDateString()} ); - case "timeDuration": + case "timeDuration":{ return ( ); + } case "lambda": return ( EvString(E.Date.toString(t))->Ok->Some | ("makeDateFromYear", [EvNumber(year)]) => - EvDate(E.Date.makeWithYM(~year, ~month=0.0, ()))->Ok->Some + switch E.Date.makeWithYear(Belt.Float.toInt(year)) { + | Ok(t) => EvDate(t)->Ok->Some + | Error(e) => RETodo(e)->Error->Some + } | ("fromMilliseconds", [EvNumber(f)]) => EvDate(E.Date.fromFloat(f))->Ok->Some | ("toMilliseconds", [EvDate(f)]) => EvNumber(E.Date.toFloat(f))->Ok->Some | ("subtract", [EvDate(d1), EvDate(d2)]) => @@ -22,14 +25,16 @@ let dateDispatch = (call: ExpressionValue.functionCall, env: DistributionOperati } } -let durationDispatch = (call: ExpressionValue.functionCall, env: DistributionOperation.env): option< +let durationDispatch = (call: ExpressionValue.functionCall, _: DistributionOperation.env): option< result, > => { switch call { | ("toString", [EvTimeDuration(t)]) => EvString(E.Duration.toString(t))->Ok->Some | ("hours", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromHours(f))->Ok->Some + | ("days", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromDays(f))->Ok->Some | ("years", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromYears(f))->Ok->Some | ("toHours", [EvTimeDuration(f)]) => EvNumber(E.Duration.toHours(f))->Ok->Some + | ("toDays", [EvTimeDuration(f)]) => EvNumber(E.Duration.toDays(f))->Ok->Some | ("toYears", [EvTimeDuration(f)]) => EvNumber(E.Duration.toYears(f))->Ok->Some | ( ("add" | "subtract" | "multiply" | "divide") as op, diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index d2ad62f4..088867c9 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -840,7 +840,7 @@ module Duration = { let minute = Belt.Float.fromInt(60 * 1000) let hour = Belt.Float.fromInt(60 * 60 * 1000) let day = Belt.Float.fromInt(24 * 60 * 60 * 1000) - let year = Belt.Float.fromInt(24 * 60 * 60 * 1000 * 365) + let year = Belt.Float.fromInt(24 * 60 * 60 * 1000) *. 365.25 let fromFloat = (f: float): t => f let toFloat = (d: t): float => d let fromHours = (h: float): t => h *. hour @@ -849,7 +849,19 @@ module Duration = { let toHours = (t: t): float => t /. hour let toDays = (t: t): float => t /. day let toYears = (t: t): float => t /. year - let toString = (t: t) => `${Float.with2DigitsPrecision(t)}ms` + let toString = (t: t): string => { + if t >= year { + Float.with3DigitsPrecision(t /. year) ++ " years" + } else if t >= day { + Float.with3DigitsPrecision(t /. day) ++ " days" + } else if t >= hour { + Float.with3DigitsPrecision(t /. hour) ++ " hours" + } else if t >= minute { + Float.with3DigitsPrecision(t /. minute) ++ " minutes" + } else { + Float.toFixed(t) ++ "ms" + } + } let add = (t1, t2): t => t1 +. t2 let subtract = (t1, t2): t => t1 -. t2 let multiply = (t1, t2): t => t1 *. t2 @@ -857,12 +869,24 @@ module Duration = { } module Date = { + //The Rescript/JS implementation of Date is pretty mediocre. It would be good to improve upon later. type t = Js.Date.t - type year - let makeWithYM = Js.Date.makeWithYM - let toString = Js.Date.toString - let fromFloat = Js.Date.fromFloat let toFloat = Js.Date.getTime + let getFullYear = Js.Date.getFullYear + + //The Js.Date.makeWithYM function accepts a float, but only treats it as a whole number. + //Our version takes an integer to make this distinction clearer. + let makeWithYear = (y: int): result => { + if y < 100 { + Error("Year must be over 100") + } else if y > 200000 { + Error("Year must be less than 200000") + } else { + Ok(Js.Date.makeWithYM(~year=Belt.Float.fromInt(y), ~month=0.0, ())) + } + } + let toString = Js.Date.toDateString + let fromFloat = Js.Date.fromFloat let fmap = (t: t, fn: float => float) => t->toFloat->fn->fromFloat let subtract = (t1: t, t2: t) => { let (f1, f2) = (toFloat(t1), toFloat(t2)) From fff2f5da599cc1ab85006cc729cf0f68c8373103 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 22 May 2022 21:57:13 -0400 Subject: [PATCH 208/340] More sophisticated makeFromYear function, that accepts floats --- .../ReducerInterface_DateTime.res | 2 +- .../squiggle-lang/src/rescript/Utility/E.res | 30 +++++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res index 4f474312..97d35c49 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res @@ -7,7 +7,7 @@ let dateDispatch = (call: ExpressionValue.functionCall, env: DistributionOperati switch call { | ("toString", [EvDate(t)]) => EvString(E.Date.toString(t))->Ok->Some | ("makeDateFromYear", [EvNumber(year)]) => - switch E.Date.makeWithYear(Belt.Float.toInt(year)) { + switch E.Date.makeFromYear(year) { | Ok(t) => EvDate(t)->Ok->Some | Error(e) => RETodo(e)->Error->Some } diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 088867c9..38967979 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -873,18 +873,6 @@ module Date = { type t = Js.Date.t let toFloat = Js.Date.getTime let getFullYear = Js.Date.getFullYear - - //The Js.Date.makeWithYM function accepts a float, but only treats it as a whole number. - //Our version takes an integer to make this distinction clearer. - let makeWithYear = (y: int): result => { - if y < 100 { - Error("Year must be over 100") - } else if y > 200000 { - Error("Year must be less than 200000") - } else { - Ok(Js.Date.makeWithYM(~year=Belt.Float.fromInt(y), ~month=0.0, ())) - } - } let toString = Js.Date.toDateString let fromFloat = Js.Date.fromFloat let fmap = (t: t, fn: float => float) => t->toFloat->fn->fromFloat @@ -899,4 +887,22 @@ module Date = { } let addDuration = (t: t, duration: Duration.t) => fmap(t, t => t +. duration) let subtractDuration = (t: t, duration: Duration.t) => fmap(t, t => t -. duration) + //The Js.Date.makeWithYM function accepts a float, but only treats it as a whole number. + //Our version takes an integer to make this distinction clearer. + let makeWithYearInt = (y: int): result => { + if y < 100 { + Error("Year must be over 100") + } else if y > 200000 { + Error("Year must be less than 200000") + } else { + Ok(Js.Date.makeWithYM(~year=Belt.Float.fromInt(y), ~month=0.0, ())) + } + } + let makeFromYear = (year: float): result => { + let floor = year -> Js.Math.floor_float + makeWithYearInt(Belt.Float.toInt(floor))->R2.fmap(earlyDate => { + let diff = year -. floor + earlyDate->addDuration(diff *. Duration.year) + }) + } } From 6af2e242f809f145f4647c39f7a0c88180186a1c Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 22 May 2022 22:11:28 -0400 Subject: [PATCH 209/340] Simple better format for Duration toString --- .../src/components/SquiggleChart.tsx | 2 +- .../squiggle-lang/src/rescript/Utility/E.res | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index fe79a018..50fcebb3 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -195,7 +195,7 @@ const SquiggleItem: React.FC = ({ {expression.value.toDateString()} ); - case "timeDuration":{ + case "timeDuration": { return ( diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 38967979..6a66e497 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -849,23 +849,27 @@ module Duration = { let toHours = (t: t): float => t /. hour let toDays = (t: t): float => t /. day let toYears = (t: t): float => t /. year + let toString = (t: t): string => { + let shouldPluralize = f => f != 1.0 + let display = (f: float, s: string) => + `${Float.with3DigitsPrecision(f)} ${s}${shouldPluralize(f) ? "s" : ""}` if t >= year { - Float.with3DigitsPrecision(t /. year) ++ " years" + display(t /. year, "year") } else if t >= day { - Float.with3DigitsPrecision(t /. day) ++ " days" + display(t /. day, "day") } else if t >= hour { - Float.with3DigitsPrecision(t /. hour) ++ " hours" + display(t /. hour, "hour") } else if t >= minute { - Float.with3DigitsPrecision(t /. minute) ++ " minutes" + display(t /. minute, "minute") } else { Float.toFixed(t) ++ "ms" } } - let add = (t1, t2): t => t1 +. t2 - let subtract = (t1, t2): t => t1 -. t2 - let multiply = (t1, t2): t => t1 *. t2 - let divide = (t1, t2): t => t1 /. t2 + let add = (t1: t, t2: t): t => t1 +. t2 + let subtract = (t1: t, t2: t): t => t1 -. t2 + let multiply = (t1: t, t2: t): t => t1 *. t2 + let divide = (t1: t, t2: t): t => t1 /. t2 } module Date = { @@ -899,7 +903,7 @@ module Date = { } } let makeFromYear = (year: float): result => { - let floor = year -> Js.Math.floor_float + let floor = year->Js.Math.floor_float makeWithYearInt(Belt.Float.toInt(floor))->R2.fmap(earlyDate => { let diff = year -. floor earlyDate->addDuration(diff *. Duration.year) From 70574329fcf69de56f81ea8ba4e8192c2e1992b6 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Sun, 22 May 2022 22:40:10 -0400 Subject: [PATCH 210/340] Cleaned up arithmetic operations of time durations --- .../ReducerInterface_DateTime.res | 27 +++++++++---------- .../squiggle-lang/src/rescript/Utility/E.res | 15 ++++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res index 97d35c49..a0059392 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res @@ -11,8 +11,8 @@ let dateDispatch = (call: ExpressionValue.functionCall, env: DistributionOperati | Ok(t) => EvDate(t)->Ok->Some | Error(e) => RETodo(e)->Error->Some } - | ("fromMilliseconds", [EvNumber(f)]) => EvDate(E.Date.fromFloat(f))->Ok->Some - | ("toMilliseconds", [EvDate(f)]) => EvNumber(E.Date.toFloat(f))->Ok->Some + | ("dateFromNumber", [EvNumber(f)]) => EvDate(E.Date.fromFloat(f))->Ok->Some + | ("toNumber", [EvDate(f)]) => EvNumber(E.Date.toFloat(f))->Ok->Some | ("subtract", [EvDate(d1), EvDate(d2)]) => switch E.Date.subtract(d1, d2) { | Ok(d) => EvTimeDuration(d)->Ok @@ -31,24 +31,21 @@ let durationDispatch = (call: ExpressionValue.functionCall, _: DistributionOpera switch call { | ("toString", [EvTimeDuration(t)]) => EvString(E.Duration.toString(t))->Ok->Some | ("hours", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromHours(f))->Ok->Some + | ("minutes", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromMinutes(f))->Ok->Some | ("days", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromDays(f))->Ok->Some | ("years", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromYears(f))->Ok->Some | ("toHours", [EvTimeDuration(f)]) => EvNumber(E.Duration.toHours(f))->Ok->Some + | ("toMinutes", [EvTimeDuration(f)]) => EvNumber(E.Duration.toMinutes(f))->Ok->Some | ("toDays", [EvTimeDuration(f)]) => EvNumber(E.Duration.toDays(f))->Ok->Some | ("toYears", [EvTimeDuration(f)]) => EvNumber(E.Duration.toYears(f))->Ok->Some - | ( - ("add" | "subtract" | "multiply" | "divide") as op, - [EvTimeDuration(d1), EvTimeDuration(d2)], - ) => { - let op = switch op { - | "subtract" => E.Duration.subtract - | "multiply" => E.Duration.multiply - | "divide" => E.Duration.divide - | "add" - | _ => E.Duration.add - } - EvTimeDuration(op(d1, d2))->Ok->Some - } + | ("add", [EvTimeDuration(d1), EvTimeDuration(d2)]) => + EvTimeDuration(E.Duration.add(d1, d2))->Ok->Some + | ("subtract", [EvTimeDuration(d1), EvTimeDuration(d2)]) => + EvTimeDuration(E.Duration.subtract(d1, d2))->Ok->Some + | ("multiply", [EvTimeDuration(d1), EvNumber(d2)]) => + EvTimeDuration(E.Duration.multiply(d1, d2))->Ok->Some + | ("divide", [EvTimeDuration(d1), EvNumber(d2)]) => + EvTimeDuration(E.Duration.divide(d1, d2))->Ok->Some | _ => None } } diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 6a66e497..46787134 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -843,9 +843,11 @@ module Duration = { let year = Belt.Float.fromInt(24 * 60 * 60 * 1000) *. 365.25 let fromFloat = (f: float): t => f let toFloat = (d: t): float => d + let fromMinutes = (h: float): t => h *. minute let fromHours = (h: float): t => h *. hour let fromDays = (d: float): t => d *. day let fromYears = (y: float): t => y *. year + let toMinutes = (t: t): float => t /. minute let toHours = (t: t): float => t /. hour let toDays = (t: t): float => t /. day let toYears = (t: t): float => t /. year @@ -854,13 +856,14 @@ module Duration = { let shouldPluralize = f => f != 1.0 let display = (f: float, s: string) => `${Float.with3DigitsPrecision(f)} ${s}${shouldPluralize(f) ? "s" : ""}` - if t >= year { + let abs = Js.Math.abs_float(t) + if abs >= year { display(t /. year, "year") - } else if t >= day { + } else if abs >= day { display(t /. day, "day") - } else if t >= hour { + } else if abs >= hour { display(t /. hour, "hour") - } else if t >= minute { + } else if abs >= minute { display(t /. minute, "minute") } else { Float.toFixed(t) ++ "ms" @@ -868,8 +871,8 @@ module Duration = { } let add = (t1: t, t2: t): t => t1 +. t2 let subtract = (t1: t, t2: t): t => t1 -. t2 - let multiply = (t1: t, t2: t): t => t1 *. t2 - let divide = (t1: t, t2: t): t => t1 /. t2 + let multiply = (t1: t, t2: float): t => t1 *. t2 + let divide = (t1: t, t2: float): t => t1 /. t2 } module Date = { From 4628140069b5f1a8272e14208b12822edc6718c2 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Mon, 23 May 2022 08:13:51 +0200 Subject: [PATCH 211/340] numbers with units (tested) --- .../Reducer_Peggy_Parse_test.res | 7 + .../Reducer_Peggy_ToExpression_test.res | 4 + .../Reducer_Dispatch_BuiltIn.res | 18 ++ .../rescript/Reducer/Reducer_ErrorValue.res | 6 +- .../Reducer_Peggy_GeneratedParser.js | 223 +++++++++++------- .../Reducer_Peggy_GeneratedParser.peggy | 13 +- 6 files changed, 176 insertions(+), 95 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 168be4d8..3f1baf12 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -251,6 +251,13 @@ describe("Peggy parse", () => { "{(::map (::$_constructArray_$ (1 2 3)) {|:x| {(::add :x 1)}})}", ) }) + describe("unit", () => { + testParse("1m", "{(::multiply 1 (::$valueOfUnit 'm'))}") + testParse( + "1m+2cm", + "{(::add (::multiply 1 (::$valueOfUnit 'm')) (::multiply 2 (::$valueOfUnit 'cm')))}", + ) + }) }) describe("parsing new line", () => { diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res index 81bafd97..fa6c58f9 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res @@ -217,4 +217,8 @@ describe("Peggy to Expression", () => { (), ) }) + + describe("unit", () => { + testToExpression("1m", "(:$$_block_$$ (:multiply 1 (:$valueOfUnit 'm')))", ~v="1", ()) + }) }) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res index 141b4a37..1ab8d559 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res @@ -129,6 +129,23 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce ) } + let doValueOfUnit = (aUnit: string) => + switch aUnit { + | "nm" => 0.000000001->EvNumber->Ok + | "um" => 0.000001->EvNumber->Ok + | "mm" => 0.001->EvNumber->Ok + | "cm" => 0.01->EvNumber->Ok + | "dm" => 0.1->EvNumber->Ok + | "m" => 1.->EvNumber->Ok + | "dam" => 10.->EvNumber->Ok + | "hm" => 100.->EvNumber->Ok + | "km" => 1000.->EvNumber->Ok + | "Mm" => 1000000.->EvNumber->Ok + | "Gm" => 1000000000.->EvNumber->Ok + | "Tm" => 1000000000000.->EvNumber->Ok + | _ => REUnitNotFound(aUnit)->Error + } + switch call { | ("$_atIndex_$", [EvArray(aValueArray), EvNumber(fIndex)]) => arrayAtIndex(aValueArray, fIndex) | ("$_atIndex_$", [EvRecord(dict), EvString(sIndex)]) => recordAtIndex(dict, sIndex) @@ -137,6 +154,7 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce | ("$_exportBindings_$", [EvRecord(externalBindings)]) => doExportBindings(externalBindings) | ("$_setBindings_$", [EvRecord(externalBindings), EvSymbol(symbol), value]) => doSetBindings(externalBindings, symbol, value) + | ("$valueOfUnit", [EvString(aUnit)]) => doValueOfUnit(aUnit) | ("inspect", [value, EvString(label)]) => inspectLabel(value, label) | ("inspect", [value]) => inspect(value) | ("keep", [EvArray(aValueArray), EvLambda(aLambdaValue)]) => diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res index fc2f86f1..721fbc40 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_ErrorValue.res @@ -4,18 +4,19 @@ type errorValue = | REArrayIndexNotFound(string, int) | REAssignmentExpected | REDistributionError(DistributionTypes.error) - | REOperationError(Operation.operationError) + | REExpectedType(string) | REExpressionExpected | REFunctionExpected(string) | REFunctionNotFound(string) | REJavaScriptExn(option, option) // Javascript Exception | REMacroNotFound(string) | RENotAFunction(string) + | REOperationError(Operation.operationError) | RERecordPropertyNotFound(string, string) | RESymbolNotFound(string) | RESyntaxError(string) | RETodo(string) // To do - | REExpectedType(string) + | REUnitNotFound(string) type t = errorValue @@ -52,4 +53,5 @@ let errorToString = err => | RESyntaxError(desc) => `Syntax Error: ${desc}` | RETodo(msg) => `TODO: ${msg}` | REExpectedType(typeName) => `Expected type: ${typeName}` + | REUnitNotFound(unitName) => `Unit not found: ${unitName}` } diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index 3a34dfb2..4c1532dd 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -538,32 +538,42 @@ function peg$parse(input, options) { var peg$f27 = function (characters) { return nodeString(characters.join("")); }; - var peg$f28 = function () { - return nodeInteger(parseInt(text())); + var peg$f28 = function (number, unit) { + if (unit === null) { + return number; + } else { + return makeFunctionCall("multiply", [ + number, + makeFunctionCall("$valueOfUnit", [nodeString(unit.value)]), + ]); + } }; var peg$f29 = function () { - return nodeFloat(parseFloat(text())); + return nodeInteger(parseInt(text())); }; var peg$f30 = function () { + return nodeFloat(parseFloat(text())); + }; + var peg$f31 = function () { return nodeBoolean(text() === "true"); }; - var peg$f31 = function (args, statements, finalExpression) { + var peg$f32 = function (args, statements, finalExpression) { statements.push(finalExpression); return nodeLambda(args, nodeBlock(statements)); }; - var peg$f32 = function (args, finalExpression) { + var peg$f33 = function (args, finalExpression) { return nodeLambda(args, nodeBlock([finalExpression])); }; - var peg$f33 = function () { + var peg$f34 = function () { return makeFunctionCall("$_constructArray_$", [nodeExpression([])]); }; - var peg$f34 = function (args) { + var peg$f35 = function (args) { return makeFunctionCall("$_constructArray_$", [nodeExpression(args)]); }; - var peg$f35 = function (args) { + var peg$f36 = function (args) { return makeFunctionCall("$_constructRecord_$", [nodeExpression(args)]); }; - var peg$f36 = function (key, value) { + var peg$f37 = function (key, value) { return nodeKeyValue(key, value); }; @@ -738,7 +748,7 @@ function peg$parse(input, options) { function peg$parsestart() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 0; + var key = peg$currPos * 68 + 0; var cached = peg$resultsCache[key]; if (cached) { @@ -771,7 +781,7 @@ function peg$parse(input, options) { function peg$parsezeroOMoreArgumentsBlockOrExpression() { var s0; - var key = peg$currPos * 67 + 1; + var key = peg$currPos * 68 + 1; var cached = peg$resultsCache[key]; if (cached) { @@ -793,7 +803,7 @@ function peg$parse(input, options) { function peg$parseouterBlock() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 2; + var key = peg$currPos * 68 + 2; var cached = peg$resultsCache[key]; if (cached) { @@ -846,7 +856,7 @@ function peg$parse(input, options) { function peg$parseinnerBlockOrExpression() { var s0, s1; - var key = peg$currPos * 67 + 3; + var key = peg$currPos * 68 + 3; var cached = peg$resultsCache[key]; if (cached) { @@ -874,7 +884,7 @@ function peg$parse(input, options) { function peg$parsequotedInnerBlock() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 67 + 4; + var key = peg$currPos * 68 + 4; var cached = peg$resultsCache[key]; if (cached) { @@ -991,7 +1001,7 @@ function peg$parse(input, options) { function peg$parsearray_statements() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 5; + var key = peg$currPos * 68 + 5; var cached = peg$resultsCache[key]; if (cached) { @@ -1046,7 +1056,7 @@ function peg$parse(input, options) { function peg$parsestatement() { var s0; - var key = peg$currPos * 67 + 6; + var key = peg$currPos * 68 + 6; var cached = peg$resultsCache[key]; if (cached) { @@ -1068,7 +1078,7 @@ function peg$parse(input, options) { function peg$parseletStatement() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 7; + var key = peg$currPos * 68 + 7; var cached = peg$resultsCache[key]; if (cached) { @@ -1109,7 +1119,7 @@ function peg$parse(input, options) { function peg$parsedefunStatement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 67 + 8; + var key = peg$currPos * 68 + 8; var cached = peg$resultsCache[key]; if (cached) { @@ -1186,7 +1196,7 @@ function peg$parse(input, options) { function peg$parseassignmentOp() { var s0, s1; - var key = peg$currPos * 67 + 9; + var key = peg$currPos * 68 + 9; var cached = peg$resultsCache[key]; if (cached) { @@ -1221,7 +1231,7 @@ function peg$parse(input, options) { function peg$parsearray_parameters() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 10; + var key = peg$currPos * 68 + 10; var cached = peg$resultsCache[key]; if (cached) { @@ -1300,7 +1310,7 @@ function peg$parse(input, options) { function peg$parseexpression() { var s0; - var key = peg$currPos * 67 + 11; + var key = peg$currPos * 68 + 11; var cached = peg$resultsCache[key]; if (cached) { @@ -1325,7 +1335,7 @@ function peg$parse(input, options) { function peg$parseifthenelse() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11; - var key = peg$currPos * 67 + 12; + var key = peg$currPos * 68 + 12; var cached = peg$resultsCache[key]; if (cached) { @@ -1439,7 +1449,7 @@ function peg$parse(input, options) { function peg$parseternary() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 67 + 13; + var key = peg$currPos * 68 + 13; var cached = peg$resultsCache[key]; if (cached) { @@ -1513,7 +1523,7 @@ function peg$parse(input, options) { function peg$parselogicalAdditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 14; + var key = peg$currPos * 68 + 14; var cached = peg$resultsCache[key]; if (cached) { @@ -1578,7 +1588,7 @@ function peg$parse(input, options) { function peg$parselogicalAdditiveOp() { var s0, s1; - var key = peg$currPos * 67 + 15; + var key = peg$currPos * 68 + 15; var cached = peg$resultsCache[key]; if (cached) { @@ -1613,7 +1623,7 @@ function peg$parse(input, options) { function peg$parselogicalMultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 16; + var key = peg$currPos * 68 + 16; var cached = peg$resultsCache[key]; if (cached) { @@ -1678,7 +1688,7 @@ function peg$parse(input, options) { function peg$parselogicalMultiplicativeOp() { var s0, s1; - var key = peg$currPos * 67 + 17; + var key = peg$currPos * 68 + 17; var cached = peg$resultsCache[key]; if (cached) { @@ -1713,7 +1723,7 @@ function peg$parse(input, options) { function peg$parseequality() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 18; + var key = peg$currPos * 68 + 18; var cached = peg$resultsCache[key]; if (cached) { @@ -1757,7 +1767,7 @@ function peg$parse(input, options) { function peg$parseequalityOp() { var s0, s1; - var key = peg$currPos * 67 + 19; + var key = peg$currPos * 68 + 19; var cached = peg$resultsCache[key]; if (cached) { @@ -1803,7 +1813,7 @@ function peg$parse(input, options) { function peg$parserelational() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 20; + var key = peg$currPos * 68 + 20; var cached = peg$resultsCache[key]; if (cached) { @@ -1847,7 +1857,7 @@ function peg$parse(input, options) { function peg$parserelationalOp() { var s0, s1; - var key = peg$currPos * 67 + 21; + var key = peg$currPos * 68 + 21; var cached = peg$resultsCache[key]; if (cached) { @@ -1915,7 +1925,7 @@ function peg$parse(input, options) { function peg$parseadditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 22; + var key = peg$currPos * 68 + 22; var cached = peg$resultsCache[key]; if (cached) { @@ -1980,7 +1990,7 @@ function peg$parse(input, options) { function peg$parseadditiveOp() { var s0, s1; - var key = peg$currPos * 67 + 23; + var key = peg$currPos * 68 + 23; var cached = peg$resultsCache[key]; if (cached) { @@ -2048,7 +2058,7 @@ function peg$parse(input, options) { function peg$parsemultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 24; + var key = peg$currPos * 68 + 24; var cached = peg$resultsCache[key]; if (cached) { @@ -2113,7 +2123,7 @@ function peg$parse(input, options) { function peg$parsemultiplicativeOp() { var s0, s1; - var key = peg$currPos * 67 + 25; + var key = peg$currPos * 68 + 25; var cached = peg$resultsCache[key]; if (cached) { @@ -2181,7 +2191,7 @@ function peg$parse(input, options) { function peg$parsepower() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 26; + var key = peg$currPos * 68 + 26; var cached = peg$resultsCache[key]; if (cached) { @@ -2246,7 +2256,7 @@ function peg$parse(input, options) { function peg$parsepowerOp() { var s0, s1; - var key = peg$currPos * 67 + 27; + var key = peg$currPos * 68 + 27; var cached = peg$resultsCache[key]; if (cached) { @@ -2292,7 +2302,7 @@ function peg$parse(input, options) { function peg$parsecredibleInterval() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 28; + var key = peg$currPos * 68 + 28; var cached = peg$resultsCache[key]; if (cached) { @@ -2377,7 +2387,7 @@ function peg$parse(input, options) { function peg$parsecredibleIntervalOp() { var s0, s1; - var key = peg$currPos * 67 + 29; + var key = peg$currPos * 68 + 29; var cached = peg$resultsCache[key]; if (cached) { @@ -2412,7 +2422,7 @@ function peg$parse(input, options) { function peg$parsechainFunctionCall() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 30; + var key = peg$currPos * 68 + 30; var cached = peg$resultsCache[key]; if (cached) { @@ -2515,7 +2525,7 @@ function peg$parse(input, options) { function peg$parsechainedFunction() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 67 + 31; + var key = peg$currPos * 68 + 31; var cached = peg$resultsCache[key]; if (cached) { @@ -2627,7 +2637,7 @@ function peg$parse(input, options) { function peg$parseunary() { var s0, s1, s2, s3; - var key = peg$currPos * 67 + 32; + var key = peg$currPos * 68 + 32; var cached = peg$resultsCache[key]; if (cached) { @@ -2667,7 +2677,7 @@ function peg$parse(input, options) { function peg$parseunaryOperator() { var s0, s1; - var key = peg$currPos * 67 + 33; + var key = peg$currPos * 68 + 33; var cached = peg$resultsCache[key]; if (cached) { @@ -2724,7 +2734,7 @@ function peg$parse(input, options) { function peg$parseindexedValue() { var s0; - var key = peg$currPos * 67 + 34; + var key = peg$currPos * 68 + 34; var cached = peg$resultsCache[key]; if (cached) { @@ -2749,7 +2759,7 @@ function peg$parse(input, options) { function peg$parsecollectionElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 67 + 35; + var key = peg$currPos * 68 + 35; var cached = peg$resultsCache[key]; if (cached) { @@ -3051,7 +3061,7 @@ function peg$parse(input, options) { function peg$parsearray_functionArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 36; + var key = peg$currPos * 68 + 36; var cached = peg$resultsCache[key]; if (cached) { @@ -3130,7 +3140,7 @@ function peg$parse(input, options) { function peg$parserecordElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 67 + 37; + var key = peg$currPos * 68 + 37; var cached = peg$resultsCache[key]; if (cached) { @@ -3246,7 +3256,7 @@ function peg$parse(input, options) { function peg$parseatom() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 38; + var key = peg$currPos * 68 + 38; var cached = peg$resultsCache[key]; if (cached) { @@ -3306,7 +3316,7 @@ function peg$parse(input, options) { function peg$parsebasicValue() { var s0; - var key = peg$currPos * 67 + 39; + var key = peg$currPos * 68 + 39; var cached = peg$resultsCache[key]; if (cached) { @@ -3328,7 +3338,7 @@ function peg$parse(input, options) { function peg$parsebasicLiteral() { var s0; - var key = peg$currPos * 67 + 40; + var key = peg$currPos * 68 + 40; var cached = peg$resultsCache[key]; if (cached) { @@ -3339,14 +3349,11 @@ function peg$parse(input, options) { s0 = peg$parsestring(); if (s0 === peg$FAILED) { - s0 = peg$parsefloat(); + s0 = peg$parsenumber(); if (s0 === peg$FAILED) { - s0 = peg$parseinteger(); + s0 = peg$parseboolean(); if (s0 === peg$FAILED) { - s0 = peg$parseboolean(); - if (s0 === peg$FAILED) { - s0 = peg$parsedollarIdentifier(); - } + s0 = peg$parsedollarIdentifier(); } } } @@ -3359,7 +3366,7 @@ function peg$parse(input, options) { function peg$parseidentifier() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 41; + var key = peg$currPos * 68 + 41; var cached = peg$resultsCache[key]; if (cached) { @@ -3447,7 +3454,7 @@ function peg$parse(input, options) { function peg$parsedollarIdentifier() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 42; + var key = peg$currPos * 68 + 42; var cached = peg$resultsCache[key]; if (cached) { @@ -3535,7 +3542,7 @@ function peg$parse(input, options) { function peg$parsestring() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 43; + var key = peg$currPos * 68 + 43; var cached = peg$resultsCache[key]; if (cached) { @@ -3676,10 +3683,44 @@ function peg$parse(input, options) { return s0; } + function peg$parsenumber() { + var s0, s1, s2; + + var key = peg$currPos * 68 + 44; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parsefloat(); + if (s1 === peg$FAILED) { + s1 = peg$parseinteger(); + } + if (s1 !== peg$FAILED) { + s2 = peg$parseidentifier(); + if (s2 === peg$FAILED) { + s2 = null; + } + peg$savedPos = s0; + s0 = peg$f28(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parseinteger() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 44; + var key = peg$currPos * 68 + 45; var cached = peg$resultsCache[key]; if (cached) { @@ -3740,7 +3781,7 @@ function peg$parse(input, options) { } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f28(); + s0 = peg$f29(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3769,7 +3810,7 @@ function peg$parse(input, options) { function peg$parsefloat() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 45; + var key = peg$currPos * 68 + 46; var cached = peg$resultsCache[key]; if (cached) { @@ -3898,7 +3939,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f29(); + s1 = peg$f30(); } s0 = s1; peg$silentFails--; @@ -3917,7 +3958,7 @@ function peg$parse(input, options) { function peg$parsefloatExponent() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 46; + var key = peg$currPos * 68 + 47; var cached = peg$resultsCache[key]; if (cached) { @@ -3979,7 +4020,7 @@ function peg$parse(input, options) { function peg$parsed() { var s0; - var key = peg$currPos * 67 + 47; + var key = peg$currPos * 68 + 48; var cached = peg$resultsCache[key]; if (cached) { @@ -4006,7 +4047,7 @@ function peg$parse(input, options) { function peg$parseboolean() { var s0, s1; - var key = peg$currPos * 67 + 48; + var key = peg$currPos * 68 + 49; var cached = peg$resultsCache[key]; if (cached) { @@ -4039,7 +4080,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f30(); + s1 = peg$f31(); } s0 = s1; peg$silentFails--; @@ -4058,7 +4099,7 @@ function peg$parse(input, options) { function peg$parsevalueConstructor() { var s0; - var key = peg$currPos * 67 + 49; + var key = peg$currPos * 68 + 50; var cached = peg$resultsCache[key]; if (cached) { @@ -4086,7 +4127,7 @@ function peg$parse(input, options) { function peg$parselambda() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12; - var key = peg$currPos * 67 + 50; + var key = peg$currPos * 68 + 51; var cached = peg$resultsCache[key]; if (cached) { @@ -4161,7 +4202,7 @@ function peg$parse(input, options) { } if (s12 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f31(s5, s9, s10); + s0 = peg$f32(s5, s9, s10); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4242,7 +4283,7 @@ function peg$parse(input, options) { } if (s11 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f32(s5, s9); + s0 = peg$f33(s5, s9); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4277,7 +4318,7 @@ function peg$parse(input, options) { function peg$parsearrayConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 51; + var key = peg$currPos * 68 + 52; var cached = peg$resultsCache[key]; if (cached) { @@ -4310,7 +4351,7 @@ function peg$parse(input, options) { } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f33(); + s0 = peg$f34(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4346,7 +4387,7 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f34(s3); + s0 = peg$f35(s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4376,7 +4417,7 @@ function peg$parse(input, options) { function peg$parsearray_elements() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 52; + var key = peg$currPos * 68 + 53; var cached = peg$resultsCache[key]; if (cached) { @@ -4455,7 +4496,7 @@ function peg$parse(input, options) { function peg$parserecordConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 53; + var key = peg$currPos * 68 + 54; var cached = peg$resultsCache[key]; if (cached) { @@ -4491,7 +4532,7 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f35(s3); + s0 = peg$f36(s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4520,7 +4561,7 @@ function peg$parse(input, options) { function peg$parsearray_recordArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 54; + var key = peg$currPos * 68 + 55; var cached = peg$resultsCache[key]; if (cached) { @@ -4599,7 +4640,7 @@ function peg$parse(input, options) { function peg$parsekeyValuePair() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 55; + var key = peg$currPos * 68 + 56; var cached = peg$resultsCache[key]; if (cached) { @@ -4626,7 +4667,7 @@ function peg$parse(input, options) { s5 = peg$parseexpression(); if (s5 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f36(s1, s5); + s0 = peg$f37(s1, s5); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4648,7 +4689,7 @@ function peg$parse(input, options) { function peg$parse_() { var s0, s1; - var key = peg$currPos * 67 + 56; + var key = peg$currPos * 68 + 57; var cached = peg$resultsCache[key]; if (cached) { @@ -4678,7 +4719,7 @@ function peg$parse(input, options) { function peg$parse_nl() { var s0, s1; - var key = peg$currPos * 67 + 57; + var key = peg$currPos * 68 + 58; var cached = peg$resultsCache[key]; if (cached) { @@ -4714,7 +4755,7 @@ function peg$parse(input, options) { function peg$parse__() { var s0, s1; - var key = peg$currPos * 67 + 58; + var key = peg$currPos * 68 + 59; var cached = peg$resultsCache[key]; if (cached) { @@ -4750,7 +4791,7 @@ function peg$parse(input, options) { function peg$parse__nl() { var s0, s1; - var key = peg$currPos * 67 + 59; + var key = peg$currPos * 68 + 60; var cached = peg$resultsCache[key]; if (cached) { @@ -4792,7 +4833,7 @@ function peg$parse(input, options) { function peg$parsestatementSeparator() { var s0, s1, s2, s3; - var key = peg$currPos * 67 + 60; + var key = peg$currPos * 68 + 61; var cached = peg$resultsCache[key]; if (cached) { @@ -4860,7 +4901,7 @@ function peg$parse(input, options) { function peg$parsecommentOrNewLine() { var s0, s1, s2; - var key = peg$currPos * 67 + 61; + var key = peg$currPos * 68 + 62; var cached = peg$resultsCache[key]; if (cached) { @@ -4891,7 +4932,7 @@ function peg$parse(input, options) { function peg$parsefinalComment() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 62; + var key = peg$currPos * 68 + 63; var cached = peg$resultsCache[key]; if (cached) { @@ -4967,7 +5008,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharactersOrComment() { var s0; - var key = peg$currPos * 67 + 63; + var key = peg$currPos * 68 + 64; var cached = peg$resultsCache[key]; if (cached) { @@ -4989,7 +5030,7 @@ function peg$parse(input, options) { function peg$parsedelimitedComment() { var s0, s1, s2, s3; - var key = peg$currPos * 67 + 64; + var key = peg$currPos * 68 + 65; var cached = peg$resultsCache[key]; if (cached) { @@ -5067,7 +5108,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharacters() { var s0; - var key = peg$currPos * 67 + 65; + var key = peg$currPos * 68 + 66; var cached = peg$resultsCache[key]; if (cached) { @@ -5094,7 +5135,7 @@ function peg$parse(input, options) { function peg$parsenewLine() { var s0, s1; - var key = peg$currPos * 67 + 66; + var key = peg$currPos * 68 + 67; var cached = peg$resultsCache[key]; if (cached) { diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy index 5d3392b3..3b02d85a 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy @@ -248,8 +248,7 @@ basicValue = valueConstructor / basicLiteral basicLiteral = string - / float - / integer + / number / boolean / dollarIdentifier @@ -263,6 +262,16 @@ string 'string' = characters:("'" @([^'])* "'") {return nodeString(characters.join(''))} / characters:('"' @([^"])* '"') {return nodeString(characters.join(''))} +number = number:(float / integer) unit:identifier? + { + if (unit === null) + { return number } + else + { return makeFunctionCall('multiply', + [number, makeFunctionCall('$valueOfUnit', [nodeString(unit.value)])]) + } + } + integer 'integer' = d+ !"\." ![e]i { return nodeInteger(parseInt(text()))} From ebcd22823286caef03d02f7398f09573b26395b8 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 23 May 2022 07:05:42 -0400 Subject: [PATCH 212/340] .gitignore, package.json, .prettierignore: #576 Value: [1e-7 to 1e-3] --- packages/squiggle-lang/.gitignore | 1 + packages/squiggle-lang/.prettierignore | 3 +- packages/squiggle-lang/package.json | 6 +- .../Reducer_Peggy_GeneratedParser.js | 1049 +++++------------ 4 files changed, 306 insertions(+), 753 deletions(-) diff --git a/packages/squiggle-lang/.gitignore b/packages/squiggle-lang/.gitignore index 4db5c5f4..1449d5f3 100644 --- a/packages/squiggle-lang/.gitignore +++ b/packages/squiggle-lang/.gitignore @@ -21,3 +21,4 @@ dist _coverage coverage .nyc_output/ +src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js diff --git a/packages/squiggle-lang/.prettierignore b/packages/squiggle-lang/.prettierignore index 1c242bb9..46ac9925 100644 --- a/packages/squiggle-lang/.prettierignore +++ b/packages/squiggle-lang/.prettierignore @@ -4,4 +4,5 @@ lib *.gen.tsx .nyc_output/ coverage/ -.cache/ \ No newline at end of file +.cache/ +Reducer_Peggy_GeneratedParser.js diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index bf76709a..e751979b 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -4,9 +4,9 @@ "homepage": "https://squiggle-language.com", "license": "MIT", "scripts": { - "peggy": "peggy --cache ", - "build:peggy": "find . -type f -name *.peggy -exec yarn run peggy {} \\;", - "build": "yarn build:rescript && yarn build:typescript", + "peggy": "peggy --cache", + "build": "yarn build:peggy && yarn build:rescript && yarn build:typescript", + "build:peggy": "find . -type f -name *.peggy -exec yarn peggy {} \\;", "build:rescript": "rescript build -with-deps", "build:typescript": "tsc", "bundle": "webpack", diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index 3a34dfb2..67fa36a1 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -4,103 +4,71 @@ "use strict"; -var toFunction = { - "-": "subtract", - "->": "pipe", - "!=": "unequal", - ".-": "dotSubtract", - ".*": "dotMultiply", - "./": "dotDivide", - ".^": "dotPow", - ".+": "dotAdd", - "*": "multiply", - "/": "divide", - "&&": "and", - "^": "pow", // or xor - "+": "add", - "<": "smaller", - "<=": "smallerEq", - "==": "equal", - ">": "larger", - ">=": "largerEq", - "||": "or", - to: "credibleIntervalToDistribution", -}; -var unaryToFunction = { - "-": "unaryMinus", - "!": "not", - ".-": "unaryDotMinus", -}; + var toFunction = { + '-': 'subtract', + '->': 'pipe', + '!=': 'unequal', + '.-': 'dotSubtract', + '.*': 'dotMultiply', + './': 'dotDivide', + '.^': 'dotPow', + '.+': 'dotAdd', + '*': 'multiply', + '/': 'divide', + '&&': 'and', + '^': 'pow', // or xor + '+': 'add', + '<': 'smaller', + '<=': 'smallerEq', + '==': 'equal', + '>': 'larger', + '>=': 'largerEq', + '||': 'or', + 'to': 'credibleIntervalToDistribution', + } -var postOperatorToFunction = { - ".": "$_atIndex_$", - "()": "$$_applyAll_$$", - "[]": "$_atIndex_$", -}; + var unaryToFunction = { + '-': 'unaryMinus', + '!': 'not', + '.-': 'unaryDotMinus', + } -function nodeBlock(statements) { - return { type: "Block", statements: statements }; -} -function nodeBoolean(value) { - return { type: "Boolean", value: value }; -} -function nodeCallIndentifier(value) { - return { type: "CallIdentifier", value: value }; -} -function nodeExpression(args) { - return { type: "Expression", nodes: args }; -} -function nodeFloat(value) { - return { type: "Float", value: value }; -} -function makeFunctionCall(fn, args) { - if (fn === "$$_applyAll_$$") { - // Any list of values is applied from left to right anyway. - // Like in Haskell and Lisp. - // So we remove the redundant $$_applyAll_$$. - if (args[0].type === "Identifier") { - args[0].type = "CallIdentifier"; + var postOperatorToFunction = { + '.': '$_atIndex_$', + '()': '$$_applyAll_$$', + '[]': '$_atIndex_$', + } + + function nodeBlock(statements) {return{type: 'Block', statements: statements}} + function nodeBoolean(value) {return {type: 'Boolean', value: value}} + function nodeCallIndentifier(value) {return {type: 'CallIdentifier', value: value}} + function nodeExpression(args) {return {type: 'Expression', nodes: args}} + function nodeFloat(value) {return {type: 'Float', value: value}} + function makeFunctionCall(fn, args) { + if (fn === '$$_applyAll_$$') { + // Any list of values is applied from left to right anyway. + // Like in Haskell and Lisp. + // So we remove the redundant $$_applyAll_$$. + if (args[0].type === "Identifier") {args[0].type = "CallIdentifier"} + return nodeExpression(args) + } else { + return nodeExpression([nodeCallIndentifier(fn), ...args]) } - return nodeExpression(args); - } else { - return nodeExpression([nodeCallIndentifier(fn), ...args]); } -} -function nodeIdentifier(value) { - return { type: "Identifier", value: value }; -} -function nodeInteger(value) { - return { type: "Integer", value: value }; -} -function nodeKeyValue(key, value) { - if (key.type === "Identifier") { - key.type = "String"; - } - return { type: "KeyValue", key: key, value: value }; -} -function nodeLambda(args, body) { - return { type: "Lambda", args: args, body: body }; -} -function nodeLetStatment(variable, value) { - return { type: "LetStatement", variable: variable, value: value }; -} -function nodeString(value) { - return { type: "String", value: value }; -} -function nodeTernary(condition, trueExpression, falseExpression) { - return { - type: "Ternary", - condition: condition, - trueExpression: trueExpression, - falseExpression: falseExpression, - }; -} + function nodeIdentifier(value) {return {type: 'Identifier', value: value}} + function nodeInteger(value) {return {type: 'Integer', value: value}} + function nodeKeyValue(key, value) { + if (key.type === 'Identifier') {key.type = 'String'} + return {type: 'KeyValue', key: key, value: value}} + function nodeLambda(args, body) {return {type: 'Lambda', args: args, body: body}} + function nodeLetStatment(variable, value) {return {type: 'LetStatement', variable: variable, value: value}} + function nodeString(value) {return {type: 'String', value: value}} + function nodeTernary(condition, trueExpression, falseExpression) {return {type: 'Ternary', condition: condition, trueExpression: trueExpression, falseExpression: falseExpression}} + function peg$subclass(child, parent) { - function C() { - this.constructor = child; - } + function C() { this.constructor = child; } C.prototype = parent.prototype; child.prototype = new C(); } @@ -121,15 +89,13 @@ peg$subclass(peg$SyntaxError, Error); function peg$padEnd(str, targetLength, padString) { padString = padString || " "; - if (str.length > targetLength) { - return str; - } + if (str.length > targetLength) { return str; } targetLength -= str.length; padString += padString.repeat(targetLength); return str + padString.slice(0, targetLength); } -peg$SyntaxError.prototype.format = function (sources) { +peg$SyntaxError.prototype.format = function(sources) { var str = "Error: " + this.message; if (this.location) { var src = null; @@ -147,20 +113,11 @@ peg$SyntaxError.prototype.format = function (sources) { var filler = peg$padEnd("", s.line.toString().length); var line = src[s.line - 1]; var last = s.line === e.line ? e.column : line.length + 1; - str += - "\n --> " + - loc + - "\n" + - filler + - " |\n" + - s.line + - " | " + - line + - "\n" + - filler + - " | " + - peg$padEnd("", s.column - 1) + - peg$padEnd("", last - s.column, "^"); + str += "\n --> " + loc + "\n" + + filler + " |\n" + + s.line + " | " + line + "\n" + + filler + " | " + peg$padEnd("", s.column - 1) + + peg$padEnd("", last - s.column, "^"); } else { str += "\n at " + loc; } @@ -168,14 +125,14 @@ peg$SyntaxError.prototype.format = function (sources) { return str; }; -peg$SyntaxError.buildMessage = function (expected, found) { +peg$SyntaxError.buildMessage = function(expected, found) { var DESCRIBE_EXPECTATION_FNS = { - literal: function (expectation) { - return '"' + literalEscape(expectation.text) + '"'; + literal: function(expectation) { + return "\"" + literalEscape(expectation.text) + "\""; }, - class: function (expectation) { - var escapedParts = expectation.parts.map(function (part) { + class: function(expectation) { + var escapedParts = expectation.parts.map(function(part) { return Array.isArray(part) ? classEscape(part[0]) + "-" + classEscape(part[1]) : classEscape(part); @@ -184,17 +141,17 @@ peg$SyntaxError.buildMessage = function (expected, found) { return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]"; }, - any: function () { + any: function() { return "any character"; }, - end: function () { + end: function() { return "end of input"; }, - other: function (expectation) { + other: function(expectation) { return expectation.description; - }, + } }; function hex(ch) { @@ -204,17 +161,13 @@ peg$SyntaxError.buildMessage = function (expected, found) { function literalEscape(s) { return s .replace(/\\/g, "\\\\") - .replace(/"/g, '\\"') + .replace(/"/g, "\\\"") .replace(/\0/g, "\\0") .replace(/\t/g, "\\t") .replace(/\n/g, "\\n") .replace(/\r/g, "\\r") - .replace(/[\x00-\x0F]/g, function (ch) { - return "\\x0" + hex(ch); - }) - .replace(/[\x10-\x1F\x7F-\x9F]/g, function (ch) { - return "\\x" + hex(ch); - }); + .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) + .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); } function classEscape(s) { @@ -222,17 +175,13 @@ peg$SyntaxError.buildMessage = function (expected, found) { .replace(/\\/g, "\\\\") .replace(/\]/g, "\\]") .replace(/\^/g, "\\^") - .replace(/-/g, "\\-") + .replace(/-/g, "\\-") .replace(/\0/g, "\\0") .replace(/\t/g, "\\t") .replace(/\n/g, "\\n") .replace(/\r/g, "\\r") - .replace(/[\x00-\x0F]/g, function (ch) { - return "\\x0" + hex(ch); - }) - .replace(/[\x10-\x1F\x7F-\x9F]/g, function (ch) { - return "\\x" + hex(ch); - }); + .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) + .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); } function describeExpectation(expectation) { @@ -263,25 +212,17 @@ peg$SyntaxError.buildMessage = function (expected, found) { return descriptions[0] + " or " + descriptions[1]; default: - return ( - descriptions.slice(0, -1).join(", ") + - ", or " + - descriptions[descriptions.length - 1] - ); + return descriptions.slice(0, -1).join(", ") + + ", or " + + descriptions[descriptions.length - 1]; } } function describeFound(found) { - return found ? '"' + literalEscape(found) + '"' : "end of input"; + return found ? "\"" + literalEscape(found) + "\"" : "end of input"; } - return ( - "Expected " + - describeExpected(expected) + - " but " + - describeFound(found) + - " found." - ); + return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found."; }; function peg$parse(input, options) { @@ -330,7 +271,7 @@ function peg$parse(input, options) { var peg$c34 = "."; var peg$c35 = "]"; var peg$c36 = "'"; - var peg$c37 = '"'; + var peg$c37 = "\""; var peg$c38 = "true"; var peg$c39 = "false"; var peg$c40 = "|"; @@ -394,23 +335,15 @@ function peg$parse(input, options) { var peg$e38 = peg$literalExpectation("]", false); var peg$e39 = peg$otherExpectation("identifier"); var peg$e40 = peg$classExpectation(["_", ["a", "z"]], false, false); - var peg$e41 = peg$classExpectation( - ["_", ["a", "z"], ["0", "9"]], - false, - true - ); + var peg$e41 = peg$classExpectation(["_", ["a", "z"], ["0", "9"]], false, true); var peg$e42 = peg$otherExpectation("$identifier"); var peg$e43 = peg$classExpectation(["$", "_", ["a", "z"]], false, false); - var peg$e44 = peg$classExpectation( - ["$", "_", ["a", "z"], ["0", "9"]], - false, - true - ); + var peg$e44 = peg$classExpectation(["$", "_", ["a", "z"], ["0", "9"]], false, true); var peg$e45 = peg$otherExpectation("string"); var peg$e46 = peg$literalExpectation("'", false); var peg$e47 = peg$classExpectation(["'"], true, false); - var peg$e48 = peg$literalExpectation('"', false); - var peg$e49 = peg$classExpectation(['"'], true, false); + var peg$e48 = peg$literalExpectation("\"", false); + var peg$e49 = peg$classExpectation(["\""], true, false); var peg$e50 = peg$otherExpectation("integer"); var peg$e51 = peg$classExpectation(["e"], false, true); var peg$e52 = peg$otherExpectation("float"); @@ -438,134 +371,55 @@ function peg$parse(input, options) { var peg$e74 = peg$otherExpectation("newline"); var peg$e75 = peg$classExpectation(["\n", "\r"], false, false); - var peg$f0 = function (start) { - return start; - }; - var peg$f1 = function (statements, finalExpression) { - if (finalExpression != null) { - statements.push(finalExpression); - } - return nodeBlock(statements); - }; - var peg$f2 = function (finalExpression) { - return nodeBlock([finalExpression]); - }; - var peg$f3 = function (statements, finalExpression) { - statements.push(finalExpression); - return nodeBlock(statements); - }; - var peg$f4 = function (finalExpression) { - return nodeBlock([finalExpression]); - }; - var peg$f5 = function (head, tail) { - return [head, ...tail]; - }; - var peg$f6 = function (head) { - return [head]; - }; - var peg$f7 = function (variable, value) { - return nodeLetStatment(variable, value); - }; - var peg$f8 = function (variable, args, body) { - var value = nodeLambda(args, body); - return nodeLetStatment(variable, value); - }; - var peg$f9 = function (head, tail) { - return [head, ...tail]; - }; - var peg$f10 = function (condition, trueExpression, falseExpression) { - return nodeTernary(condition, trueExpression, falseExpression); - }; - var peg$f11 = function (head, operator, arg) { - return { operator: operator, right: arg }; - }; - var peg$f12 = function (head, tail) { - return tail.reduce(function (result, element) { - return makeFunctionCall(toFunction[element.operator], [ - result, - element.right, - ]); - }, head); - }; - var peg$f13 = function (left, operator, right) { - return makeFunctionCall(toFunction[operator], [left, right]); - }; - var peg$f14 = function (head, chained) { - return chained; - }; - var peg$f15 = function (head, tail) { - return tail.reduce(function (result, element) { - return makeFunctionCall(element.fnName, [result, ...element.args]); - }, head); - }; - var peg$f16 = function (fn, args) { - return { fnName: fn.value, args: args }; - }; - var peg$f17 = function (fn) { - return { fnName: fn.value, args: [] }; - }; - var peg$f18 = function (unaryOperator, right) { - return makeFunctionCall(unaryToFunction[unaryOperator], [right]); - }; - var peg$f19 = function (head, arg) { - return { fn: postOperatorToFunction["[]"], args: [arg] }; - }; - var peg$f20 = function (head, args) { - return { fn: postOperatorToFunction["()"], args: args }; - }; - var peg$f21 = function (head, arg) { - return { fn: postOperatorToFunction["[]"], args: [nodeString(arg)] }; - }; - var peg$f22 = function (head, tail) { - return tail.reduce(function (result, element) { - return makeFunctionCall(element.fn, [result, ...element.args]); - }, head); - }; - var peg$f23 = function (head, arg) { - return { fn: postOperatorToFunction["."], args: [nodeString(arg)] }; - }; - var peg$f24 = function (head, tail) { - return tail.reduce(function (result, element) { - return makeFunctionCall(element.fn, [result, ...element.args]); - }, head); - }; - var peg$f25 = function (expression) { - return expression; - }; - var peg$f26 = function () { - return nodeIdentifier(text()); - }; - var peg$f27 = function (characters) { - return nodeString(characters.join("")); - }; - var peg$f28 = function () { - return nodeInteger(parseInt(text())); - }; - var peg$f29 = function () { - return nodeFloat(parseFloat(text())); - }; - var peg$f30 = function () { - return nodeBoolean(text() === "true"); - }; - var peg$f31 = function (args, statements, finalExpression) { - statements.push(finalExpression); - return nodeLambda(args, nodeBlock(statements)); - }; - var peg$f32 = function (args, finalExpression) { - return nodeLambda(args, nodeBlock([finalExpression])); - }; - var peg$f33 = function () { - return makeFunctionCall("$_constructArray_$", [nodeExpression([])]); - }; - var peg$f34 = function (args) { - return makeFunctionCall("$_constructArray_$", [nodeExpression(args)]); - }; - var peg$f35 = function (args) { - return makeFunctionCall("$_constructRecord_$", [nodeExpression(args)]); - }; - var peg$f36 = function (key, value) { - return nodeKeyValue(key, value); - }; + var peg$f0 = function(start) {return start}; + var peg$f1 = function(statements, finalExpression) { if (finalExpression != null) { statements.push(finalExpression) } + return nodeBlock(statements) }; + var peg$f2 = function(finalExpression) { return nodeBlock([finalExpression])}; + var peg$f3 = function(statements, finalExpression) { statements.push(finalExpression) + return nodeBlock(statements) }; + var peg$f4 = function(finalExpression) { return nodeBlock([finalExpression]) }; + var peg$f5 = function(head, tail) { return [head, ...tail] }; + var peg$f6 = function(head) { return [head] }; + var peg$f7 = function(variable, value) { return nodeLetStatment(variable, value) }; + var peg$f8 = function(variable, args, body) { var value = nodeLambda(args, body) + return nodeLetStatment(variable, value) }; + var peg$f9 = function(head, tail) { return [head, ...tail]; }; + var peg$f10 = function(condition, trueExpression, falseExpression) { return nodeTernary(condition, trueExpression, falseExpression) }; + var peg$f11 = function(head, operator, arg) {return {operator: operator, right: arg}}; + var peg$f12 = function(head, tail) { return tail.reduce(function(result, element) { + return makeFunctionCall(toFunction[element.operator], [result, element.right]) + }, head)}; + var peg$f13 = function(left, operator, right) { return makeFunctionCall(toFunction[operator], [left, right])}; + var peg$f14 = function(head, chained) {return chained}; + var peg$f15 = function(head, tail) { return tail.reduce(function(result, element) { + return makeFunctionCall(element.fnName, [result, ...element.args]) + }, head)}; + var peg$f16 = function(fn, args) { return {fnName: fn.value, args: args}}; + var peg$f17 = function(fn) { return {fnName: fn.value, args: []}}; + var peg$f18 = function(unaryOperator, right) { return makeFunctionCall(unaryToFunction[unaryOperator], [right])}; + var peg$f19 = function(head, arg) {return {fn: postOperatorToFunction['[]'], args: [arg]}}; + var peg$f20 = function(head, args) {return {fn: postOperatorToFunction['()'], args: args}}; + var peg$f21 = function(head, arg) {return {fn: postOperatorToFunction['[]'], args: [nodeString(arg)]}}; + var peg$f22 = function(head, tail) { return tail.reduce(function(result, element) { + return makeFunctionCall(element.fn, [result, ...element.args]) + }, head)}; + var peg$f23 = function(head, arg) {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}}; + var peg$f24 = function(head, tail) { return tail.reduce(function(result, element) { + return makeFunctionCall(element.fn, [result, ...element.args]) + }, head)}; + var peg$f25 = function(expression) {return expression}; + var peg$f26 = function() {return nodeIdentifier(text())}; + var peg$f27 = function(characters) {return nodeString(characters.join(''))}; + var peg$f28 = function() { return nodeInteger(parseInt(text()))}; + var peg$f29 = function() { return nodeFloat(parseFloat(text()))}; + var peg$f30 = function() { return nodeBoolean(text() === 'true')}; + var peg$f31 = function(args, statements, finalExpression) { statements.push(finalExpression) + return nodeLambda(args, nodeBlock(statements)) }; + var peg$f32 = function(args, finalExpression) { return nodeLambda(args, nodeBlock([finalExpression])) }; + var peg$f33 = function() { return makeFunctionCall('$_constructArray_$', [nodeExpression([])])}; + var peg$f34 = function(args) { return makeFunctionCall('$_constructArray_$', [nodeExpression(args)])}; + var peg$f35 = function(args) { return makeFunctionCall('$_constructRecord_$', [nodeExpression(args)])}; + var peg$f36 = function(key, value) { return nodeKeyValue(key, value)}; var peg$currPos = 0; var peg$savedPos = 0; @@ -580,9 +434,7 @@ function peg$parse(input, options) { if ("startRule" in options) { if (!(options.startRule in peg$startRuleFunctions)) { - throw new Error( - "Can't start parsing from rule \"" + options.startRule + '".' - ); + throw new Error("Can't start parsing from rule \"" + options.startRule + "\"."); } peg$startRuleFunction = peg$startRuleFunctions[options.startRule]; @@ -600,7 +452,7 @@ function peg$parse(input, options) { return { source: peg$source, start: peg$savedPos, - end: peg$currPos, + end: peg$currPos }; } @@ -609,10 +461,9 @@ function peg$parse(input, options) { } function expected(description, location) { - location = - location !== undefined - ? location - : peg$computeLocation(peg$savedPos, peg$currPos); + location = location !== undefined + ? location + : peg$computeLocation(peg$savedPos, peg$currPos); throw peg$buildStructuredError( [peg$otherExpectation(description)], @@ -622,10 +473,9 @@ function peg$parse(input, options) { } function error(message, location) { - location = - location !== undefined - ? location - : peg$computeLocation(peg$savedPos, peg$currPos); + location = location !== undefined + ? location + : peg$computeLocation(peg$savedPos, peg$currPos); throw peg$buildSimpleError(message, location); } @@ -635,12 +485,7 @@ function peg$parse(input, options) { } function peg$classExpectation(parts, inverted, ignoreCase) { - return { - type: "class", - parts: parts, - inverted: inverted, - ignoreCase: ignoreCase, - }; + return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase }; } function peg$anyExpectation() { @@ -670,7 +515,7 @@ function peg$parse(input, options) { details = peg$posDetailsCache[p]; details = { line: details.line, - column: details.column, + column: details.column }; while (p < pos) { @@ -699,20 +544,18 @@ function peg$parse(input, options) { start: { offset: startPos, line: startPosDetails.line, - column: startPosDetails.column, + column: startPosDetails.column }, end: { offset: endPos, line: endPosDetails.line, - column: endPosDetails.column, - }, + column: endPosDetails.column + } }; } function peg$fail(expected) { - if (peg$currPos < peg$maxFailPos) { - return; - } + if (peg$currPos < peg$maxFailPos) { return; } if (peg$currPos > peg$maxFailPos) { peg$maxFailPos = peg$currPos; @@ -889,9 +732,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e0); - } + if (peg$silentFails === 0) { peg$fail(peg$e0); } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -918,9 +759,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e1); - } + if (peg$silentFails === 0) { peg$fail(peg$e1); } } if (s6 !== peg$FAILED) { peg$savedPos = s0; @@ -948,9 +787,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e0); - } + if (peg$silentFails === 0) { peg$fail(peg$e0); } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -962,9 +799,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e1); - } + if (peg$silentFails === 0) { peg$fail(peg$e1); } } if (s5 !== peg$FAILED) { peg$savedPos = s0; @@ -1126,9 +961,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e2); - } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s2 !== peg$FAILED) { s3 = peg$parse_nl(); @@ -1140,9 +973,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e3); - } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s6 !== peg$FAILED) { s7 = peg$parse_(); @@ -1201,16 +1032,12 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e5); - } + if (peg$silentFails === 0) { peg$fail(peg$e5); } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e4); - } + if (peg$silentFails === 0) { peg$fail(peg$e4); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -1241,9 +1068,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e6); - } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -1267,9 +1092,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e6); - } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -1340,9 +1163,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e7); - } + if (peg$silentFails === 0) { peg$fail(peg$e7); } } if (s1 !== peg$FAILED) { s2 = peg$parse__nl(); @@ -1356,9 +1177,7 @@ function peg$parse(input, options) { peg$currPos += 4; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e8); - } + if (peg$silentFails === 0) { peg$fail(peg$e8); } } if (s5 !== peg$FAILED) { s6 = peg$parse__nl(); @@ -1372,9 +1191,7 @@ function peg$parse(input, options) { peg$currPos += 4; } else { s9 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e9); - } + if (peg$silentFails === 0) { peg$fail(peg$e9); } } if (s9 !== peg$FAILED) { s10 = peg$parse__nl(); @@ -1457,9 +1274,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e10); - } + if (peg$silentFails === 0) { peg$fail(peg$e10); } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -1471,9 +1286,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s7 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e11); - } + if (peg$silentFails === 0) { peg$fail(peg$e11); } } if (s7 !== peg$FAILED) { s8 = peg$parse_nl(); @@ -1593,16 +1406,12 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e13); - } + if (peg$silentFails === 0) { peg$fail(peg$e13); } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e12); - } + if (peg$silentFails === 0) { peg$fail(peg$e12); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -1693,16 +1502,12 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e14); - } + if (peg$silentFails === 0) { peg$fail(peg$e14); } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e12); - } + if (peg$silentFails === 0) { peg$fail(peg$e12); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -1772,9 +1577,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e15); - } + if (peg$silentFails === 0) { peg$fail(peg$e15); } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c14) { @@ -1782,17 +1585,13 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e16); - } + if (peg$silentFails === 0) { peg$fail(peg$e16); } } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e12); - } + if (peg$silentFails === 0) { peg$fail(peg$e12); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -1862,9 +1661,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e17); - } + if (peg$silentFails === 0) { peg$fail(peg$e17); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 60) { @@ -1872,9 +1669,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e18); - } + if (peg$silentFails === 0) { peg$fail(peg$e18); } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c17) { @@ -1882,9 +1677,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e19); - } + if (peg$silentFails === 0) { peg$fail(peg$e19); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 62) { @@ -1892,9 +1685,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e20); - } + if (peg$silentFails === 0) { peg$fail(peg$e20); } } } } @@ -1902,9 +1693,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e12); - } + if (peg$silentFails === 0) { peg$fail(peg$e12); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -1995,9 +1784,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e21); - } + if (peg$silentFails === 0) { peg$fail(peg$e21); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 45) { @@ -2005,9 +1792,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e22); - } + if (peg$silentFails === 0) { peg$fail(peg$e22); } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c21) { @@ -2015,9 +1800,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e23); - } + if (peg$silentFails === 0) { peg$fail(peg$e23); } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c22) { @@ -2025,9 +1808,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e24); - } + if (peg$silentFails === 0) { peg$fail(peg$e24); } } } } @@ -2035,9 +1816,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e12); - } + if (peg$silentFails === 0) { peg$fail(peg$e12); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -2128,9 +1907,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e25); - } + if (peg$silentFails === 0) { peg$fail(peg$e25); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 47) { @@ -2138,9 +1915,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e26); - } + if (peg$silentFails === 0) { peg$fail(peg$e26); } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c25) { @@ -2148,9 +1923,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e27); - } + if (peg$silentFails === 0) { peg$fail(peg$e27); } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c26) { @@ -2158,9 +1931,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e28); - } + if (peg$silentFails === 0) { peg$fail(peg$e28); } } } } @@ -2168,9 +1939,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e12); - } + if (peg$silentFails === 0) { peg$fail(peg$e12); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -2261,9 +2030,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e29); - } + if (peg$silentFails === 0) { peg$fail(peg$e29); } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c28) { @@ -2271,17 +2038,13 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e30); - } + if (peg$silentFails === 0) { peg$fail(peg$e30); } } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e12); - } + if (peg$silentFails === 0) { peg$fail(peg$e12); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -2392,16 +2155,12 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e31); - } + if (peg$silentFails === 0) { peg$fail(peg$e31); } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e12); - } + if (peg$silentFails === 0) { peg$fail(peg$e12); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -2432,9 +2191,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e32); - } + if (peg$silentFails === 0) { peg$fail(peg$e32); } } if (s5 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c31) { @@ -2442,9 +2199,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e33); - } + if (peg$silentFails === 0) { peg$fail(peg$e33); } } } if (s5 !== peg$FAILED) { @@ -2470,9 +2225,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e32); - } + if (peg$silentFails === 0) { peg$fail(peg$e32); } } if (s5 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c31) { @@ -2480,9 +2233,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e33); - } + if (peg$silentFails === 0) { peg$fail(peg$e33); } } } if (s5 !== peg$FAILED) { @@ -2532,9 +2283,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e2); - } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s2 !== peg$FAILED) { s3 = peg$parse_nl(); @@ -2546,9 +2295,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e3); - } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s6 !== peg$FAILED) { peg$savedPos = s0; @@ -2578,9 +2325,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e2); - } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s2 !== peg$FAILED) { s3 = peg$parse_nl(); @@ -2589,9 +2334,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e3); - } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s4 !== peg$FAILED) { peg$savedPos = s0; @@ -2682,9 +2425,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e22); - } + if (peg$silentFails === 0) { peg$fail(peg$e22); } } if (s0 === peg$FAILED) { if (input.substr(peg$currPos, 2) === peg$c22) { @@ -2692,9 +2433,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e24); - } + if (peg$silentFails === 0) { peg$fail(peg$e24); } } if (s0 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 33) { @@ -2702,18 +2441,14 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e35); - } + if (peg$silentFails === 0) { peg$fail(peg$e35); } } } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e34); - } + if (peg$silentFails === 0) { peg$fail(peg$e34); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -2768,9 +2503,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e36); - } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s3 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 40) { @@ -2778,9 +2511,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e2); - } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s3 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 46) { @@ -2788,9 +2519,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e37); - } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } } } @@ -2810,9 +2539,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e36); - } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2824,9 +2551,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e38); - } + if (peg$silentFails === 0) { peg$fail(peg$e38); } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2851,9 +2576,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e2); - } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2865,9 +2588,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e3); - } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2891,9 +2612,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e37); - } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s5 !== peg$FAILED) { s6 = peg$currPos; @@ -2925,9 +2644,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e36); - } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2939,9 +2656,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e38); - } + if (peg$silentFails === 0) { peg$fail(peg$e38); } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -2966,9 +2681,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e2); - } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -2980,9 +2693,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s10 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e3); - } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s10 !== peg$FAILED) { peg$savedPos = s4; @@ -3006,9 +2717,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e37); - } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s5 !== peg$FAILED) { s6 = peg$currPos; @@ -3071,9 +2780,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e6); - } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -3097,9 +2804,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e6); - } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -3149,9 +2854,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e37); - } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } peg$silentFails--; if (s3 !== peg$FAILED) { @@ -3169,9 +2872,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e37); - } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -3202,9 +2903,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s6 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e37); - } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s6 !== peg$FAILED) { s7 = peg$parse_nl(); @@ -3261,9 +2960,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e2); - } + if (peg$silentFails === 0) { peg$fail(peg$e2); } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -3275,9 +2972,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e3); - } + if (peg$silentFails === 0) { peg$fail(peg$e3); } } if (s5 !== peg$FAILED) { peg$savedPos = s0; @@ -3377,9 +3072,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e40); - } + if (peg$silentFails === 0) { peg$fail(peg$e40); } } if (s3 !== peg$FAILED) { while (s3 !== peg$FAILED) { @@ -3389,9 +3082,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e40); - } + if (peg$silentFails === 0) { peg$fail(peg$e40); } } } } else { @@ -3404,9 +3095,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e41); - } + if (peg$silentFails === 0) { peg$fail(peg$e41); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3415,9 +3104,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e41); - } + if (peg$silentFails === 0) { peg$fail(peg$e41); } } } s2 = [s2, s3]; @@ -3434,9 +3121,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e39); - } + if (peg$silentFails === 0) { peg$fail(peg$e39); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3465,9 +3150,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e43); - } + if (peg$silentFails === 0) { peg$fail(peg$e43); } } if (s3 !== peg$FAILED) { while (s3 !== peg$FAILED) { @@ -3477,9 +3160,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e43); - } + if (peg$silentFails === 0) { peg$fail(peg$e43); } } } } else { @@ -3492,9 +3173,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e44); - } + if (peg$silentFails === 0) { peg$fail(peg$e44); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3503,9 +3182,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e44); - } + if (peg$silentFails === 0) { peg$fail(peg$e44); } } } s2 = [s2, s3]; @@ -3522,9 +3199,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e42); - } + if (peg$silentFails === 0) { peg$fail(peg$e42); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3552,9 +3227,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e46); - } + if (peg$silentFails === 0) { peg$fail(peg$e46); } } if (s2 !== peg$FAILED) { s3 = []; @@ -3563,9 +3236,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e47); - } + if (peg$silentFails === 0) { peg$fail(peg$e47); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3574,9 +3245,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e47); - } + if (peg$silentFails === 0) { peg$fail(peg$e47); } } } if (input.charCodeAt(peg$currPos) === 39) { @@ -3584,9 +3253,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e46); - } + if (peg$silentFails === 0) { peg$fail(peg$e46); } } if (s4 !== peg$FAILED) { s1 = s3; @@ -3611,9 +3278,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e48); - } + if (peg$silentFails === 0) { peg$fail(peg$e48); } } if (s2 !== peg$FAILED) { s3 = []; @@ -3622,9 +3287,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e49); - } + if (peg$silentFails === 0) { peg$fail(peg$e49); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -3633,9 +3296,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e49); - } + if (peg$silentFails === 0) { peg$fail(peg$e49); } } } if (input.charCodeAt(peg$currPos) === 34) { @@ -3643,9 +3304,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e48); - } + if (peg$silentFails === 0) { peg$fail(peg$e48); } } if (s4 !== peg$FAILED) { s1 = s3; @@ -3666,9 +3325,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e45); - } + if (peg$silentFails === 0) { peg$fail(peg$e45); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3708,9 +3365,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e37); - } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } peg$silentFails--; if (s3 === peg$FAILED) { @@ -3727,9 +3382,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e51); - } + if (peg$silentFails === 0) { peg$fail(peg$e51); } } peg$silentFails--; if (s4 === peg$FAILED) { @@ -3756,9 +3409,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e50); - } + if (peg$silentFails === 0) { peg$fail(peg$e50); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3799,9 +3450,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e37); - } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s5 !== peg$FAILED) { s6 = []; @@ -3827,9 +3476,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e37); - } + if (peg$silentFails === 0) { peg$fail(peg$e37); } } if (s4 !== peg$FAILED) { s5 = []; @@ -3904,9 +3551,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e52); - } + if (peg$silentFails === 0) { peg$fail(peg$e52); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -3932,9 +3577,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e51); - } + if (peg$silentFails === 0) { peg$fail(peg$e51); } } if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 45) { @@ -3942,9 +3585,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e22); - } + if (peg$silentFails === 0) { peg$fail(peg$e22); } } if (s2 === peg$FAILED) { s2 = null; @@ -3993,9 +3634,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e53); - } + if (peg$silentFails === 0) { peg$fail(peg$e53); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4022,9 +3661,7 @@ function peg$parse(input, options) { peg$currPos += 4; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e55); - } + if (peg$silentFails === 0) { peg$fail(peg$e55); } } if (s1 === peg$FAILED) { if (input.substr(peg$currPos, 5) === peg$c39) { @@ -4032,9 +3669,7 @@ function peg$parse(input, options) { peg$currPos += 5; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e56); - } + if (peg$silentFails === 0) { peg$fail(peg$e56); } } } if (s1 !== peg$FAILED) { @@ -4045,9 +3680,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e54); - } + if (peg$silentFails === 0) { peg$fail(peg$e54); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4101,9 +3734,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e0); - } + if (peg$silentFails === 0) { peg$fail(peg$e0); } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -4112,9 +3743,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e57); - } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -4126,9 +3755,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s7 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e57); - } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s7 !== peg$FAILED) { s8 = peg$parse_nl(); @@ -4155,9 +3782,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s12 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e1); - } + if (peg$silentFails === 0) { peg$fail(peg$e1); } } if (s12 !== peg$FAILED) { peg$savedPos = s0; @@ -4197,9 +3822,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e0); - } + if (peg$silentFails === 0) { peg$fail(peg$e0); } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -4208,9 +3831,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e57); - } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -4222,9 +3843,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s7 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e57); - } + if (peg$silentFails === 0) { peg$fail(peg$e57); } } if (s7 !== peg$FAILED) { s8 = peg$parse_nl(); @@ -4236,9 +3855,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s11 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e1); - } + if (peg$silentFails === 0) { peg$fail(peg$e1); } } if (s11 !== peg$FAILED) { peg$savedPos = s0; @@ -4293,9 +3910,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e36); - } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -4304,9 +3919,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e38); - } + if (peg$silentFails === 0) { peg$fail(peg$e38); } } if (s3 !== peg$FAILED) { peg$savedPos = s0; @@ -4326,9 +3939,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e36); - } + if (peg$silentFails === 0) { peg$fail(peg$e36); } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -4340,9 +3951,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e38); - } + if (peg$silentFails === 0) { peg$fail(peg$e38); } } if (s5 !== peg$FAILED) { peg$savedPos = s0; @@ -4363,9 +3972,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e58); - } + if (peg$silentFails === 0) { peg$fail(peg$e58); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4396,9 +4003,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e6); - } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -4422,9 +4027,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e6); - } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -4471,9 +4074,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e0); - } + if (peg$silentFails === 0) { peg$fail(peg$e0); } } if (s1 !== peg$FAILED) { s2 = peg$parse_nl(); @@ -4485,9 +4086,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e1); - } + if (peg$silentFails === 0) { peg$fail(peg$e1); } } if (s5 !== peg$FAILED) { peg$savedPos = s0; @@ -4507,9 +4106,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e59); - } + if (peg$silentFails === 0) { peg$fail(peg$e59); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4540,9 +4137,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e6); - } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -4566,9 +4161,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s5 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e6); - } + if (peg$silentFails === 0) { peg$fail(peg$e6); } } if (s5 !== peg$FAILED) { s6 = peg$parse_nl(); @@ -4617,9 +4210,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e11); - } + if (peg$silentFails === 0) { peg$fail(peg$e11); } } if (s3 !== peg$FAILED) { s4 = peg$parse_nl(); @@ -4666,9 +4257,7 @@ function peg$parse(input, options) { } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e60); - } + if (peg$silentFails === 0) { peg$fail(peg$e60); } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4702,9 +4291,7 @@ function peg$parse(input, options) { } peg$silentFails--; s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e61); - } + if (peg$silentFails === 0) { peg$fail(peg$e61); } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4737,9 +4324,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e60); - } + if (peg$silentFails === 0) { peg$fail(peg$e60); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4779,9 +4364,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e62); - } + if (peg$silentFails === 0) { peg$fail(peg$e62); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4810,9 +4393,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e64); - } + if (peg$silentFails === 0) { peg$fail(peg$e64); } } if (s3 === peg$FAILED) { s3 = peg$parsecommentOrNewLine(); @@ -4825,9 +4406,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e64); - } + if (peg$silentFails === 0) { peg$fail(peg$e64); } } if (s3 === peg$FAILED) { s3 = peg$parsecommentOrNewLine(); @@ -4847,9 +4426,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e63); - } + if (peg$silentFails === 0) { peg$fail(peg$e63); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -4908,9 +4485,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e66); - } + if (peg$silentFails === 0) { peg$fail(peg$e66); } } if (s2 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 35) { @@ -4918,9 +4493,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e67); - } + if (peg$silentFails === 0) { peg$fail(peg$e67); } } } if (s2 !== peg$FAILED) { @@ -4930,9 +4503,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e68); - } + if (peg$silentFails === 0) { peg$fail(peg$e68); } } while (s4 !== peg$FAILED) { s3.push(s4); @@ -4941,9 +4512,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s4 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e68); - } + if (peg$silentFails === 0) { peg$fail(peg$e68); } } } s0 = s3; @@ -4954,9 +4523,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e65); - } + if (peg$silentFails === 0) { peg$fail(peg$e65); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -5005,9 +4572,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e70); - } + if (peg$silentFails === 0) { peg$fail(peg$e70); } } if (s1 !== peg$FAILED) { s2 = []; @@ -5016,9 +4581,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e71); - } + if (peg$silentFails === 0) { peg$fail(peg$e71); } } while (s3 !== peg$FAILED) { s2.push(s3); @@ -5027,9 +4590,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e71); - } + if (peg$silentFails === 0) { peg$fail(peg$e71); } } } if (input.substr(peg$currPos, 2) === peg$c45) { @@ -5037,9 +4598,7 @@ function peg$parse(input, options) { peg$currPos += 2; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e72); - } + if (peg$silentFails === 0) { peg$fail(peg$e72); } } if (s3 !== peg$FAILED) { s0 = s2; @@ -5054,9 +4613,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e69); - } + if (peg$silentFails === 0) { peg$fail(peg$e69); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -5081,9 +4638,7 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e73); - } + if (peg$silentFails === 0) { peg$fail(peg$e73); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -5109,16 +4664,12 @@ function peg$parse(input, options) { peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e75); - } + if (peg$silentFails === 0) { peg$fail(peg$e75); } } peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { - peg$fail(peg$e74); - } + if (peg$silentFails === 0) { peg$fail(peg$e74); } } peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; @@ -5147,5 +4698,5 @@ function peg$parse(input, options) { module.exports = { SyntaxError: peg$SyntaxError, - parse: peg$parse, + parse: peg$parse }; From d32b6bb615c2bbcd55169e73b97088332a3267f4 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 23 May 2022 07:10:38 -0400 Subject: [PATCH 213/340] rm generated output Value: [1e-10 to 1e-4] --- .../Reducer_Peggy_GeneratedParser.js | 4702 ----------------- 1 file changed, 4702 deletions(-) delete mode 100644 packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js deleted file mode 100644 index 67fa36a1..00000000 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ /dev/null @@ -1,4702 +0,0 @@ -// Generated by Peggy 1.2.0. -// -// https://peggyjs.org/ - -"use strict"; - - - var toFunction = { - '-': 'subtract', - '->': 'pipe', - '!=': 'unequal', - '.-': 'dotSubtract', - '.*': 'dotMultiply', - './': 'dotDivide', - '.^': 'dotPow', - '.+': 'dotAdd', - '*': 'multiply', - '/': 'divide', - '&&': 'and', - '^': 'pow', // or xor - '+': 'add', - '<': 'smaller', - '<=': 'smallerEq', - '==': 'equal', - '>': 'larger', - '>=': 'largerEq', - '||': 'or', - 'to': 'credibleIntervalToDistribution', - } - - var unaryToFunction = { - '-': 'unaryMinus', - '!': 'not', - '.-': 'unaryDotMinus', - } - - var postOperatorToFunction = { - '.': '$_atIndex_$', - '()': '$$_applyAll_$$', - '[]': '$_atIndex_$', - } - - function nodeBlock(statements) {return{type: 'Block', statements: statements}} - function nodeBoolean(value) {return {type: 'Boolean', value: value}} - function nodeCallIndentifier(value) {return {type: 'CallIdentifier', value: value}} - function nodeExpression(args) {return {type: 'Expression', nodes: args}} - function nodeFloat(value) {return {type: 'Float', value: value}} - function makeFunctionCall(fn, args) { - if (fn === '$$_applyAll_$$') { - // Any list of values is applied from left to right anyway. - // Like in Haskell and Lisp. - // So we remove the redundant $$_applyAll_$$. - if (args[0].type === "Identifier") {args[0].type = "CallIdentifier"} - return nodeExpression(args) - } else { - return nodeExpression([nodeCallIndentifier(fn), ...args]) - } - } - function nodeIdentifier(value) {return {type: 'Identifier', value: value}} - function nodeInteger(value) {return {type: 'Integer', value: value}} - function nodeKeyValue(key, value) { - if (key.type === 'Identifier') {key.type = 'String'} - return {type: 'KeyValue', key: key, value: value}} - function nodeLambda(args, body) {return {type: 'Lambda', args: args, body: body}} - function nodeLetStatment(variable, value) {return {type: 'LetStatement', variable: variable, value: value}} - function nodeString(value) {return {type: 'String', value: value}} - function nodeTernary(condition, trueExpression, falseExpression) {return {type: 'Ternary', condition: condition, trueExpression: trueExpression, falseExpression: falseExpression}} - - -function peg$subclass(child, parent) { - function C() { this.constructor = child; } - C.prototype = parent.prototype; - child.prototype = new C(); -} - -function peg$SyntaxError(message, expected, found, location) { - var self = Error.call(this, message); - if (Object.setPrototypeOf) { - Object.setPrototypeOf(self, peg$SyntaxError.prototype); - } - self.expected = expected; - self.found = found; - self.location = location; - self.name = "SyntaxError"; - return self; -} - -peg$subclass(peg$SyntaxError, Error); - -function peg$padEnd(str, targetLength, padString) { - padString = padString || " "; - if (str.length > targetLength) { return str; } - targetLength -= str.length; - padString += padString.repeat(targetLength); - return str + padString.slice(0, targetLength); -} - -peg$SyntaxError.prototype.format = function(sources) { - var str = "Error: " + this.message; - if (this.location) { - var src = null; - var k; - for (k = 0; k < sources.length; k++) { - if (sources[k].source === this.location.source) { - src = sources[k].text.split(/\r\n|\n|\r/g); - break; - } - } - var s = this.location.start; - var loc = this.location.source + ":" + s.line + ":" + s.column; - if (src) { - var e = this.location.end; - var filler = peg$padEnd("", s.line.toString().length); - var line = src[s.line - 1]; - var last = s.line === e.line ? e.column : line.length + 1; - str += "\n --> " + loc + "\n" - + filler + " |\n" - + s.line + " | " + line + "\n" - + filler + " | " + peg$padEnd("", s.column - 1) - + peg$padEnd("", last - s.column, "^"); - } else { - str += "\n at " + loc; - } - } - return str; -}; - -peg$SyntaxError.buildMessage = function(expected, found) { - var DESCRIBE_EXPECTATION_FNS = { - literal: function(expectation) { - return "\"" + literalEscape(expectation.text) + "\""; - }, - - class: function(expectation) { - var escapedParts = expectation.parts.map(function(part) { - return Array.isArray(part) - ? classEscape(part[0]) + "-" + classEscape(part[1]) - : classEscape(part); - }); - - return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]"; - }, - - any: function() { - return "any character"; - }, - - end: function() { - return "end of input"; - }, - - other: function(expectation) { - return expectation.description; - } - }; - - function hex(ch) { - return ch.charCodeAt(0).toString(16).toUpperCase(); - } - - function literalEscape(s) { - return s - .replace(/\\/g, "\\\\") - .replace(/"/g, "\\\"") - .replace(/\0/g, "\\0") - .replace(/\t/g, "\\t") - .replace(/\n/g, "\\n") - .replace(/\r/g, "\\r") - .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) - .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); - } - - function classEscape(s) { - return s - .replace(/\\/g, "\\\\") - .replace(/\]/g, "\\]") - .replace(/\^/g, "\\^") - .replace(/-/g, "\\-") - .replace(/\0/g, "\\0") - .replace(/\t/g, "\\t") - .replace(/\n/g, "\\n") - .replace(/\r/g, "\\r") - .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) - .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); - } - - function describeExpectation(expectation) { - return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation); - } - - function describeExpected(expected) { - var descriptions = expected.map(describeExpectation); - var i, j; - - descriptions.sort(); - - if (descriptions.length > 0) { - for (i = 1, j = 1; i < descriptions.length; i++) { - if (descriptions[i - 1] !== descriptions[i]) { - descriptions[j] = descriptions[i]; - j++; - } - } - descriptions.length = j; - } - - switch (descriptions.length) { - case 1: - return descriptions[0]; - - case 2: - return descriptions[0] + " or " + descriptions[1]; - - default: - return descriptions.slice(0, -1).join(", ") - + ", or " - + descriptions[descriptions.length - 1]; - } - } - - function describeFound(found) { - return found ? "\"" + literalEscape(found) + "\"" : "end of input"; - } - - return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found."; -}; - -function peg$parse(input, options) { - options = options !== undefined ? options : {}; - - var peg$FAILED = {}; - var peg$source = options.grammarSource; - - var peg$startRuleFunctions = { start: peg$parsestart }; - var peg$startRuleFunction = peg$parsestart; - - var peg$c0 = "{"; - var peg$c1 = "}"; - var peg$c2 = "("; - var peg$c3 = ")"; - var peg$c4 = "="; - var peg$c5 = ","; - var peg$c6 = "if"; - var peg$c7 = "then"; - var peg$c8 = "else"; - var peg$c9 = "?"; - var peg$c10 = ":"; - var peg$c11 = "||"; - var peg$c12 = "&&"; - var peg$c13 = "=="; - var peg$c14 = "!="; - var peg$c15 = "<="; - var peg$c16 = "<"; - var peg$c17 = ">="; - var peg$c18 = ">"; - var peg$c19 = "+"; - var peg$c20 = "-"; - var peg$c21 = ".+"; - var peg$c22 = ".-"; - var peg$c23 = "*"; - var peg$c24 = "/"; - var peg$c25 = ".*"; - var peg$c26 = "./"; - var peg$c27 = "^"; - var peg$c28 = ".^"; - var peg$c29 = "to"; - var peg$c30 = "->"; - var peg$c31 = "|>"; - var peg$c32 = "!"; - var peg$c33 = "["; - var peg$c34 = "."; - var peg$c35 = "]"; - var peg$c36 = "'"; - var peg$c37 = "\""; - var peg$c38 = "true"; - var peg$c39 = "false"; - var peg$c40 = "|"; - var peg$c41 = ";"; - var peg$c42 = "//"; - var peg$c43 = "#"; - var peg$c44 = "/*"; - var peg$c45 = "*/"; - - var peg$r0 = /^[_a-z]/; - var peg$r1 = /^[_a-z0-9]/i; - var peg$r2 = /^[$_a-z]/; - var peg$r3 = /^[$_a-z0-9]/i; - var peg$r4 = /^[^']/; - var peg$r5 = /^[^"]/; - var peg$r6 = /^[e]/i; - var peg$r7 = /^[0-9]/; - var peg$r8 = /^[^\r\n]/; - var peg$r9 = /^[^*]/; - var peg$r10 = /^[ \t]/; - var peg$r11 = /^[\n\r]/; - - var peg$e0 = peg$literalExpectation("{", false); - var peg$e1 = peg$literalExpectation("}", false); - var peg$e2 = peg$literalExpectation("(", false); - var peg$e3 = peg$literalExpectation(")", false); - var peg$e4 = peg$otherExpectation("assignment"); - var peg$e5 = peg$literalExpectation("=", false); - var peg$e6 = peg$literalExpectation(",", false); - var peg$e7 = peg$literalExpectation("if", false); - var peg$e8 = peg$literalExpectation("then", false); - var peg$e9 = peg$literalExpectation("else", false); - var peg$e10 = peg$literalExpectation("?", false); - var peg$e11 = peg$literalExpectation(":", false); - var peg$e12 = peg$otherExpectation("operator"); - var peg$e13 = peg$literalExpectation("||", false); - var peg$e14 = peg$literalExpectation("&&", false); - var peg$e15 = peg$literalExpectation("==", false); - var peg$e16 = peg$literalExpectation("!=", false); - var peg$e17 = peg$literalExpectation("<=", false); - var peg$e18 = peg$literalExpectation("<", false); - var peg$e19 = peg$literalExpectation(">=", false); - var peg$e20 = peg$literalExpectation(">", false); - var peg$e21 = peg$literalExpectation("+", false); - var peg$e22 = peg$literalExpectation("-", false); - var peg$e23 = peg$literalExpectation(".+", false); - var peg$e24 = peg$literalExpectation(".-", false); - var peg$e25 = peg$literalExpectation("*", false); - var peg$e26 = peg$literalExpectation("/", false); - var peg$e27 = peg$literalExpectation(".*", false); - var peg$e28 = peg$literalExpectation("./", false); - var peg$e29 = peg$literalExpectation("^", false); - var peg$e30 = peg$literalExpectation(".^", false); - var peg$e31 = peg$literalExpectation("to", false); - var peg$e32 = peg$literalExpectation("->", false); - var peg$e33 = peg$literalExpectation("|>", false); - var peg$e34 = peg$otherExpectation("unary operator"); - var peg$e35 = peg$literalExpectation("!", false); - var peg$e36 = peg$literalExpectation("[", false); - var peg$e37 = peg$literalExpectation(".", false); - var peg$e38 = peg$literalExpectation("]", false); - var peg$e39 = peg$otherExpectation("identifier"); - var peg$e40 = peg$classExpectation(["_", ["a", "z"]], false, false); - var peg$e41 = peg$classExpectation(["_", ["a", "z"], ["0", "9"]], false, true); - var peg$e42 = peg$otherExpectation("$identifier"); - var peg$e43 = peg$classExpectation(["$", "_", ["a", "z"]], false, false); - var peg$e44 = peg$classExpectation(["$", "_", ["a", "z"], ["0", "9"]], false, true); - var peg$e45 = peg$otherExpectation("string"); - var peg$e46 = peg$literalExpectation("'", false); - var peg$e47 = peg$classExpectation(["'"], true, false); - var peg$e48 = peg$literalExpectation("\"", false); - var peg$e49 = peg$classExpectation(["\""], true, false); - var peg$e50 = peg$otherExpectation("integer"); - var peg$e51 = peg$classExpectation(["e"], false, true); - var peg$e52 = peg$otherExpectation("float"); - var peg$e53 = peg$classExpectation([["0", "9"]], false, false); - var peg$e54 = peg$otherExpectation("boolean"); - var peg$e55 = peg$literalExpectation("true", false); - var peg$e56 = peg$literalExpectation("false", false); - var peg$e57 = peg$literalExpectation("|", false); - var peg$e58 = peg$otherExpectation("array"); - var peg$e59 = peg$otherExpectation("record"); - var peg$e60 = peg$otherExpectation("whitespace"); - var peg$e61 = peg$otherExpectation("optional whitespace or newline"); - var peg$e62 = peg$otherExpectation("whitespace or newline"); - var peg$e63 = peg$otherExpectation("statement separator"); - var peg$e64 = peg$literalExpectation(";", false); - var peg$e65 = peg$otherExpectation("line comment"); - var peg$e66 = peg$literalExpectation("//", false); - var peg$e67 = peg$literalExpectation("#", false); - var peg$e68 = peg$classExpectation(["\r", "\n"], true, false); - var peg$e69 = peg$otherExpectation("comment"); - var peg$e70 = peg$literalExpectation("/*", false); - var peg$e71 = peg$classExpectation(["*"], true, false); - var peg$e72 = peg$literalExpectation("*/", false); - var peg$e73 = peg$classExpectation([" ", "\t"], false, false); - var peg$e74 = peg$otherExpectation("newline"); - var peg$e75 = peg$classExpectation(["\n", "\r"], false, false); - - var peg$f0 = function(start) {return start}; - var peg$f1 = function(statements, finalExpression) { if (finalExpression != null) { statements.push(finalExpression) } - return nodeBlock(statements) }; - var peg$f2 = function(finalExpression) { return nodeBlock([finalExpression])}; - var peg$f3 = function(statements, finalExpression) { statements.push(finalExpression) - return nodeBlock(statements) }; - var peg$f4 = function(finalExpression) { return nodeBlock([finalExpression]) }; - var peg$f5 = function(head, tail) { return [head, ...tail] }; - var peg$f6 = function(head) { return [head] }; - var peg$f7 = function(variable, value) { return nodeLetStatment(variable, value) }; - var peg$f8 = function(variable, args, body) { var value = nodeLambda(args, body) - return nodeLetStatment(variable, value) }; - var peg$f9 = function(head, tail) { return [head, ...tail]; }; - var peg$f10 = function(condition, trueExpression, falseExpression) { return nodeTernary(condition, trueExpression, falseExpression) }; - var peg$f11 = function(head, operator, arg) {return {operator: operator, right: arg}}; - var peg$f12 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(toFunction[element.operator], [result, element.right]) - }, head)}; - var peg$f13 = function(left, operator, right) { return makeFunctionCall(toFunction[operator], [left, right])}; - var peg$f14 = function(head, chained) {return chained}; - var peg$f15 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(element.fnName, [result, ...element.args]) - }, head)}; - var peg$f16 = function(fn, args) { return {fnName: fn.value, args: args}}; - var peg$f17 = function(fn) { return {fnName: fn.value, args: []}}; - var peg$f18 = function(unaryOperator, right) { return makeFunctionCall(unaryToFunction[unaryOperator], [right])}; - var peg$f19 = function(head, arg) {return {fn: postOperatorToFunction['[]'], args: [arg]}}; - var peg$f20 = function(head, args) {return {fn: postOperatorToFunction['()'], args: args}}; - var peg$f21 = function(head, arg) {return {fn: postOperatorToFunction['[]'], args: [nodeString(arg)]}}; - var peg$f22 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(element.fn, [result, ...element.args]) - }, head)}; - var peg$f23 = function(head, arg) {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}}; - var peg$f24 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(element.fn, [result, ...element.args]) - }, head)}; - var peg$f25 = function(expression) {return expression}; - var peg$f26 = function() {return nodeIdentifier(text())}; - var peg$f27 = function(characters) {return nodeString(characters.join(''))}; - var peg$f28 = function() { return nodeInteger(parseInt(text()))}; - var peg$f29 = function() { return nodeFloat(parseFloat(text()))}; - var peg$f30 = function() { return nodeBoolean(text() === 'true')}; - var peg$f31 = function(args, statements, finalExpression) { statements.push(finalExpression) - return nodeLambda(args, nodeBlock(statements)) }; - var peg$f32 = function(args, finalExpression) { return nodeLambda(args, nodeBlock([finalExpression])) }; - var peg$f33 = function() { return makeFunctionCall('$_constructArray_$', [nodeExpression([])])}; - var peg$f34 = function(args) { return makeFunctionCall('$_constructArray_$', [nodeExpression(args)])}; - var peg$f35 = function(args) { return makeFunctionCall('$_constructRecord_$', [nodeExpression(args)])}; - var peg$f36 = function(key, value) { return nodeKeyValue(key, value)}; - - var peg$currPos = 0; - var peg$savedPos = 0; - var peg$posDetailsCache = [{ line: 1, column: 1 }]; - var peg$maxFailPos = 0; - var peg$maxFailExpected = []; - var peg$silentFails = 0; - - var peg$resultsCache = {}; - - var peg$result; - - if ("startRule" in options) { - if (!(options.startRule in peg$startRuleFunctions)) { - throw new Error("Can't start parsing from rule \"" + options.startRule + "\"."); - } - - peg$startRuleFunction = peg$startRuleFunctions[options.startRule]; - } - - function text() { - return input.substring(peg$savedPos, peg$currPos); - } - - function offset() { - return peg$savedPos; - } - - function range() { - return { - source: peg$source, - start: peg$savedPos, - end: peg$currPos - }; - } - - function location() { - return peg$computeLocation(peg$savedPos, peg$currPos); - } - - function expected(description, location) { - location = location !== undefined - ? location - : peg$computeLocation(peg$savedPos, peg$currPos); - - throw peg$buildStructuredError( - [peg$otherExpectation(description)], - input.substring(peg$savedPos, peg$currPos), - location - ); - } - - function error(message, location) { - location = location !== undefined - ? location - : peg$computeLocation(peg$savedPos, peg$currPos); - - throw peg$buildSimpleError(message, location); - } - - function peg$literalExpectation(text, ignoreCase) { - return { type: "literal", text: text, ignoreCase: ignoreCase }; - } - - function peg$classExpectation(parts, inverted, ignoreCase) { - return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase }; - } - - function peg$anyExpectation() { - return { type: "any" }; - } - - function peg$endExpectation() { - return { type: "end" }; - } - - function peg$otherExpectation(description) { - return { type: "other", description: description }; - } - - function peg$computePosDetails(pos) { - var details = peg$posDetailsCache[pos]; - var p; - - if (details) { - return details; - } else { - p = pos - 1; - while (!peg$posDetailsCache[p]) { - p--; - } - - details = peg$posDetailsCache[p]; - details = { - line: details.line, - column: details.column - }; - - while (p < pos) { - if (input.charCodeAt(p) === 10) { - details.line++; - details.column = 1; - } else { - details.column++; - } - - p++; - } - - peg$posDetailsCache[pos] = details; - - return details; - } - } - - function peg$computeLocation(startPos, endPos) { - var startPosDetails = peg$computePosDetails(startPos); - var endPosDetails = peg$computePosDetails(endPos); - - return { - source: peg$source, - start: { - offset: startPos, - line: startPosDetails.line, - column: startPosDetails.column - }, - end: { - offset: endPos, - line: endPosDetails.line, - column: endPosDetails.column - } - }; - } - - function peg$fail(expected) { - if (peg$currPos < peg$maxFailPos) { return; } - - if (peg$currPos > peg$maxFailPos) { - peg$maxFailPos = peg$currPos; - peg$maxFailExpected = []; - } - - peg$maxFailExpected.push(expected); - } - - function peg$buildSimpleError(message, location) { - return new peg$SyntaxError(message, null, null, location); - } - - function peg$buildStructuredError(expected, found, location) { - return new peg$SyntaxError( - peg$SyntaxError.buildMessage(expected, found), - expected, - found, - location - ); - } - - function peg$parsestart() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 67 + 0; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parse_nl(); - s2 = peg$parseouterBlock(); - if (s2 !== peg$FAILED) { - s3 = peg$parse_nl(); - s4 = peg$parsefinalComment(); - if (s4 === peg$FAILED) { - s4 = null; - } - peg$savedPos = s0; - s0 = peg$f0(s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsezeroOMoreArgumentsBlockOrExpression() { - var s0; - - var key = peg$currPos * 67 + 1; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parseinnerBlockOrExpression(); - if (s0 === peg$FAILED) { - s0 = peg$parselambda(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseouterBlock() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 67 + 2; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsearray_statements(); - if (s1 !== peg$FAILED) { - s2 = peg$currPos; - s3 = peg$parsestatementSeparator(); - if (s3 !== peg$FAILED) { - s4 = peg$parseexpression(); - if (s4 !== peg$FAILED) { - s2 = s4; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - if (s2 === peg$FAILED) { - s2 = null; - } - peg$savedPos = s0; - s0 = peg$f1(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parseexpression(); - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f2(s1); - } - s0 = s1; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseinnerBlockOrExpression() { - var s0, s1; - - var key = peg$currPos * 67 + 3; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parsequotedInnerBlock(); - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parseexpression(); - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f2(s1); - } - s0 = s1; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsequotedInnerBlock() { - var s0, s1, s2, s3, s4, s5, s6; - - var key = peg$currPos * 67 + 4; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parsearray_statements(); - if (s3 !== peg$FAILED) { - s4 = peg$currPos; - s5 = peg$parsestatementSeparator(); - if (s5 !== peg$FAILED) { - s6 = peg$parseexpression(); - if (s6 !== peg$FAILED) { - s4 = s6; - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - if (s4 !== peg$FAILED) { - s5 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 125) { - s6 = peg$c1; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s6 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f3(s3, s4); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parseexpression(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 125) { - s5 = peg$c1; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f4(s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearray_statements() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 67 + 5; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsestatement(); - if (s1 !== peg$FAILED) { - s2 = peg$currPos; - s3 = peg$parsestatementSeparator(); - if (s3 !== peg$FAILED) { - s4 = peg$parsearray_statements(); - if (s4 !== peg$FAILED) { - s2 = s4; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f5(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parsestatement(); - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f6(s1); - } - s0 = s1; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsestatement() { - var s0; - - var key = peg$currPos * 67 + 6; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parseletStatement(); - if (s0 === peg$FAILED) { - s0 = peg$parsedefunStatement(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseletStatement() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 67 + 7; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseidentifier(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_(); - s3 = peg$parseassignmentOp(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parsezeroOMoreArgumentsBlockOrExpression(); - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f7(s1, s5); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsedefunStatement() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - - var key = peg$currPos * 67 + 8; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseidentifier(); - if (s1 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 40) { - s2 = peg$c2; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s2 !== peg$FAILED) { - s3 = peg$parse_nl(); - s4 = peg$parsearray_parameters(); - if (s4 !== peg$FAILED) { - s5 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s6 = peg$c3; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_(); - s8 = peg$parseassignmentOp(); - if (s8 !== peg$FAILED) { - s9 = peg$parse_nl(); - s10 = peg$parseinnerBlockOrExpression(); - if (s10 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f8(s1, s4, s10); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseassignmentOp() { - var s0, s1; - - var key = peg$currPos * 67 + 9; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 61) { - s0 = peg$c4; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e5); } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e4); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearray_parameters() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 10; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsedollarIdentifier(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsedollarIdentifier(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsedollarIdentifier(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f9(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseexpression() { - var s0; - - var key = peg$currPos * 67 + 11; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parseifthenelse(); - if (s0 === peg$FAILED) { - s0 = peg$parseternary(); - if (s0 === peg$FAILED) { - s0 = peg$parselogicalAdditive(); - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseifthenelse() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11; - - var key = peg$currPos * 67 + 12; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c6) { - s1 = peg$c6; - peg$currPos += 2; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e7); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse__nl(); - if (s2 !== peg$FAILED) { - s3 = peg$parselogicalAdditive(); - if (s3 !== peg$FAILED) { - s4 = peg$parse__nl(); - if (s4 !== peg$FAILED) { - if (input.substr(peg$currPos, 4) === peg$c7) { - s5 = peg$c7; - peg$currPos += 4; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e8); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse__nl(); - if (s6 !== peg$FAILED) { - s7 = peg$parseinnerBlockOrExpression(); - if (s7 !== peg$FAILED) { - s8 = peg$parse__nl(); - if (s8 !== peg$FAILED) { - if (input.substr(peg$currPos, 4) === peg$c8) { - s9 = peg$c8; - peg$currPos += 4; - } else { - s9 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e9); } - } - if (s9 !== peg$FAILED) { - s10 = peg$parse__nl(); - if (s10 !== peg$FAILED) { - s11 = peg$parseifthenelse(); - if (s11 === peg$FAILED) { - s11 = peg$parseinnerBlockOrExpression(); - } - if (s11 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f10(s3, s7, s11); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseternary() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - - var key = peg$currPos * 67 + 13; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parselogicalAdditive(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 63) { - s3 = peg$c9; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e10); } - } - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parselogicalAdditive(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 58) { - s7 = peg$c10; - peg$currPos++; - } else { - s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e11); } - } - if (s7 !== peg$FAILED) { - s8 = peg$parse_nl(); - s9 = peg$parseternary(); - if (s9 === peg$FAILED) { - s9 = peg$parselogicalAdditive(); - } - if (s9 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f10(s1, s5, s9); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parselogicalAdditive() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 14; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parselogicalMultiplicative(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parselogicalAdditiveOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parselogicalMultiplicative(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parselogicalAdditiveOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parselogicalMultiplicative(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parselogicalAdditiveOp() { - var s0, s1; - - var key = peg$currPos * 67 + 15; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.substr(peg$currPos, 2) === peg$c11) { - s0 = peg$c11; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e13); } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parselogicalMultiplicative() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 16; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseequality(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parselogicalMultiplicativeOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseequality(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parselogicalMultiplicativeOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseequality(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parselogicalMultiplicativeOp() { - var s0, s1; - - var key = peg$currPos * 67 + 17; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.substr(peg$currPos, 2) === peg$c12) { - s0 = peg$c12; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e14); } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseequality() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 67 + 18; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parserelational(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_(); - s3 = peg$parseequalityOp(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parserelational(); - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f13(s1, s3, s5); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$parserelational(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseequalityOp() { - var s0, s1; - - var key = peg$currPos * 67 + 19; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.substr(peg$currPos, 2) === peg$c13) { - s0 = peg$c13; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e15); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c14) { - s0 = peg$c14; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e16); } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parserelational() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 67 + 20; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseadditive(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_(); - s3 = peg$parserelationalOp(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parseadditive(); - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f13(s1, s3, s5); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$parseadditive(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parserelationalOp() { - var s0, s1; - - var key = peg$currPos * 67 + 21; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.substr(peg$currPos, 2) === peg$c15) { - s0 = peg$c15; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e17); } - } - if (s0 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 60) { - s0 = peg$c16; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e18); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c17) { - s0 = peg$c17; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e19); } - } - if (s0 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 62) { - s0 = peg$c18; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e20); } - } - } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseadditive() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 22; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsemultiplicative(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parseadditiveOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsemultiplicative(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parseadditiveOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsemultiplicative(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseadditiveOp() { - var s0, s1; - - var key = peg$currPos * 67 + 23; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 43) { - s0 = peg$c19; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e21); } - } - if (s0 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 45) { - s0 = peg$c20; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c21) { - s0 = peg$c21; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e23); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c22) { - s0 = peg$c22; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e24); } - } - } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsemultiplicative() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 24; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsepower(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parsemultiplicativeOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsepower(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parsemultiplicativeOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsepower(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsemultiplicativeOp() { - var s0, s1; - - var key = peg$currPos * 67 + 25; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 42) { - s0 = peg$c23; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e25); } - } - if (s0 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 47) { - s0 = peg$c24; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e26); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c25) { - s0 = peg$c25; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e27); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c26) { - s0 = peg$c26; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e28); } - } - } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsepower() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 26; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsecredibleInterval(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parsepowerOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsecredibleInterval(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parsepowerOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsecredibleInterval(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsepowerOp() { - var s0, s1; - - var key = peg$currPos * 67 + 27; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 94) { - s0 = peg$c27; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e29); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c28) { - s0 = peg$c28; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e30); } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsecredibleInterval() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 28; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsechainFunctionCall(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - s5 = peg$parsecredibleIntervalOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse__nl(); - if (s6 !== peg$FAILED) { - s7 = peg$parsechainFunctionCall(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - s5 = peg$parsecredibleIntervalOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse__nl(); - if (s6 !== peg$FAILED) { - s7 = peg$parsechainFunctionCall(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsecredibleIntervalOp() { - var s0, s1; - - var key = peg$currPos * 67 + 29; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.substr(peg$currPos, 2) === peg$c29) { - s0 = peg$c29; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e31); } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsechainFunctionCall() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 30; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseunary(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c30) { - s5 = peg$c30; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e32); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c31) { - s5 = peg$c31; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } - } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsechainedFunction(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f14(s1, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c30) { - s5 = peg$c30; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e32); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c31) { - s5 = peg$c31; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } - } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsechainedFunction(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f14(s1, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f15(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsechainedFunction() { - var s0, s1, s2, s3, s4, s5, s6; - - var key = peg$currPos * 67 + 31; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsedollarIdentifier(); - if (s1 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 40) { - s2 = peg$c2; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s2 !== peg$FAILED) { - s3 = peg$parse_nl(); - s4 = peg$parsearray_functionArguments(); - if (s4 !== peg$FAILED) { - s5 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s6 = peg$c3; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s6 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f16(s1, s4); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parsedollarIdentifier(); - if (s1 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 40) { - s2 = peg$c2; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s2 !== peg$FAILED) { - s3 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s4 = peg$c3; - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s4 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f17(s1); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parsedollarIdentifier(); - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f17(s1); - } - s0 = s1; - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseunary() { - var s0, s1, s2, s3; - - var key = peg$currPos * 67 + 32; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseunaryOperator(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parseunary(); - if (s3 === peg$FAILED) { - s3 = peg$parseindexedValue(); - } - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f18(s1, s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$parseindexedValue(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseunaryOperator() { - var s0, s1; - - var key = peg$currPos * 67 + 33; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 45) { - s0 = peg$c20; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c22) { - s0 = peg$c22; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e24); } - } - if (s0 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 33) { - s0 = peg$c32; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } - } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseindexedValue() { - var s0; - - var key = peg$currPos * 67 + 34; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parsecollectionElement(); - if (s0 === peg$FAILED) { - s0 = peg$parserecordElement(); - if (s0 === peg$FAILED) { - s0 = peg$parseatom(); - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsecollectionElement() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - - var key = peg$currPos * 67 + 35; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseatom(); - if (s1 !== peg$FAILED) { - s2 = peg$currPos; - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 91) { - s3 = peg$c33; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - if (s3 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 40) { - s3 = peg$c2; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s3 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 46) { - s3 = peg$c34; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - } - } - peg$silentFails--; - if (s3 !== peg$FAILED) { - peg$currPos = s2; - s2 = undefined; - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = []; - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 91) { - s6 = peg$c33; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$parseexpression(); - if (s8 !== peg$FAILED) { - s9 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 93) { - s10 = peg$c35; - peg$currPos++; - } else { - s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } - } - if (s10 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f19(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - if (s4 === peg$FAILED) { - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 40) { - s6 = peg$c2; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$parsearray_functionArguments(); - if (s8 !== peg$FAILED) { - s9 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s10 = peg$c3; - peg$currPos++; - } else { - s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s10 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f20(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - if (s4 === peg$FAILED) { - s4 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 46) { - s5 = peg$c34; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s5 !== peg$FAILED) { - s6 = peg$currPos; - s7 = peg$parsedollarIdentifier(); - if (s7 !== peg$FAILED) { - s6 = input.substring(s6, peg$currPos); - } else { - s6 = s7; - } - if (s6 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f21(s1, s6); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 91) { - s6 = peg$c33; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$parseexpression(); - if (s8 !== peg$FAILED) { - s9 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 93) { - s10 = peg$c35; - peg$currPos++; - } else { - s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } - } - if (s10 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f19(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - if (s4 === peg$FAILED) { - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 40) { - s6 = peg$c2; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$parsearray_functionArguments(); - if (s8 !== peg$FAILED) { - s9 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s10 = peg$c3; - peg$currPos++; - } else { - s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s10 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f20(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - if (s4 === peg$FAILED) { - s4 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 46) { - s5 = peg$c34; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s5 !== peg$FAILED) { - s6 = peg$currPos; - s7 = peg$parsedollarIdentifier(); - if (s7 !== peg$FAILED) { - s6 = input.substring(s6, peg$currPos); - } else { - s6 = s7; - } - if (s6 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f21(s1, s6); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } - } - } - peg$savedPos = s0; - s0 = peg$f22(s1, s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearray_functionArguments() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 36; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseexpression(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseexpression(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseexpression(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f9(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parserecordElement() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - - var key = peg$currPos * 67 + 37; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsedollarIdentifier(); - if (s1 !== peg$FAILED) { - s2 = peg$currPos; - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 46) { - s3 = peg$c34; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - peg$silentFails--; - if (s3 !== peg$FAILED) { - peg$currPos = s2; - s2 = undefined; - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = []; - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 46) { - s6 = peg$c34; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$currPos; - s9 = peg$parsedollarIdentifier(); - if (s9 !== peg$FAILED) { - s8 = input.substring(s8, peg$currPos); - } else { - s8 = s9; - } - if (s8 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f23(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - while (s4 !== peg$FAILED) { - s3.push(s4); - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 46) { - s6 = peg$c34; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$currPos; - s9 = peg$parsedollarIdentifier(); - if (s9 !== peg$FAILED) { - s8 = input.substring(s8, peg$currPos); - } else { - s8 = s9; - } - if (s8 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f23(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f24(s1, s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseatom() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 67 + 38; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 40) { - s1 = peg$c2; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parseexpression(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s5 = peg$c3; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f25(s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$parsebasicValue(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsebasicValue() { - var s0; - - var key = peg$currPos * 67 + 39; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parsevalueConstructor(); - if (s0 === peg$FAILED) { - s0 = peg$parsebasicLiteral(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsebasicLiteral() { - var s0; - - var key = peg$currPos * 67 + 40; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parsestring(); - if (s0 === peg$FAILED) { - s0 = peg$parsefloat(); - if (s0 === peg$FAILED) { - s0 = peg$parseinteger(); - if (s0 === peg$FAILED) { - s0 = peg$parseboolean(); - if (s0 === peg$FAILED) { - s0 = peg$parsedollarIdentifier(); - } - } - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseidentifier() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 67 + 41; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$currPos; - s2 = []; - if (peg$r0.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } - } - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - if (peg$r0.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } - } - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = []; - if (peg$r1.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - if (peg$r1.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } - } - } - s2 = [s2, s3]; - s1 = s2; - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f26(); - } - s0 = s1; - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e39); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsedollarIdentifier() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 67 + 42; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$currPos; - s2 = []; - if (peg$r2.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } - } - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - if (peg$r2.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } - } - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = []; - if (peg$r3.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - if (peg$r3.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } - } - } - s2 = [s2, s3]; - s1 = s2; - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f26(); - } - s0 = s1; - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e42); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsestring() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 67 + 43; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 39) { - s2 = peg$c36; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } - } - if (s2 !== peg$FAILED) { - s3 = []; - if (peg$r4.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - if (peg$r4.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } - } - } - if (input.charCodeAt(peg$currPos) === 39) { - s4 = peg$c36; - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } - } - if (s4 !== peg$FAILED) { - s1 = s3; - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f27(s1); - } - s0 = s1; - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 34) { - s2 = peg$c37; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } - } - if (s2 !== peg$FAILED) { - s3 = []; - if (peg$r5.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - if (peg$r5.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } - } - } - if (input.charCodeAt(peg$currPos) === 34) { - s4 = peg$c37; - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } - } - if (s4 !== peg$FAILED) { - s1 = s3; - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f27(s1); - } - s0 = s1; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseinteger() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 67 + 44; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = []; - s2 = peg$parsed(); - if (s2 !== peg$FAILED) { - while (s2 !== peg$FAILED) { - s1.push(s2); - s2 = peg$parsed(); - } - } else { - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - s2 = peg$currPos; - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 46) { - s3 = peg$c34; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - peg$silentFails--; - if (s3 === peg$FAILED) { - s2 = undefined; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = peg$currPos; - peg$silentFails++; - if (peg$r6.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } - } - peg$silentFails--; - if (s4 === peg$FAILED) { - s3 = undefined; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f28(); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e50); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsefloat() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 45; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$currPos; - s2 = peg$currPos; - s3 = peg$currPos; - s4 = []; - s5 = peg$parsed(); - if (s5 !== peg$FAILED) { - while (s5 !== peg$FAILED) { - s4.push(s5); - s5 = peg$parsed(); - } - } else { - s4 = peg$FAILED; - } - if (s4 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 46) { - s5 = peg$c34; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s5 !== peg$FAILED) { - s6 = []; - s7 = peg$parsed(); - while (s7 !== peg$FAILED) { - s6.push(s7); - s7 = peg$parsed(); - } - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - if (s3 === peg$FAILED) { - s3 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 46) { - s4 = peg$c34; - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s4 !== peg$FAILED) { - s5 = []; - s6 = peg$parsed(); - if (s6 !== peg$FAILED) { - while (s6 !== peg$FAILED) { - s5.push(s6); - s6 = peg$parsed(); - } - } else { - s5 = peg$FAILED; - } - if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - if (s3 !== peg$FAILED) { - s4 = peg$parsefloatExponent(); - if (s4 === peg$FAILED) { - s4 = null; - } - s3 = [s3, s4]; - s2 = s3; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - if (s2 === peg$FAILED) { - s2 = peg$currPos; - s3 = []; - s4 = peg$parsed(); - if (s4 !== peg$FAILED) { - while (s4 !== peg$FAILED) { - s3.push(s4); - s4 = peg$parsed(); - } - } else { - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - s4 = peg$parsefloatExponent(); - if (s4 !== peg$FAILED) { - s3 = [s3, s4]; - s2 = s3; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } - if (s2 !== peg$FAILED) { - s1 = input.substring(s1, peg$currPos); - } else { - s1 = s2; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f29(); - } - s0 = s1; - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e52); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsefloatExponent() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 67 + 46; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - if (peg$r6.test(input.charAt(peg$currPos))) { - s1 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } - } - if (s1 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 45) { - s2 = peg$c20; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } - } - if (s2 === peg$FAILED) { - s2 = null; - } - s3 = []; - s4 = peg$parsed(); - if (s4 !== peg$FAILED) { - while (s4 !== peg$FAILED) { - s3.push(s4); - s4 = peg$parsed(); - } - } else { - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - s1 = [s1, s2, s3]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsed() { - var s0; - - var key = peg$currPos * 67 + 47; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - if (peg$r7.test(input.charAt(peg$currPos))) { - s0 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e53); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseboolean() { - var s0, s1; - - var key = peg$currPos * 67 + 48; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - if (input.substr(peg$currPos, 4) === peg$c38) { - s1 = peg$c38; - peg$currPos += 4; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e55); } - } - if (s1 === peg$FAILED) { - if (input.substr(peg$currPos, 5) === peg$c39) { - s1 = peg$c39; - peg$currPos += 5; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e56); } - } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f30(); - } - s0 = s1; - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsevalueConstructor() { - var s0; - - var key = peg$currPos * 67 + 49; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parserecordConstructor(); - if (s0 === peg$FAILED) { - s0 = peg$parsearrayConstructor(); - if (s0 === peg$FAILED) { - s0 = peg$parselambda(); - if (s0 === peg$FAILED) { - s0 = peg$parsequotedInnerBlock(); - } - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parselambda() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12; - - var key = peg$currPos * 67 + 50; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 124) { - s3 = peg$c40; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } - } - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parsearray_parameters(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 124) { - s7 = peg$c40; - peg$currPos++; - } else { - s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } - } - if (s7 !== peg$FAILED) { - s8 = peg$parse_nl(); - s9 = peg$parsearray_statements(); - if (s9 !== peg$FAILED) { - s10 = peg$currPos; - s11 = peg$parsestatementSeparator(); - if (s11 !== peg$FAILED) { - s12 = peg$parseexpression(); - if (s12 !== peg$FAILED) { - s10 = s12; - } else { - peg$currPos = s10; - s10 = peg$FAILED; - } - } else { - peg$currPos = s10; - s10 = peg$FAILED; - } - if (s10 !== peg$FAILED) { - s11 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 125) { - s12 = peg$c1; - peg$currPos++; - } else { - s12 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s12 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f31(s5, s9, s10); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 124) { - s3 = peg$c40; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } - } - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parsearray_parameters(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 124) { - s7 = peg$c40; - peg$currPos++; - } else { - s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } - } - if (s7 !== peg$FAILED) { - s8 = peg$parse_nl(); - s9 = peg$parseexpression(); - if (s9 !== peg$FAILED) { - s10 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 125) { - s11 = peg$c1; - peg$currPos++; - } else { - s11 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s11 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f32(s5, s9); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearrayConstructor() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 67 + 51; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 91) { - s1 = peg$c33; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 93) { - s3 = peg$c35; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } - } - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f33(); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 91) { - s1 = peg$c33; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parsearray_elements(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 93) { - s5 = peg$c35; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } - } - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f34(s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e58); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearray_elements() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 52; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseexpression(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseexpression(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseexpression(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f9(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parserecordConstructor() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 67 + 53; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parsearray_recordArguments(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 125) { - s5 = peg$c1; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f35(s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e59); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearray_recordArguments() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 67 + 54; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsekeyValuePair(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsekeyValuePair(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsekeyValuePair(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f9(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsekeyValuePair() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 67 + 55; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseexpression(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 58) { - s3 = peg$c10; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e11); } - } - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parseexpression(); - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f36(s1, s5); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parse_() { - var s0, s1; - - var key = peg$currPos * 67 + 56; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = []; - s1 = peg$parsewhiteSpaceCharactersOrComment(); - while (s1 !== peg$FAILED) { - s0.push(s1); - s1 = peg$parsewhiteSpaceCharactersOrComment(); - } - peg$silentFails--; - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parse_nl() { - var s0, s1; - - var key = peg$currPos * 67 + 57; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = []; - s1 = peg$parsewhiteSpaceCharactersOrComment(); - if (s1 === peg$FAILED) { - s1 = peg$parsecommentOrNewLine(); - } - while (s1 !== peg$FAILED) { - s0.push(s1); - s1 = peg$parsewhiteSpaceCharactersOrComment(); - if (s1 === peg$FAILED) { - s1 = peg$parsecommentOrNewLine(); - } - } - peg$silentFails--; - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e61); } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parse__() { - var s0, s1; - - var key = peg$currPos * 67 + 58; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = []; - s1 = peg$parsewhiteSpaceCharactersOrComment(); - if (s1 !== peg$FAILED) { - while (s1 !== peg$FAILED) { - s0.push(s1); - s1 = peg$parsewhiteSpaceCharactersOrComment(); - } - } else { - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parse__nl() { - var s0, s1; - - var key = peg$currPos * 67 + 59; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = []; - s1 = peg$parsewhiteSpaceCharactersOrComment(); - if (s1 === peg$FAILED) { - s1 = peg$parsecommentOrNewLine(); - } - if (s1 !== peg$FAILED) { - while (s1 !== peg$FAILED) { - s0.push(s1); - s1 = peg$parsewhiteSpaceCharactersOrComment(); - if (s1 === peg$FAILED) { - s1 = peg$parsecommentOrNewLine(); - } - } - } else { - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e62); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsestatementSeparator() { - var s0, s1, s2, s3; - - var key = peg$currPos * 67 + 60; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$parse_(); - s2 = []; - if (input.charCodeAt(peg$currPos) === 59) { - s3 = peg$c41; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } - } - if (s3 === peg$FAILED) { - s3 = peg$parsecommentOrNewLine(); - } - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - if (input.charCodeAt(peg$currPos) === 59) { - s3 = peg$c41; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } - } - if (s3 === peg$FAILED) { - s3 = peg$parsecommentOrNewLine(); - } - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = peg$parse_nl(); - s1 = [s1, s2, s3]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e63); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsecommentOrNewLine() { - var s0, s1, s2; - - var key = peg$currPos * 67 + 61; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsefinalComment(); - if (s1 === peg$FAILED) { - s1 = null; - } - s2 = peg$parsenewLine(); - if (s2 !== peg$FAILED) { - s1 = [s1, s2]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsefinalComment() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 67 + 62; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c42) { - s2 = peg$c42; - peg$currPos += 2; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e66); } - } - if (s2 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 35) { - s2 = peg$c43; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e67); } - } - } - if (s2 !== peg$FAILED) { - s3 = []; - if (peg$r8.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - if (peg$r8.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } - } - } - s0 = s3; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e65); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsewhiteSpaceCharactersOrComment() { - var s0; - - var key = peg$currPos * 67 + 63; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parsewhiteSpaceCharacters(); - if (s0 === peg$FAILED) { - s0 = peg$parsedelimitedComment(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsedelimitedComment() { - var s0, s1, s2, s3; - - var key = peg$currPos * 67 + 64; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c44) { - s1 = peg$c44; - peg$currPos += 2; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e70); } - } - if (s1 !== peg$FAILED) { - s2 = []; - if (peg$r9.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } - } - while (s3 !== peg$FAILED) { - s2.push(s3); - if (peg$r9.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } - } - } - if (input.substr(peg$currPos, 2) === peg$c45) { - s3 = peg$c45; - peg$currPos += 2; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e72); } - } - if (s3 !== peg$FAILED) { - s0 = s2; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e69); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsewhiteSpaceCharacters() { - var s0; - - var key = peg$currPos * 67 + 65; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - if (peg$r10.test(input.charAt(peg$currPos))) { - s0 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e73); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsenewLine() { - var s0, s1; - - var key = peg$currPos * 67 + 66; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (peg$r11.test(input.charAt(peg$currPos))) { - s0 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e75); } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e74); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - peg$result = peg$startRuleFunction(); - - if (peg$result !== peg$FAILED && peg$currPos === input.length) { - return peg$result; - } else { - if (peg$result !== peg$FAILED && peg$currPos < input.length) { - peg$fail(peg$endExpectation()); - } - - throw peg$buildStructuredError( - peg$maxFailExpected, - peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null, - peg$maxFailPos < input.length - ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1) - : peg$computeLocation(peg$maxFailPos, peg$maxFailPos) - ); - } -} - -module.exports = { - SyntaxError: peg$SyntaxError, - parse: peg$parse -}; From 8b0b4392076fbbb6bb5932b94227d41d70a5ceb3 Mon Sep 17 00:00:00 2001 From: Quinn Dougherty Date: Mon, 23 May 2022 07:11:56 -0400 Subject: [PATCH 214/340] `.prettierignore` at base level for generated parser Value: [1e-10 to 1e-5] --- .prettierignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.prettierignore b/.prettierignore index 54df33a4..903390ad 100644 --- a/.prettierignore +++ b/.prettierignore @@ -11,3 +11,4 @@ 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 From 5762fb6ea905bff34dcc42533e7bcddfab357d76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 14:21:04 +0000 Subject: [PATCH 215/340] :arrow_up: Bump @storybook/node-logger from 6.5.3 to 6.5.4 Bumps [@storybook/node-logger](https://github.com/storybookjs/storybook/tree/HEAD/lib/node-logger) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.4/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.4/lib/node-logger) --- updated-dependencies: - dependency-name: "@storybook/node-logger" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index ad9f2e63..0b822612 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -23,7 +23,7 @@ "@storybook/addon-links": "^6.5.3", "@storybook/builder-webpack5": "^6.5.3", "@storybook/manager-webpack5": "^6.5.3", - "@storybook/node-logger": "^6.4.22", + "@storybook/node-logger": "^6.5.4", "@storybook/preset-create-react-app": "^4.1.0", "@storybook/react": "^6.5.3", "@testing-library/jest-dom": "^5.16.4", diff --git a/yarn.lock b/yarn.lock index 3ba8e213..ddcb7c7a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3423,7 +3423,7 @@ prettier ">=2.2.1 <=2.3.0" ts-dedent "^2.0.0" -"@storybook/node-logger@6.5.3", "@storybook/node-logger@^6.4.22": +"@storybook/node-logger@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.3.tgz#6917bbbdaf2bb3b191bafadfe4f19c3ea3cbfa61" integrity sha512-iG4uQJCtuT54p3zg0zJ7+ALPUrt7PTAXmXqN7ak/9YcWbnwtMlHgg8oTlCebwr+E3QPCMauJM2eLzC6F7bI76w== @@ -3434,6 +3434,17 @@ npmlog "^5.0.1" pretty-hrtime "^1.0.3" +"@storybook/node-logger@^6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.4.tgz#1887abd364fd401ac7b76b313f92f12005a28c6f" + integrity sha512-2rK9oTBhvRm4VOr1ywIWXfWEXVbuV7wGdZu4hpSDlkhnBBFCyYBJH9asEJVoB4Qk77HPMCqkw2IHpstVjkASXQ== + dependencies: + "@types/npmlog" "^4.1.2" + chalk "^4.1.0" + core-js "^3.8.2" + npmlog "^5.0.1" + pretty-hrtime "^1.0.3" + "@storybook/postinstall@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.3.tgz#ba815b7590d0fe8ee8626e62ddd3f729264aa464" From 599bf248ea18f2de6fe87f769df24b031af49b13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 14:24:05 +0000 Subject: [PATCH 216/340] :arrow_up: Bump ts-node from 10.7.0 to 10.8.0 Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 10.7.0 to 10.8.0. - [Release notes](https://github.com/TypeStrong/ts-node/releases) - [Commits](https://github.com/TypeStrong/ts-node/compare/v10.7.0...v10.8.0) --- updated-dependencies: - dependency-name: ts-node dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/squiggle-lang/package.json | 2 +- yarn.lock | 37 ++++++++++++++++------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index e751979b..d92c18d9 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -61,7 +61,7 @@ "rescript-fast-check": "^1.1.1", "ts-jest": "^27.1.4", "ts-loader": "^9.3.0", - "ts-node": "^10.7.0", + "ts-node": "^10.8.0", "typescript": "^4.6.3", "webpack": "^5.72.1", "webpack-cli": "^4.9.2" diff --git a/yarn.lock b/yarn.lock index 3ba8e213..a23c5c0b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1301,17 +1301,12 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@cspotcode/source-map-consumer@0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" - integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg== - -"@cspotcode/source-map-support@0.7.0": - version "0.7.0" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5" - integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA== +"@cspotcode/source-map-support@^0.8.0": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" + integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== dependencies: - "@cspotcode/source-map-consumer" "0.8.0" + "@jridgewell/trace-mapping" "0.3.9" "@csstools/normalize.css@*": version "12.0.0" @@ -2146,6 +2141,14 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== +"@jridgewell/trace-mapping@0.3.9": + version "0.3.9" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" + integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping@^0.3.7", "@jridgewell/trace-mapping@^0.3.9": version "0.3.11" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.11.tgz#eb2e124521f27673493030d02dffedf60e56553f" @@ -16648,12 +16651,12 @@ ts-loader@^9.3.0: micromatch "^4.0.0" semver "^7.3.4" -ts-node@^10.7.0: - version "10.7.0" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5" - integrity sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A== +ts-node@^10.8.0: + version "10.8.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.8.0.tgz#3ceb5ac3e67ae8025c1950626aafbdecb55d82ce" + integrity sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA== dependencies: - "@cspotcode/source-map-support" "0.7.0" + "@cspotcode/source-map-support" "^0.8.0" "@tsconfig/node10" "^1.0.7" "@tsconfig/node12" "^1.0.7" "@tsconfig/node14" "^1.0.0" @@ -16664,7 +16667,7 @@ ts-node@^10.7.0: create-require "^1.1.0" diff "^4.0.1" make-error "^1.1.1" - v8-compile-cache-lib "^3.0.0" + v8-compile-cache-lib "^3.0.1" yn "3.1.1" ts-pnp@^1.1.6: @@ -17176,7 +17179,7 @@ uuid@^8.0.0, uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -v8-compile-cache-lib@^3.0.0: +v8-compile-cache-lib@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== From 9ae12c5227704e42da6c7b1aea71470bc85de0f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 14:52:43 +0000 Subject: [PATCH 217/340] :arrow_up: Bump @storybook/addon-links from 6.5.3 to 6.5.4 Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.4/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.4/addons/links) --- updated-dependencies: - dependency-name: "@storybook/addon-links" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 98 +++++++++++++++++++++++++++++--- 2 files changed, 91 insertions(+), 9 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 0b822612..2f084f5e 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -20,7 +20,7 @@ "@babel/plugin-proposal-private-property-in-object": "^7.17.12", "@storybook/addon-actions": "^6.5.3", "@storybook/addon-essentials": "^6.5.3", - "@storybook/addon-links": "^6.5.3", + "@storybook/addon-links": "^6.5.4", "@storybook/builder-webpack5": "^6.5.3", "@storybook/manager-webpack5": "^6.5.3", "@storybook/node-logger": "^6.5.4", diff --git a/yarn.lock b/yarn.lock index ddcb7c7a..24db6956 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2842,16 +2842,16 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-links@^6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.3.tgz#5eae9855e19cc03548aa6655756886c26557a175" - integrity sha512-FOcrHbEi8Bw6QE3hzO0vtnJVFj2iIiQk0thEdkhq+Pnn5iZ6VmDoctHPwc2wuyM7BIKDlROaK0VRXYLCx6uiBg== +"@storybook/addon-links@^6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.4.tgz#51e2944ba2ba45d70b6debacbc0f5d8ad664f62b" + integrity sha512-mJcg4Gpo7P6TFdyWpE2DQcMwSjfotPST3y713Ircgc+sYOouIPRdrxGpdvhLWWncsC5wK/z2xZyYtBWPNiKN/g== dependencies: - "@storybook/addons" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/core-events" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/core-events" "6.5.4" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/router" "6.5.3" + "@storybook/router" "6.5.4" "@types/qs" "^6.9.5" core-js "^3.8.2" global "^4.4.0" @@ -2937,6 +2937,23 @@ global "^4.4.0" regenerator-runtime "^0.13.7" +"@storybook/addons@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.5.4.tgz#10cf41ab8aa3c509963599092fe8f3cf9a15edb6" + integrity sha512-biPtPQ80HwVJeJl6ghF0yFMWZ9apuh+oxCWezeb9t0lr7EB8MLbZAGz8PbRerwDzV+mW4ZNV2RSvvnDD5MH/zg== + dependencies: + "@storybook/api" "6.5.4" + "@storybook/channels" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/core-events" "6.5.4" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/router" "6.5.4" + "@storybook/theming" "6.5.4" + "@types/webpack-env" "^1.16.0" + core-js "^3.8.2" + global "^4.4.0" + regenerator-runtime "^0.13.7" + "@storybook/api@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.3.tgz#f4c468f348bf6ac65dc571f3e65d67302323312c" @@ -2960,6 +2977,29 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/api@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.4.tgz#faa06cde4990fd3b2be551ff869fc44a80e66e53" + integrity sha512-nZAf7/6bcOMb6yDYsCr2rWZuKtGfHQhyVvlW7uD1uPVytQ0OHS/D215C2odTNvIRxTiG67dQ4zeXcZPHHar+qQ== + dependencies: + "@storybook/channels" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/core-events" "6.5.4" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/router" "6.5.4" + "@storybook/semver" "^7.3.2" + "@storybook/theming" "6.5.4" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + regenerator-runtime "^0.13.7" + store2 "^2.12.0" + telejson "^6.0.8" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/builder-webpack4@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.3.tgz#5e99a009c0132380620a1d177a69a5f352ef6d29" @@ -3090,6 +3130,15 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/channels@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.4.tgz#a3fdc20d45cf4aa74b5310e5e4eb111e353a408a" + integrity sha512-I78N4AIipaD5mrkh5p3Yiu4iim2G3Ci7N8Y7UeRtQ4TJJzSAEuYMm7ydlpmoEM6G+4+hdU0lG2GjaeWNkIFvtA== + dependencies: + core-js "^3.8.2" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/client-api@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.3.tgz#ca7b5ddb9e745b1485d8946dd14d1e81173dd712" @@ -3124,6 +3173,14 @@ core-js "^3.8.2" global "^4.4.0" +"@storybook/client-logger@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.4.tgz#57348015276e0453675968f6ca31d908ceb498ae" + integrity sha512-8z5cdocpLW2bK6lTGdlBoX8njmNLTd9rrzSEIYRtobAbWjyfB6leCY6F79OVDZCXGsXIOrx/e1fwzioCT/sJSQ== + dependencies: + core-js "^3.8.2" + global "^4.4.0" + "@storybook/components@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.3.tgz#8d643d2d89c298e5e5c2957f7ffb171ba3288ecf" @@ -3228,6 +3285,13 @@ dependencies: core-js "^3.8.2" +"@storybook/core-events@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.4.tgz#0c68ee42ac5afcc8ee7b56cd057d9a90d244067c" + integrity sha512-b03mPlzfX/TkeKqi7cgFzRof80dBb98w7ui6x0GzIXXcG/O0KebzqZ41/vXQICwsbkAIp5JQdkTEq9RUOh/KCg== + dependencies: + core-js "^3.8.2" + "@storybook/core-server@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.3.tgz#6c6168ec74f07594b48b248ae53454745945b37e" @@ -3549,6 +3613,15 @@ core-js "^3.8.2" regenerator-runtime "^0.13.7" +"@storybook/router@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.5.4.tgz#575f4ae36629086622a8b41626226ba4da025bb7" + integrity sha512-Xw0oYaJSxd/zPUiZw8AoQRCdrePuxsn1XwlDvzfNlMnPnU17LAFzVf8kpHPXvx01F9pLnGI4ZggsjVomHy/E1Q== + dependencies: + "@storybook/client-logger" "6.5.4" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + "@storybook/semver@^7.3.2": version "7.3.2" resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0" @@ -3621,6 +3694,15 @@ core-js "^3.8.2" regenerator-runtime "^0.13.7" +"@storybook/theming@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.5.4.tgz#3be001bf425f682f6e16ce3581e8cd109c85f8ea" + integrity sha512-J5ipCqKH8FfMVj8SuVsjxSIYgb9GN8NBsVAVvTakVjqyKnv5znR+w+h0lvyzRNaEnF5LQCy7Uj7DE6+Pbg/wPw== + dependencies: + "@storybook/client-logger" "6.5.4" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + "@storybook/ui@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.3.tgz#afa7a327c71350e9f92628b86c7f14d58427ec3c" From 63bff23ac14d5bdc10af484cc4d1662445d2302f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 14:58:38 +0000 Subject: [PATCH 218/340] :arrow_up: Bump @storybook/manager-webpack5 from 6.5.3 to 6.5.4 Bumps [@storybook/manager-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.4/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.4/lib/core) --- updated-dependencies: - dependency-name: "@storybook/manager-webpack5" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 230 +++++++++++++++++++++++++++++-- 2 files changed, 220 insertions(+), 12 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 2f084f5e..db303d94 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -22,7 +22,7 @@ "@storybook/addon-essentials": "^6.5.3", "@storybook/addon-links": "^6.5.4", "@storybook/builder-webpack5": "^6.5.3", - "@storybook/manager-webpack5": "^6.5.3", + "@storybook/manager-webpack5": "^6.5.4", "@storybook/node-logger": "^6.5.4", "@storybook/preset-create-react-app": "^4.1.0", "@storybook/react": "^6.5.3", diff --git a/yarn.lock b/yarn.lock index 3b635c88..bffe411b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3113,6 +3113,19 @@ qs "^6.10.0" telejson "^6.0.8" +"@storybook/channel-postmessage@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.5.4.tgz#246483250e0e538d7455630d560149b1e974c5d3" + integrity sha512-K9UG32KRXB4YKg9/WpyE6aoWBjOI2+XkFbjab9FEpI7zxJSEjKlOIqJk1uE9Xm+oWNvj80MvwD9ecGtJtw9BsA== + dependencies: + "@storybook/channels" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/core-events" "6.5.4" + core-js "^3.8.2" + global "^4.4.0" + qs "^6.10.0" + telejson "^6.0.8" + "@storybook/channel-websocket@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.3.tgz#3403d30c107763db311b084a0f6586c755ca64f0" @@ -3124,6 +3137,17 @@ global "^4.4.0" telejson "^6.0.8" +"@storybook/channel-websocket@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.4.tgz#659dac59649240ce9d9e74a84bcc28c9f359f62e" + integrity sha512-BQtN7ZVoeUUIDtQdsnVCOzKIfpODAIW4IQ8cEuYeHiQDuGWW0+4MuVP5fzfHVugXRoQEF+OBxP8YcVVgeakyQg== + dependencies: + "@storybook/channels" "6.5.4" + "@storybook/client-logger" "6.5.4" + core-js "^3.8.2" + global "^4.4.0" + telejson "^6.0.8" + "@storybook/channels@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.3.tgz#d1c94f1760a27026d16705ab28a82e582cf9f2d5" @@ -3168,6 +3192,32 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/client-api@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.4.tgz#e79418ffb21857deb98f5b7fd88dfe23ef12cfe7" + integrity sha512-2QMcjXBOxGiqcBWqZu/v1lXSiT8jRCiHL8yiUncYK57rRwB6xltX43CcY9IZRnq2iNtQ+BfrWV6RgtbIa9mHhg== + dependencies: + "@storybook/addons" "6.5.4" + "@storybook/channel-postmessage" "6.5.4" + "@storybook/channels" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/core-events" "6.5.4" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.4" + "@types/qs" "^6.9.5" + "@types/webpack-env" "^1.16.0" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + store2 "^2.12.0" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/client-logger@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.3.tgz#4794e87d85c03aa6e38efc4c5775b9680cc1bf23" @@ -3199,6 +3249,21 @@ regenerator-runtime "^0.13.7" util-deprecate "^1.0.2" +"@storybook/components@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.4.tgz#8afdbba252ab957ba53318b34cb2593da964747b" + integrity sha512-FCJJm2r/OzW3QvavTCdHZeTubJkbNJeoiGKeZs9kMYSgDZAr4cDUr1xUl30Hw57Uy3TCY9gnYdtGZgCP1tQiLw== + dependencies: + "@storybook/client-logger" "6.5.4" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/theming" "6.5.4" + "@types/react-syntax-highlighter" "11.0.5" + core-js "^3.8.2" + qs "^6.10.0" + react-syntax-highlighter "^15.4.5" + regenerator-runtime "^0.13.7" + util-deprecate "^1.0.2" + "@storybook/core-client@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.3.tgz#9c689a5f6797dc7afe60183c29502e496bbd0a07" @@ -3225,6 +3290,32 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" +"@storybook/core-client@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.4.tgz#ab5eaa68c78c3e8816ea240afeea0887e2f68708" + integrity sha512-0rlQ5reKuCeFwqXdicPSLX/0ISAoEpVQgmBEosGt+1knRUfzS/IdLaBO+ZEwh+ajldFo3k9JfZOfxBOFqPMhsg== + dependencies: + "@storybook/addons" "6.5.4" + "@storybook/channel-postmessage" "6.5.4" + "@storybook/channel-websocket" "6.5.4" + "@storybook/client-api" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/core-events" "6.5.4" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/preview-web" "6.5.4" + "@storybook/store" "6.5.4" + "@storybook/ui" "6.5.4" + airbnb-js-shims "^2.2.1" + ansi-to-html "^0.6.11" + core-js "^3.8.2" + global "^4.4.0" + lodash "^4.17.21" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + ts-dedent "^2.0.0" + unfetch "^4.2.0" + util-deprecate "^1.0.2" + "@storybook/core-common@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.3.tgz#5892e1ebc77f11b1058b716cb514bc2d1d5636ef" @@ -3281,6 +3372,62 @@ util-deprecate "^1.0.2" webpack "4" +"@storybook/core-common@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.4.tgz#e77f48a2c93b5eb656a3ad6dd0c01903ba7e57f3" + integrity sha512-JJ9PJr8FRUfTVC9KvkTl+K1Fut1hxMOJYuknmh8HdL8mSFzFIUzaizggEf9X7WT+0VVQkzj3Yit6s6dWA5Rh8w== + dependencies: + "@babel/core" "^7.12.10" + "@babel/plugin-proposal-class-properties" "^7.12.1" + "@babel/plugin-proposal-decorators" "^7.12.12" + "@babel/plugin-proposal-export-default-from" "^7.12.1" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" + "@babel/plugin-proposal-object-rest-spread" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.12.7" + "@babel/plugin-proposal-private-methods" "^7.12.1" + "@babel/plugin-proposal-private-property-in-object" "^7.12.1" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-transform-arrow-functions" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.12" + "@babel/plugin-transform-classes" "^7.12.1" + "@babel/plugin-transform-destructuring" "^7.12.1" + "@babel/plugin-transform-for-of" "^7.12.1" + "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/plugin-transform-shorthand-properties" "^7.12.1" + "@babel/plugin-transform-spread" "^7.12.1" + "@babel/preset-env" "^7.12.11" + "@babel/preset-react" "^7.12.10" + "@babel/preset-typescript" "^7.12.7" + "@babel/register" "^7.12.1" + "@storybook/node-logger" "6.5.4" + "@storybook/semver" "^7.3.2" + "@types/node" "^14.0.10 || ^16.0.0" + "@types/pretty-hrtime" "^1.0.0" + babel-loader "^8.0.0" + babel-plugin-macros "^3.0.1" + babel-plugin-polyfill-corejs3 "^0.1.0" + chalk "^4.1.0" + core-js "^3.8.2" + express "^4.17.1" + file-system-cache "^1.0.5" + find-up "^5.0.0" + fork-ts-checker-webpack-plugin "^6.0.4" + fs-extra "^9.0.1" + glob "^7.1.6" + handlebars "^4.7.7" + interpret "^2.2.0" + json5 "^2.1.3" + lazy-universal-dotenv "^3.0.1" + picomatch "^2.3.0" + pkg-dir "^5.0.0" + pretty-hrtime "^1.0.3" + resolve-from "^5.0.0" + slash "^3.0.0" + telejson "^6.0.8" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + webpack "4" + "@storybook/core-events@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.3.tgz#57fb45187d6d60403149d9b16953989897e2bd6e" @@ -3435,20 +3582,20 @@ webpack-dev-middleware "^3.7.3" webpack-virtual-modules "^0.2.2" -"@storybook/manager-webpack5@^6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/manager-webpack5/-/manager-webpack5-6.5.3.tgz#63cd2fe547653c5489f301db954016bed4ab9d29" - integrity sha512-AJpx2cpiBXt6lVHxe2ZaBWTXqq8/GNXfFKXuBRTvLM0ZqiY3HcohUmgpWs56OC2JUwunbZiS0nvxA3dzQmuBZg== +"@storybook/manager-webpack5@^6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/manager-webpack5/-/manager-webpack5-6.5.4.tgz#54793278225e17418318a34a830234e249de3db8" + integrity sha512-UwGnwkHV5CFuHmrsQnjQ0IQj6uXZFopCB7e96HU0YwOBiBA9ABlbJpUrxC/N7vO+OhTNtH6lcwHx0eJbbnnuxw== dependencies: "@babel/core" "^7.12.10" "@babel/plugin-transform-template-literals" "^7.12.1" "@babel/preset-react" "^7.12.10" - "@storybook/addons" "6.5.3" - "@storybook/core-client" "6.5.3" - "@storybook/core-common" "6.5.3" - "@storybook/node-logger" "6.5.3" - "@storybook/theming" "6.5.3" - "@storybook/ui" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/core-client" "6.5.4" + "@storybook/core-common" "6.5.4" + "@storybook/node-logger" "6.5.4" + "@storybook/theming" "6.5.4" + "@storybook/ui" "6.5.4" "@types/node" "^14.0.10 || ^16.0.0" babel-loader "^8.0.0" case-sensitive-paths-webpack-plugin "^2.3.0" @@ -3501,7 +3648,7 @@ npmlog "^5.0.1" pretty-hrtime "^1.0.3" -"@storybook/node-logger@^6.5.4": +"@storybook/node-logger@6.5.4", "@storybook/node-logger@^6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.4.tgz#1887abd364fd401ac7b76b313f92f12005a28c6f" integrity sha512-2rK9oTBhvRm4VOr1ywIWXfWEXVbuV7wGdZu4hpSDlkhnBBFCyYBJH9asEJVoB4Qk77HPMCqkw2IHpstVjkASXQ== @@ -3553,6 +3700,28 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" +"@storybook/preview-web@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.5.4.tgz#a6899add3be1937ea79c14c4861c0f038c71efaa" + integrity sha512-mbyZI0ProlLSB5MVe+YvoCt+XtlyBvP3lzTVdPZWVVtRN6DK5SEcfsK9//rgmqxiYYXfSKfyI53skYZkKAIEcA== + dependencies: + "@storybook/addons" "6.5.4" + "@storybook/channel-postmessage" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/core-events" "6.5.4" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.4" + ansi-to-html "^0.6.11" + core-js "^3.8.2" + global "^4.4.0" + lodash "^4.17.21" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + unfetch "^4.2.0" + util-deprecate "^1.0.2" + "@storybook/react-docgen-typescript-plugin@1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0", "@storybook/react-docgen-typescript-plugin@canary": version "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0" resolved "https://registry.yarnpkg.com/@storybook/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0.tgz#3103532ff494fb7dc3cf835f10740ecf6a26c0f9" @@ -3670,6 +3839,27 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/store@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.5.4.tgz#7770b7bffcc6c254a2497db2d4b1ee93b7a62659" + integrity sha512-hCHSQorxRVGseVlIfM4JXbJHkA6AAXuAFl+QsUTjG24q3zAc3sIE2nbH5KsHuJN5NorjcrGeLQOAO9amqzUeHA== + dependencies: + "@storybook/addons" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/core-events" "6.5.4" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + regenerator-runtime "^0.13.7" + slash "^3.0.0" + stable "^0.1.8" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/telemetry@6.5.3": version "6.5.3" resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.3.tgz#2440606fa82406d279b0d60261613c5038d3bfbf" @@ -3724,6 +3914,24 @@ regenerator-runtime "^0.13.7" resolve-from "^5.0.0" +"@storybook/ui@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.4.tgz#eb70602e78b871e6d762b43889b2dc7537a91331" + integrity sha512-+kMgNMcW7xma/H/O4LFzdxjX6GPfEEvOkm3HQDz0dJW7z/wtQVTgZKCA8gAVl+eNcNyRGzYRKOrOU0AzFfU7lw== + dependencies: + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/channels" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/components" "6.5.4" + "@storybook/core-events" "6.5.4" + "@storybook/router" "6.5.4" + "@storybook/semver" "^7.3.2" + "@storybook/theming" "6.5.4" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + resolve-from "^5.0.0" + "@surma/rollup-plugin-off-main-thread@^2.2.3": version "2.2.3" resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053" From 61ee0bd0e98b60e2911b5a4c9c72b4d9a9abd059 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 15:06:08 +0000 Subject: [PATCH 219/340] :arrow_up: Bump @storybook/react from 6.5.3 to 6.5.4 Bumps [@storybook/react](https://github.com/storybookjs/storybook/tree/HEAD/app/react) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.4/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.4/app/react) --- updated-dependencies: - dependency-name: "@storybook/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 206 ++++++++++++------------------- 2 files changed, 83 insertions(+), 125 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index db303d94..11c36714 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -25,7 +25,7 @@ "@storybook/manager-webpack5": "^6.5.4", "@storybook/node-logger": "^6.5.4", "@storybook/preset-create-react-app": "^4.1.0", - "@storybook/react": "^6.5.3", + "@storybook/react": "^6.5.4", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", "@testing-library/user-event": "^14.2.0", diff --git a/yarn.lock b/yarn.lock index bffe411b..6404c3ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3003,28 +3003,28 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/builder-webpack4@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.3.tgz#5e99a009c0132380620a1d177a69a5f352ef6d29" - integrity sha512-zhZ879FH8XDs8TRkXN29pGMR2rJrKQYdRn19XTsBt9MlRI8ALFClGixYBsUF/Fa74LAWF2roL5dSt7qDyBQULQ== +"@storybook/builder-webpack4@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.4.tgz#c58708c18a657ab326026469e5f06aef462c074e" + integrity sha512-9AaSix850yOG7deAG8PDrAVNiDcTBm422Fjo9+OkONVN8tYIObW72U9kjwSrVL2HRMwu6Ikx939z1FBgA80NSw== dependencies: "@babel/core" "^7.12.10" - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/channel-postmessage" "6.5.3" - "@storybook/channels" "6.5.3" - "@storybook/client-api" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/components" "6.5.3" - "@storybook/core-common" "6.5.3" - "@storybook/core-events" "6.5.3" - "@storybook/node-logger" "6.5.3" - "@storybook/preview-web" "6.5.3" - "@storybook/router" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/channel-postmessage" "6.5.4" + "@storybook/channels" "6.5.4" + "@storybook/client-api" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/components" "6.5.4" + "@storybook/core-common" "6.5.4" + "@storybook/core-events" "6.5.4" + "@storybook/node-logger" "6.5.4" + "@storybook/preview-web" "6.5.4" + "@storybook/router" "6.5.4" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.3" - "@storybook/theming" "6.5.3" - "@storybook/ui" "6.5.3" + "@storybook/store" "6.5.4" + "@storybook/theming" "6.5.4" + "@storybook/ui" "6.5.4" "@types/node" "^14.0.10 || ^16.0.0" "@types/webpack" "^4.41.26" autoprefixer "^9.8.6" @@ -3126,17 +3126,6 @@ qs "^6.10.0" telejson "^6.0.8" -"@storybook/channel-websocket@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.3.tgz#3403d30c107763db311b084a0f6586c755ca64f0" - integrity sha512-Q1XCqtVMZFP1WG+OtzJ5l0Ip8umzBOkVmH3SH+DDU+o+MCSSfXKbw7UnbDUaZHzOHuFq55WaXVEnzRkeydI9rQ== - dependencies: - "@storybook/channels" "6.5.3" - "@storybook/client-logger" "6.5.3" - core-js "^3.8.2" - global "^4.4.0" - telejson "^6.0.8" - "@storybook/channel-websocket@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.4.tgz#659dac59649240ce9d9e74a84bcc28c9f359f62e" @@ -3264,32 +3253,6 @@ regenerator-runtime "^0.13.7" util-deprecate "^1.0.2" -"@storybook/core-client@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.3.tgz#9c689a5f6797dc7afe60183c29502e496bbd0a07" - integrity sha512-tsyXs+J7e210lRWminzyQU5uvbiKq9XrzsMs6feGyCE3kjZbBCj7RIgd/KxStVT/Ssim6BeTXHfnlLTxLbq5pQ== - dependencies: - "@storybook/addons" "6.5.3" - "@storybook/channel-postmessage" "6.5.3" - "@storybook/channel-websocket" "6.5.3" - "@storybook/client-api" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/core-events" "6.5.3" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/preview-web" "6.5.3" - "@storybook/store" "6.5.3" - "@storybook/ui" "6.5.3" - airbnb-js-shims "^2.2.1" - ansi-to-html "^0.6.11" - core-js "^3.8.2" - global "^4.4.0" - lodash "^4.17.21" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - ts-dedent "^2.0.0" - unfetch "^4.2.0" - util-deprecate "^1.0.2" - "@storybook/core-client@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.4.tgz#ab5eaa68c78c3e8816ea240afeea0887e2f68708" @@ -3442,23 +3405,23 @@ dependencies: core-js "^3.8.2" -"@storybook/core-server@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.3.tgz#6c6168ec74f07594b48b248ae53454745945b37e" - integrity sha512-aehEen3VeY2NvouYfbnw346KtRwCJceOH5IWGHvVVEauSVzwCH+Yfgy7c4k2j0Ey3u6fz5qCkvPp8rdY0XS7SA== +"@storybook/core-server@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.4.tgz#0e213ac52748fac1325b5734e7b64c23f982bd2f" + integrity sha512-Fmapj0xHHNQ3FUFXiHR/Zex9hBWnxKYMANxmNslAHbD3BEpf8xPYcjtptVvr0hJyHtnygtwqPbR0CUBbCG0KKQ== dependencies: "@discoveryjs/json-ext" "^0.5.3" - "@storybook/builder-webpack4" "6.5.3" - "@storybook/core-client" "6.5.3" - "@storybook/core-common" "6.5.3" - "@storybook/core-events" "6.5.3" + "@storybook/builder-webpack4" "6.5.4" + "@storybook/core-client" "6.5.4" + "@storybook/core-common" "6.5.4" + "@storybook/core-events" "6.5.4" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/csf-tools" "6.5.3" - "@storybook/manager-webpack4" "6.5.3" - "@storybook/node-logger" "6.5.3" + "@storybook/csf-tools" "6.5.4" + "@storybook/manager-webpack4" "6.5.4" + "@storybook/node-logger" "6.5.4" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.3" - "@storybook/telemetry" "6.5.3" + "@storybook/store" "6.5.4" + "@storybook/telemetry" "6.5.4" "@types/node" "^14.0.10 || ^16.0.0" "@types/node-fetch" "^2.5.7" "@types/pretty-hrtime" "^1.0.0" @@ -3493,18 +3456,18 @@ ws "^8.2.3" x-default-browser "^0.4.0" -"@storybook/core@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.5.3.tgz#8291e7bccd5d726ac7dc39c1e27fc04178f777f6" - integrity sha512-XQDcAryLNyXe5eiNqB++6xvGqnYlJ8ZAFOPWFlFUhjrktojtwVEeHfj5M3e23D9XMN4KkBODoH3OWmREcUMwXg== +"@storybook/core@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.5.4.tgz#b6fcd148aea97f695ad491ee77664c28f1ff9396" + integrity sha512-de43+5FgQnLWTJw51h4qpaDVy1aHFte2eE2wi5rC3VHICxqQJJQqtzDrAtZ9NoKhztS5tZHA6pk60fh1TtPk8g== dependencies: - "@storybook/core-client" "6.5.3" - "@storybook/core-server" "6.5.3" + "@storybook/core-client" "6.5.4" + "@storybook/core-server" "6.5.4" -"@storybook/csf-tools@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.5.3.tgz#4f3b53bbe38f4a62e1ed07948a632512fb59f41f" - integrity sha512-WotBTvKauVV+i2DZqem4m12D+Ogexg6oFiXt0dlqh0TUGEAGzvocOAPIKk6uciEF2eXu6yn8JE4s+faXLWrXSw== +"@storybook/csf-tools@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.5.4.tgz#01b4ab41482d6950781d2a3fa369445d818a1e92" + integrity sha512-mCAO8Ddig5PzXiI4HxiWhdLmPPpaovzVxqdh7g31k3fhpnRkQrKwftNGTW/ArFDdisMjB1+gm+ZOVACZg0pO4w== dependencies: "@babel/core" "^7.12.10" "@babel/generator" "^7.12.11" @@ -3541,20 +3504,33 @@ lodash "^4.17.21" regenerator-runtime "^0.13.7" -"@storybook/manager-webpack4@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.3.tgz#004380031a521f50d5d37740e7d2add3342dbd90" - integrity sha512-kI+6fbCHv9uH1GEYK/SYLtNiAJYVRgm8oh/7Zi/38cqUjnAg8lzUztABul4Iemu3w5aJplkqE08FFu69TTbHPg== +"@storybook/docs-tools@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.4.tgz#efe25c732f2061293e3cb84853e82a925e332804" + integrity sha512-XiCiCKwalbPrhcD9jhMM9IMOdOplUPNnwhW//VmHvWJ2j+JNiQVX42vfecl4hKy8wx63S/AzaGKw2yuavUAiHQ== + dependencies: + "@babel/core" "^7.12.10" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.4" + core-js "^3.8.2" + doctrine "^3.0.0" + lodash "^4.17.21" + regenerator-runtime "^0.13.7" + +"@storybook/manager-webpack4@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.4.tgz#1dfd152e7af7b57ba0c1d5162ec360b71e088f61" + integrity sha512-JgFAlnnsOV6+L0ShDApwbDDdzoEAwuy01+TLUVdl60rlpbcBaasBMkZYAy1iwKZ59gCT51GocGMGDXBVeUJq9g== dependencies: "@babel/core" "^7.12.10" "@babel/plugin-transform-template-literals" "^7.12.1" "@babel/preset-react" "^7.12.10" - "@storybook/addons" "6.5.3" - "@storybook/core-client" "6.5.3" - "@storybook/core-common" "6.5.3" - "@storybook/node-logger" "6.5.3" - "@storybook/theming" "6.5.3" - "@storybook/ui" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/core-client" "6.5.4" + "@storybook/core-common" "6.5.4" + "@storybook/node-logger" "6.5.4" + "@storybook/theming" "6.5.4" + "@storybook/ui" "6.5.4" "@types/node" "^14.0.10 || ^16.0.0" "@types/webpack" "^4.41.26" babel-loader "^8.0.0" @@ -3735,24 +3711,24 @@ react-docgen-typescript "^2.1.1" tslib "^2.0.0" -"@storybook/react@^6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.5.3.tgz#bab65edd22719d3367e136db20a79bd09aab41a0" - integrity sha512-RP9ak2EIrq9sJ80JjaVV/Xab9O663PA/DRqfbILewRLi9uUaG6L/Qby7LktwzqwaybeKbP6dTG0w937cRkuj4w== +"@storybook/react@^6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.5.4.tgz#54d947c79ed60aef8ae160332d5bce2e4281f40f" + integrity sha512-tZdoUc0TJ2HrE4iIHwNWjW/yJSM8+9uBE4U4rWmKjjqRk7jC0KGLxjPPgjGsJFx7iSdAurQlaZUW7cvcPuhz1w== dependencies: "@babel/preset-flow" "^7.12.1" "@babel/preset-react" "^7.12.10" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.3" - "@storybook/addons" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/core" "6.5.3" - "@storybook/core-common" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/core" "6.5.4" + "@storybook/core-common" "6.5.4" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/docs-tools" "6.5.3" - "@storybook/node-logger" "6.5.3" + "@storybook/docs-tools" "6.5.4" + "@storybook/node-logger" "6.5.4" "@storybook/react-docgen-typescript-plugin" "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.3" + "@storybook/store" "6.5.4" "@types/estree" "^0.0.51" "@types/node" "^14.14.20 || ^16.0.0" "@types/webpack-env" "^1.16.0" @@ -3860,13 +3836,13 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/telemetry@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.3.tgz#2440606fa82406d279b0d60261613c5038d3bfbf" - integrity sha512-eXhQ+kRWdg+ZX3sglRaCoOzpzgQ/p9wKS4/vEJd5Fq+JlKIuZkJ7xiJYaxlhR55PLpJGbj+5HCTlnepAtf7Nnw== +"@storybook/telemetry@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.4.tgz#810209e928449c2eab7e3bdf7dd6dbe0de8327b0" + integrity sha512-BKQajMd80mXHp/sE54I1JiusgvfZrnRqBbZW93slGNG3JyWpJLGOBH/KCp4iyu6Htbqssi+nvrxneUCT+wA6eQ== dependencies: - "@storybook/client-logger" "6.5.3" - "@storybook/core-common" "6.5.3" + "@storybook/client-logger" "6.5.4" + "@storybook/core-common" "6.5.4" chalk "^4.1.0" core-js "^3.8.2" detect-package-manager "^2.0.1" @@ -3896,24 +3872,6 @@ core-js "^3.8.2" regenerator-runtime "^0.13.7" -"@storybook/ui@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.3.tgz#afa7a327c71350e9f92628b86c7f14d58427ec3c" - integrity sha512-TLJBfXHFM0ilMuUjer4AjhnNGvQ7lI4GYIKzuCjCrw/ukfUb1AABXd9fdHq7tEzVm8z7T3pyrRVsb1VVdbxL0A== - dependencies: - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/channels" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/components" "6.5.3" - "@storybook/core-events" "6.5.3" - "@storybook/router" "6.5.3" - "@storybook/semver" "^7.3.2" - "@storybook/theming" "6.5.3" - core-js "^3.8.2" - regenerator-runtime "^0.13.7" - resolve-from "^5.0.0" - "@storybook/ui@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.4.tgz#eb70602e78b871e6d762b43889b2dc7537a91331" From fcf56f9e04aaf5a0fb5df27aee5bcc16837c1bdd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 15:41:08 +0000 Subject: [PATCH 220/340] :arrow_up: Bump @storybook/addon-essentials from 6.5.3 to 6.5.4 Bumps [@storybook/addon-essentials](https://github.com/storybookjs/storybook/tree/HEAD/addons/essentials) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.4/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.4/addons/essentials) --- updated-dependencies: - dependency-name: "@storybook/addon-essentials" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 235 +++++++++++++++---------------- 2 files changed, 112 insertions(+), 125 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 11c36714..21b3e46e 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.17.12", "@storybook/addon-actions": "^6.5.3", - "@storybook/addon-essentials": "^6.5.3", + "@storybook/addon-essentials": "^6.5.4", "@storybook/addon-links": "^6.5.4", "@storybook/builder-webpack5": "^6.5.3", "@storybook/manager-webpack5": "^6.5.4", diff --git a/yarn.lock b/yarn.lock index 6404c3ed..c59717f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2728,18 +2728,18 @@ "@stdlib/types" "^0.0.x" debug "^2.6.9" -"@storybook/addon-actions@6.5.3", "@storybook/addon-actions@^6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.3.tgz#1e47bcfc5b215f483aef9d7f22e3619cd354af8c" - integrity sha512-OYfG6dDFoNIPmtQ5vXum7m7U5MDg6rlwkaUpV3MkMVCnSAco0/GGRdsYBVO+fpfFFVxRUi3QFEv7xI0xyX2oiQ== +"@storybook/addon-actions@6.5.4", "@storybook/addon-actions@^6.5.3": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.4.tgz#8ec4863982c805a3a39a19848aea3d65d80d491f" + integrity sha512-O70+brZOW78LBjbKsppXy37NQj4r3b2LQh3zUkIE1n37nb0bYhewr39UlT1/VhfDD4QA6PsBOqp0Mum8/V0GgQ== dependencies: - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/components" "6.5.3" - "@storybook/core-events" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/components" "6.5.4" + "@storybook/core-events" "6.5.4" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/theming" "6.5.3" + "@storybook/theming" "6.5.4" core-js "^3.8.2" fast-deep-equal "^3.1.3" global "^4.4.0" @@ -2753,18 +2753,18 @@ util-deprecate "^1.0.2" uuid-browser "^3.1.0" -"@storybook/addon-backgrounds@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.5.3.tgz#dbe357d88c2844aef5c3c85e055c1c954721a109" - integrity sha512-U8ic8fR7kACRvvSaElFaCOgb8ugU2NCtpv2CC3VzxCVWDCdaYivgpXQrvHe0GLYhIrySqgm1wP7q73oILl+Qcg== +"@storybook/addon-backgrounds@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.5.4.tgz#97df5c73f350965bd5f2521e0882581df9f86315" + integrity sha512-lajT9N7VpBQRPHJF1iAGUIxJNuMwqZcMjijVAMoWX4gOdnGvjK7MpwoYbD2xAPXYrugJUGiYRG608d4PgPZT4w== dependencies: - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/components" "6.5.3" - "@storybook/core-events" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/components" "6.5.4" + "@storybook/core-events" "6.5.4" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/theming" "6.5.3" + "@storybook/theming" "6.5.4" core-js "^3.8.2" global "^4.4.0" memoizerific "^1.11.3" @@ -2772,47 +2772,47 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/addon-controls@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.5.3.tgz#0f398b1c1898bf735bbd228f04a0ddfe1c281807" - integrity sha512-90dTS2ySo/u8t/UTY1snsfAJCszvJKW8FNbzxF1c+JwvErb6hrHq0JOSmFLOeRqPuvkKKB8q83vp6A6fXOU+gQ== +"@storybook/addon-controls@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.5.4.tgz#d0cc2781bc0122eb16e59940b32c645775d0c8da" + integrity sha512-+2s++u1yXGs94BoxMVOOa4Ld0u6ylV5KdS9cWigyQz/OP3ZeoXDx6kCaJfYhEe/7Ccn59g11XjG4W8pjHMdb4A== dependencies: - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/components" "6.5.3" - "@storybook/core-common" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/components" "6.5.4" + "@storybook/core-common" "6.5.4" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/node-logger" "6.5.3" - "@storybook/store" "6.5.3" - "@storybook/theming" "6.5.3" + "@storybook/node-logger" "6.5.4" + "@storybook/store" "6.5.4" + "@storybook/theming" "6.5.4" core-js "^3.8.2" lodash "^4.17.21" ts-dedent "^2.0.0" -"@storybook/addon-docs@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.5.3.tgz#6db38b7721245193d2ceaf788844f5a110d1e8bc" - integrity sha512-MC1Bwamw8lQvRMmGKsf4UcyNdQCYgpAB2o9m4R0EPA5byTkcEfAXkAwSP8atlP0/wQTjrwvyVgQuhchHmxnR0Q== +"@storybook/addon-docs@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.5.4.tgz#6b22711b50dec7ab370923b6d37aae12476d0b2a" + integrity sha512-Sqx8XJN760rbFGlNXywKG1QtG24X6gHgWXMEdfA1yy6FbH8vXu8p9VVm6KV3tHcb7o+ihSK7pObKtSXNdumD/A== dependencies: "@babel/plugin-transform-react-jsx" "^7.12.12" "@babel/preset-env" "^7.12.11" "@jest/transform" "^26.6.2" "@mdx-js/react" "^1.6.22" - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/components" "6.5.3" - "@storybook/core-common" "6.5.3" - "@storybook/core-events" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/components" "6.5.4" + "@storybook/core-common" "6.5.4" + "@storybook/core-events" "6.5.4" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/docs-tools" "6.5.3" + "@storybook/docs-tools" "6.5.4" "@storybook/mdx1-csf" canary - "@storybook/node-logger" "6.5.3" - "@storybook/postinstall" "6.5.3" - "@storybook/preview-web" "6.5.3" - "@storybook/source-loader" "6.5.3" - "@storybook/store" "6.5.3" - "@storybook/theming" "6.5.3" + "@storybook/node-logger" "6.5.4" + "@storybook/postinstall" "6.5.4" + "@storybook/preview-web" "6.5.4" + "@storybook/source-loader" "6.5.4" + "@storybook/store" "6.5.4" + "@storybook/theming" "6.5.4" babel-loader "^8.0.0" core-js "^3.8.2" fast-deep-equal "^3.1.3" @@ -2824,23 +2824,23 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/addon-essentials@^6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.5.3.tgz#1bd33d5265288d24049e5fd63e78a99d67fdbe50" - integrity sha512-ZVps1kFMB4OuKRS9vIo8u07u04zvU84jP4B7c5TcH/WxFbwPW9I9ePBcCv+QmkdhDTb3TGWRWQqv5zs4cnQ1YA== +"@storybook/addon-essentials@^6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.5.4.tgz#578f1f222027a556d7e23b799956750163fd83be" + integrity sha512-/ayPl274Tdrfz0YG0oSovkrXJNbstFm/Zoz7KO4wNMFgxTYes3kk+ruwkFIZegunBB8yR77cSzWHKqS9pFD8tA== dependencies: - "@storybook/addon-actions" "6.5.3" - "@storybook/addon-backgrounds" "6.5.3" - "@storybook/addon-controls" "6.5.3" - "@storybook/addon-docs" "6.5.3" - "@storybook/addon-measure" "6.5.3" - "@storybook/addon-outline" "6.5.3" - "@storybook/addon-toolbars" "6.5.3" - "@storybook/addon-viewport" "6.5.3" - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/core-common" "6.5.3" - "@storybook/node-logger" "6.5.3" + "@storybook/addon-actions" "6.5.4" + "@storybook/addon-backgrounds" "6.5.4" + "@storybook/addon-controls" "6.5.4" + "@storybook/addon-docs" "6.5.4" + "@storybook/addon-measure" "6.5.4" + "@storybook/addon-outline" "6.5.4" + "@storybook/addon-toolbars" "6.5.4" + "@storybook/addon-viewport" "6.5.4" + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/core-common" "6.5.4" + "@storybook/node-logger" "6.5.4" core-js "^3.8.2" regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" @@ -2863,60 +2863,60 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-measure@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-6.5.3.tgz#7a27082d7863981924362fd15022521b0722048f" - integrity sha512-8auVdpM66+qaam3KGmfZZgSQ/jJIm6aMeEzi+HX48b2xVa4vv9W9/ZpJp9fc3K2349+BR5K3nzLMObdFr1Yjew== +"@storybook/addon-measure@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-6.5.4.tgz#af3dc98804e39411dd545eb2bff7b722b7ab6dbc" + integrity sha512-yucb2WnQMUyPo0cnbKKeIMp4pb18bU2zE8AFLm1GcQYJ56IfYD5EJbfpP7o3KpcMRRrZFjITggqhdU8DtncZkQ== dependencies: - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/components" "6.5.3" - "@storybook/core-events" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/components" "6.5.4" + "@storybook/core-events" "6.5.4" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" global "^4.4.0" -"@storybook/addon-outline@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-6.5.3.tgz#2560912eddda92dc827448268176e9b3ac1ef308" - integrity sha512-QVSsTOs813Tl404IcWTxdzM+gAIiq46LuH11Re1cMwKrnuOvfHtbLQ4x2n1aTy+mTuWxNymaHwX2Aqilr0fqJA== +"@storybook/addon-outline@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-6.5.4.tgz#a400a288b26ce793c4fd1b01dd54efde5b754b77" + integrity sha512-Qj9KfPTllcT0CxHqfIvKUbTxwu2ujIq/YfguFBecSQCTGwYTyTmLHzS1vwFHyEoVPgILLnQfsBLdLs57TaGl+A== dependencies: - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/components" "6.5.3" - "@storybook/core-events" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/components" "6.5.4" + "@storybook/core-events" "6.5.4" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" global "^4.4.0" regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-toolbars@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.5.3.tgz#1a379bae5217ddbcbf37948867211c755d264c70" - integrity sha512-wQxDUQASrpdGJouo6WsC840JwaAQkgV4nuCmuxyqbL6yJ7HNyS7mbBoJzfe8kXWOzSN2MM1lP4gOlZuGH4m05g== +"@storybook/addon-toolbars@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.5.4.tgz#f99348cbefe905251a1a76bf3fdac6b604666929" + integrity sha512-cK80/EjDJ+Hr7/lqsEqasyZGHx5+j9pVQRWWhTEDzURcAsxh4HFSw9VSOnDk+EAgHrlvjm+PX2xeaHfT9ezo6Q== dependencies: - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/components" "6.5.3" - "@storybook/theming" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/components" "6.5.4" + "@storybook/theming" "6.5.4" core-js "^3.8.2" regenerator-runtime "^0.13.7" -"@storybook/addon-viewport@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.5.3.tgz#759d0f5e276a77e032bdcd111162d1944f875a81" - integrity sha512-jzHGACC40g/jWXmDIdMyQk5EepNoHhOLFWxUpt12kSgkx0s8PL6PHAOn7p0Yh8JOp0hwHxZJXnYch6yEEgpBTA== +"@storybook/addon-viewport@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.5.4.tgz#4bf17ccdbe59801404c8ff856cbfa1fe543026d9" + integrity sha512-K0DrUTwiGY9IeTVUgwgl0boEYzn7QbYz34N7C5CMEUFWIBNehc7FJu/Rc+d2ltNz1w3jtnQPAFpt0FQ8ZYvVGg== dependencies: - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/components" "6.5.3" - "@storybook/core-events" "6.5.3" - "@storybook/theming" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/components" "6.5.4" + "@storybook/core-events" "6.5.4" + "@storybook/theming" "6.5.4" core-js "^3.8.2" global "^4.4.0" memoizerific "^1.11.3" @@ -3491,19 +3491,6 @@ dependencies: lodash "^4.17.15" -"@storybook/docs-tools@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.3.tgz#2460df5d20e4c6670e985268b50bf9c412eb47b7" - integrity sha512-scUztkQ9ZRRoo4lHiYRaCkmk351H2CwMnlOrCwv/EpmLZnHdffSAtMZS/O07KUOC8fvxCw36z5SfHlbCIcolSQ== - dependencies: - "@babel/core" "^7.12.10" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/store" "6.5.3" - core-js "^3.8.2" - doctrine "^3.0.0" - lodash "^4.17.21" - regenerator-runtime "^0.13.7" - "@storybook/docs-tools@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.4.tgz#efe25c732f2061293e3cb84853e82a925e332804" @@ -3635,10 +3622,10 @@ npmlog "^5.0.1" pretty-hrtime "^1.0.3" -"@storybook/postinstall@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.3.tgz#ba815b7590d0fe8ee8626e62ddd3f729264aa464" - integrity sha512-EIHnbrGwt/CPyLXwNFyfAGY4LhrBx713ghCtacQu2xAukDXg9UWJHarYXjwIivk8DGrims28qXGIjIUKqKeuyA== +"@storybook/postinstall@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.4.tgz#01f7792f1a777cb1dee30e07f02314080cabd232" + integrity sha512-euiZOwz5KmtL3wcSxzxLTkGkxLCroZTVaNt/NopRBa0F8erJfT9MiQPVw/xFkS9QwEViaR+Zq4KmStxB41zycQ== dependencies: core-js "^3.8.2" @@ -3778,13 +3765,13 @@ core-js "^3.6.5" find-up "^4.1.0" -"@storybook/source-loader@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.5.3.tgz#5991dd33805ebb54c5c1e0ad779a2cf80ec6b3b9" - integrity sha512-JrwCm3El6XZC7eVYCF83e7x7/fA4ue+g2s0oAtdXD11KOrrJ7e0bgtvVdtRWKG/4n4Ww3+sGFnuIlXfPbJ3hvw== +"@storybook/source-loader@6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.5.4.tgz#401bbfa4624c1c719a961394690f8621f93e0c3b" + integrity sha512-NfNktWLNvsGVyf3IjCke/4HftPcIHD251J7QOuPjq3lD9OTLZgL4blqscUmd2RrGZRUEH+KSfCIV9jTSeqS1wQ== dependencies: - "@storybook/addons" "6.5.3" - "@storybook/client-logger" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/client-logger" "6.5.4" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" estraverse "^5.2.0" From 4df1171b5c237ed9c11977a2ca5d0fbcdbf748fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 15:41:54 +0000 Subject: [PATCH 221/340] :arrow_up: Bump @storybook/preset-create-react-app from 4.1.0 to 4.1.1 Bumps [@storybook/preset-create-react-app](https://github.com/storybookjs/presets/tree/HEAD/packages/preset-create-react-app) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/storybookjs/presets/releases) - [Changelog](https://github.com/storybookjs/presets/blob/master/packages/preset-create-react-app/CHANGELOG.md) - [Commits](https://github.com/storybookjs/presets/commits/HEAD/packages/preset-create-react-app) --- updated-dependencies: - dependency-name: "@storybook/preset-create-react-app" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 11c36714..71c03577 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -24,7 +24,7 @@ "@storybook/builder-webpack5": "^6.5.3", "@storybook/manager-webpack5": "^6.5.4", "@storybook/node-logger": "^6.5.4", - "@storybook/preset-create-react-app": "^4.1.0", + "@storybook/preset-create-react-app": "^4.1.1", "@storybook/react": "^6.5.4", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.2.0", diff --git a/yarn.lock b/yarn.lock index 6404c3ed..f5ad8817 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3642,10 +3642,10 @@ dependencies: core-js "^3.8.2" -"@storybook/preset-create-react-app@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-4.1.0.tgz#8f2dc1d5ac07b806b7a3fa4f57654c21150a9821" - integrity sha512-xMQlWhT8qHBnfrep4g+f2UFndpAiYnhkilHaf081eA9hsnSlj7Z9WKgHC5n09jBhfZpgL5Zf7Mx3lNwhHoEXBw== +"@storybook/preset-create-react-app@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-4.1.1.tgz#4462bb1a355b81a3891c937bcc75d5ff7e60554c" + integrity sha512-zyiFkePMW4marb3YLYV1q8lBuIFUx0ZqY2e1HzPIzRclVrvTlUxYYi2FPTlr43OIInO4NSr4nTzHbVWKZZTjEA== dependencies: "@pmmmwh/react-refresh-webpack-plugin" "^0.5.1" "@storybook/react-docgen-typescript-plugin" canary From 107bce506f52cd93d2466ec0a03c31dc724dc0f6 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Mon, 23 May 2022 17:46:05 +0200 Subject: [PATCH 222/340] generic unit support --- .../Reducer_Peggy_Parse_test.res | 4 + .../Reducer_Peggy_GeneratedParser.js | 220 ++++++++++-------- .../Reducer_Peggy_GeneratedParser.peggy | 12 +- 3 files changed, 143 insertions(+), 93 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res index 168be4d8..b0e723f4 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_Parse_test.res @@ -251,6 +251,10 @@ describe("Peggy parse", () => { "{(::map (::$_constructArray_$ (1 2 3)) {|:x| {(::add :x 1)}})}", ) }) + describe("unit", () => { + testParse("1m", "{(::fromUnit_m 1)}") + testParse("1m+2cm", "{(::add (::fromUnit_m 1) (::fromUnit_cm 2))}") + }) }) describe("parsing new line", () => { diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js index 3a34dfb2..dc70cd8b 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js @@ -538,32 +538,39 @@ function peg$parse(input, options) { var peg$f27 = function (characters) { return nodeString(characters.join("")); }; - var peg$f28 = function () { - return nodeInteger(parseInt(text())); + var peg$f28 = function (number, unit) { + if (unit === null) { + return number; + } else { + return makeFunctionCall("fromUnit_" + unit.value, [number]); + } }; var peg$f29 = function () { - return nodeFloat(parseFloat(text())); + return nodeInteger(parseInt(text())); }; var peg$f30 = function () { + return nodeFloat(parseFloat(text())); + }; + var peg$f31 = function () { return nodeBoolean(text() === "true"); }; - var peg$f31 = function (args, statements, finalExpression) { + var peg$f32 = function (args, statements, finalExpression) { statements.push(finalExpression); return nodeLambda(args, nodeBlock(statements)); }; - var peg$f32 = function (args, finalExpression) { + var peg$f33 = function (args, finalExpression) { return nodeLambda(args, nodeBlock([finalExpression])); }; - var peg$f33 = function () { + var peg$f34 = function () { return makeFunctionCall("$_constructArray_$", [nodeExpression([])]); }; - var peg$f34 = function (args) { + var peg$f35 = function (args) { return makeFunctionCall("$_constructArray_$", [nodeExpression(args)]); }; - var peg$f35 = function (args) { + var peg$f36 = function (args) { return makeFunctionCall("$_constructRecord_$", [nodeExpression(args)]); }; - var peg$f36 = function (key, value) { + var peg$f37 = function (key, value) { return nodeKeyValue(key, value); }; @@ -738,7 +745,7 @@ function peg$parse(input, options) { function peg$parsestart() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 0; + var key = peg$currPos * 68 + 0; var cached = peg$resultsCache[key]; if (cached) { @@ -771,7 +778,7 @@ function peg$parse(input, options) { function peg$parsezeroOMoreArgumentsBlockOrExpression() { var s0; - var key = peg$currPos * 67 + 1; + var key = peg$currPos * 68 + 1; var cached = peg$resultsCache[key]; if (cached) { @@ -793,7 +800,7 @@ function peg$parse(input, options) { function peg$parseouterBlock() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 2; + var key = peg$currPos * 68 + 2; var cached = peg$resultsCache[key]; if (cached) { @@ -846,7 +853,7 @@ function peg$parse(input, options) { function peg$parseinnerBlockOrExpression() { var s0, s1; - var key = peg$currPos * 67 + 3; + var key = peg$currPos * 68 + 3; var cached = peg$resultsCache[key]; if (cached) { @@ -874,7 +881,7 @@ function peg$parse(input, options) { function peg$parsequotedInnerBlock() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 67 + 4; + var key = peg$currPos * 68 + 4; var cached = peg$resultsCache[key]; if (cached) { @@ -991,7 +998,7 @@ function peg$parse(input, options) { function peg$parsearray_statements() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 5; + var key = peg$currPos * 68 + 5; var cached = peg$resultsCache[key]; if (cached) { @@ -1046,7 +1053,7 @@ function peg$parse(input, options) { function peg$parsestatement() { var s0; - var key = peg$currPos * 67 + 6; + var key = peg$currPos * 68 + 6; var cached = peg$resultsCache[key]; if (cached) { @@ -1068,7 +1075,7 @@ function peg$parse(input, options) { function peg$parseletStatement() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 7; + var key = peg$currPos * 68 + 7; var cached = peg$resultsCache[key]; if (cached) { @@ -1109,7 +1116,7 @@ function peg$parse(input, options) { function peg$parsedefunStatement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 67 + 8; + var key = peg$currPos * 68 + 8; var cached = peg$resultsCache[key]; if (cached) { @@ -1186,7 +1193,7 @@ function peg$parse(input, options) { function peg$parseassignmentOp() { var s0, s1; - var key = peg$currPos * 67 + 9; + var key = peg$currPos * 68 + 9; var cached = peg$resultsCache[key]; if (cached) { @@ -1221,7 +1228,7 @@ function peg$parse(input, options) { function peg$parsearray_parameters() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 10; + var key = peg$currPos * 68 + 10; var cached = peg$resultsCache[key]; if (cached) { @@ -1300,7 +1307,7 @@ function peg$parse(input, options) { function peg$parseexpression() { var s0; - var key = peg$currPos * 67 + 11; + var key = peg$currPos * 68 + 11; var cached = peg$resultsCache[key]; if (cached) { @@ -1325,7 +1332,7 @@ function peg$parse(input, options) { function peg$parseifthenelse() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11; - var key = peg$currPos * 67 + 12; + var key = peg$currPos * 68 + 12; var cached = peg$resultsCache[key]; if (cached) { @@ -1439,7 +1446,7 @@ function peg$parse(input, options) { function peg$parseternary() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 67 + 13; + var key = peg$currPos * 68 + 13; var cached = peg$resultsCache[key]; if (cached) { @@ -1513,7 +1520,7 @@ function peg$parse(input, options) { function peg$parselogicalAdditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 14; + var key = peg$currPos * 68 + 14; var cached = peg$resultsCache[key]; if (cached) { @@ -1578,7 +1585,7 @@ function peg$parse(input, options) { function peg$parselogicalAdditiveOp() { var s0, s1; - var key = peg$currPos * 67 + 15; + var key = peg$currPos * 68 + 15; var cached = peg$resultsCache[key]; if (cached) { @@ -1613,7 +1620,7 @@ function peg$parse(input, options) { function peg$parselogicalMultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 16; + var key = peg$currPos * 68 + 16; var cached = peg$resultsCache[key]; if (cached) { @@ -1678,7 +1685,7 @@ function peg$parse(input, options) { function peg$parselogicalMultiplicativeOp() { var s0, s1; - var key = peg$currPos * 67 + 17; + var key = peg$currPos * 68 + 17; var cached = peg$resultsCache[key]; if (cached) { @@ -1713,7 +1720,7 @@ function peg$parse(input, options) { function peg$parseequality() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 18; + var key = peg$currPos * 68 + 18; var cached = peg$resultsCache[key]; if (cached) { @@ -1757,7 +1764,7 @@ function peg$parse(input, options) { function peg$parseequalityOp() { var s0, s1; - var key = peg$currPos * 67 + 19; + var key = peg$currPos * 68 + 19; var cached = peg$resultsCache[key]; if (cached) { @@ -1803,7 +1810,7 @@ function peg$parse(input, options) { function peg$parserelational() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 20; + var key = peg$currPos * 68 + 20; var cached = peg$resultsCache[key]; if (cached) { @@ -1847,7 +1854,7 @@ function peg$parse(input, options) { function peg$parserelationalOp() { var s0, s1; - var key = peg$currPos * 67 + 21; + var key = peg$currPos * 68 + 21; var cached = peg$resultsCache[key]; if (cached) { @@ -1915,7 +1922,7 @@ function peg$parse(input, options) { function peg$parseadditive() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 22; + var key = peg$currPos * 68 + 22; var cached = peg$resultsCache[key]; if (cached) { @@ -1980,7 +1987,7 @@ function peg$parse(input, options) { function peg$parseadditiveOp() { var s0, s1; - var key = peg$currPos * 67 + 23; + var key = peg$currPos * 68 + 23; var cached = peg$resultsCache[key]; if (cached) { @@ -2048,7 +2055,7 @@ function peg$parse(input, options) { function peg$parsemultiplicative() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 24; + var key = peg$currPos * 68 + 24; var cached = peg$resultsCache[key]; if (cached) { @@ -2113,7 +2120,7 @@ function peg$parse(input, options) { function peg$parsemultiplicativeOp() { var s0, s1; - var key = peg$currPos * 67 + 25; + var key = peg$currPos * 68 + 25; var cached = peg$resultsCache[key]; if (cached) { @@ -2181,7 +2188,7 @@ function peg$parse(input, options) { function peg$parsepower() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 26; + var key = peg$currPos * 68 + 26; var cached = peg$resultsCache[key]; if (cached) { @@ -2246,7 +2253,7 @@ function peg$parse(input, options) { function peg$parsepowerOp() { var s0, s1; - var key = peg$currPos * 67 + 27; + var key = peg$currPos * 68 + 27; var cached = peg$resultsCache[key]; if (cached) { @@ -2292,7 +2299,7 @@ function peg$parse(input, options) { function peg$parsecredibleInterval() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 28; + var key = peg$currPos * 68 + 28; var cached = peg$resultsCache[key]; if (cached) { @@ -2377,7 +2384,7 @@ function peg$parse(input, options) { function peg$parsecredibleIntervalOp() { var s0, s1; - var key = peg$currPos * 67 + 29; + var key = peg$currPos * 68 + 29; var cached = peg$resultsCache[key]; if (cached) { @@ -2412,7 +2419,7 @@ function peg$parse(input, options) { function peg$parsechainFunctionCall() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 30; + var key = peg$currPos * 68 + 30; var cached = peg$resultsCache[key]; if (cached) { @@ -2515,7 +2522,7 @@ function peg$parse(input, options) { function peg$parsechainedFunction() { var s0, s1, s2, s3, s4, s5, s6; - var key = peg$currPos * 67 + 31; + var key = peg$currPos * 68 + 31; var cached = peg$resultsCache[key]; if (cached) { @@ -2627,7 +2634,7 @@ function peg$parse(input, options) { function peg$parseunary() { var s0, s1, s2, s3; - var key = peg$currPos * 67 + 32; + var key = peg$currPos * 68 + 32; var cached = peg$resultsCache[key]; if (cached) { @@ -2667,7 +2674,7 @@ function peg$parse(input, options) { function peg$parseunaryOperator() { var s0, s1; - var key = peg$currPos * 67 + 33; + var key = peg$currPos * 68 + 33; var cached = peg$resultsCache[key]; if (cached) { @@ -2724,7 +2731,7 @@ function peg$parse(input, options) { function peg$parseindexedValue() { var s0; - var key = peg$currPos * 67 + 34; + var key = peg$currPos * 68 + 34; var cached = peg$resultsCache[key]; if (cached) { @@ -2749,7 +2756,7 @@ function peg$parse(input, options) { function peg$parsecollectionElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - var key = peg$currPos * 67 + 35; + var key = peg$currPos * 68 + 35; var cached = peg$resultsCache[key]; if (cached) { @@ -3051,7 +3058,7 @@ function peg$parse(input, options) { function peg$parsearray_functionArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 36; + var key = peg$currPos * 68 + 36; var cached = peg$resultsCache[key]; if (cached) { @@ -3130,7 +3137,7 @@ function peg$parse(input, options) { function peg$parserecordElement() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - var key = peg$currPos * 67 + 37; + var key = peg$currPos * 68 + 37; var cached = peg$resultsCache[key]; if (cached) { @@ -3246,7 +3253,7 @@ function peg$parse(input, options) { function peg$parseatom() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 38; + var key = peg$currPos * 68 + 38; var cached = peg$resultsCache[key]; if (cached) { @@ -3306,7 +3313,7 @@ function peg$parse(input, options) { function peg$parsebasicValue() { var s0; - var key = peg$currPos * 67 + 39; + var key = peg$currPos * 68 + 39; var cached = peg$resultsCache[key]; if (cached) { @@ -3328,7 +3335,7 @@ function peg$parse(input, options) { function peg$parsebasicLiteral() { var s0; - var key = peg$currPos * 67 + 40; + var key = peg$currPos * 68 + 40; var cached = peg$resultsCache[key]; if (cached) { @@ -3339,14 +3346,11 @@ function peg$parse(input, options) { s0 = peg$parsestring(); if (s0 === peg$FAILED) { - s0 = peg$parsefloat(); + s0 = peg$parsenumber(); if (s0 === peg$FAILED) { - s0 = peg$parseinteger(); + s0 = peg$parseboolean(); if (s0 === peg$FAILED) { - s0 = peg$parseboolean(); - if (s0 === peg$FAILED) { - s0 = peg$parsedollarIdentifier(); - } + s0 = peg$parsedollarIdentifier(); } } } @@ -3359,7 +3363,7 @@ function peg$parse(input, options) { function peg$parseidentifier() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 41; + var key = peg$currPos * 68 + 41; var cached = peg$resultsCache[key]; if (cached) { @@ -3447,7 +3451,7 @@ function peg$parse(input, options) { function peg$parsedollarIdentifier() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 42; + var key = peg$currPos * 68 + 42; var cached = peg$resultsCache[key]; if (cached) { @@ -3535,7 +3539,7 @@ function peg$parse(input, options) { function peg$parsestring() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 43; + var key = peg$currPos * 68 + 43; var cached = peg$resultsCache[key]; if (cached) { @@ -3676,10 +3680,44 @@ function peg$parse(input, options) { return s0; } + function peg$parsenumber() { + var s0, s1, s2; + + var key = peg$currPos * 68 + 44; + var cached = peg$resultsCache[key]; + + if (cached) { + peg$currPos = cached.nextPos; + + return cached.result; + } + + s0 = peg$currPos; + s1 = peg$parsefloat(); + if (s1 === peg$FAILED) { + s1 = peg$parseinteger(); + } + if (s1 !== peg$FAILED) { + s2 = peg$parseidentifier(); + if (s2 === peg$FAILED) { + s2 = null; + } + peg$savedPos = s0; + s0 = peg$f28(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; + + return s0; + } + function peg$parseinteger() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 44; + var key = peg$currPos * 68 + 45; var cached = peg$resultsCache[key]; if (cached) { @@ -3740,7 +3778,7 @@ function peg$parse(input, options) { } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f28(); + s0 = peg$f29(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -3769,7 +3807,7 @@ function peg$parse(input, options) { function peg$parsefloat() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 45; + var key = peg$currPos * 68 + 46; var cached = peg$resultsCache[key]; if (cached) { @@ -3898,7 +3936,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f29(); + s1 = peg$f30(); } s0 = s1; peg$silentFails--; @@ -3917,7 +3955,7 @@ function peg$parse(input, options) { function peg$parsefloatExponent() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 46; + var key = peg$currPos * 68 + 47; var cached = peg$resultsCache[key]; if (cached) { @@ -3979,7 +4017,7 @@ function peg$parse(input, options) { function peg$parsed() { var s0; - var key = peg$currPos * 67 + 47; + var key = peg$currPos * 68 + 48; var cached = peg$resultsCache[key]; if (cached) { @@ -4006,7 +4044,7 @@ function peg$parse(input, options) { function peg$parseboolean() { var s0, s1; - var key = peg$currPos * 67 + 48; + var key = peg$currPos * 68 + 49; var cached = peg$resultsCache[key]; if (cached) { @@ -4039,7 +4077,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$f30(); + s1 = peg$f31(); } s0 = s1; peg$silentFails--; @@ -4058,7 +4096,7 @@ function peg$parse(input, options) { function peg$parsevalueConstructor() { var s0; - var key = peg$currPos * 67 + 49; + var key = peg$currPos * 68 + 50; var cached = peg$resultsCache[key]; if (cached) { @@ -4086,7 +4124,7 @@ function peg$parse(input, options) { function peg$parselambda() { var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12; - var key = peg$currPos * 67 + 50; + var key = peg$currPos * 68 + 51; var cached = peg$resultsCache[key]; if (cached) { @@ -4161,7 +4199,7 @@ function peg$parse(input, options) { } if (s12 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f31(s5, s9, s10); + s0 = peg$f32(s5, s9, s10); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4242,7 +4280,7 @@ function peg$parse(input, options) { } if (s11 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f32(s5, s9); + s0 = peg$f33(s5, s9); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4277,7 +4315,7 @@ function peg$parse(input, options) { function peg$parsearrayConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 51; + var key = peg$currPos * 68 + 52; var cached = peg$resultsCache[key]; if (cached) { @@ -4310,7 +4348,7 @@ function peg$parse(input, options) { } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f33(); + s0 = peg$f34(); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4346,7 +4384,7 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f34(s3); + s0 = peg$f35(s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4376,7 +4414,7 @@ function peg$parse(input, options) { function peg$parsearray_elements() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 52; + var key = peg$currPos * 68 + 53; var cached = peg$resultsCache[key]; if (cached) { @@ -4455,7 +4493,7 @@ function peg$parse(input, options) { function peg$parserecordConstructor() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 53; + var key = peg$currPos * 68 + 54; var cached = peg$resultsCache[key]; if (cached) { @@ -4491,7 +4529,7 @@ function peg$parse(input, options) { } if (s5 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f35(s3); + s0 = peg$f36(s3); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4520,7 +4558,7 @@ function peg$parse(input, options) { function peg$parsearray_recordArguments() { var s0, s1, s2, s3, s4, s5, s6, s7; - var key = peg$currPos * 67 + 54; + var key = peg$currPos * 68 + 55; var cached = peg$resultsCache[key]; if (cached) { @@ -4599,7 +4637,7 @@ function peg$parse(input, options) { function peg$parsekeyValuePair() { var s0, s1, s2, s3, s4, s5; - var key = peg$currPos * 67 + 55; + var key = peg$currPos * 68 + 56; var cached = peg$resultsCache[key]; if (cached) { @@ -4626,7 +4664,7 @@ function peg$parse(input, options) { s5 = peg$parseexpression(); if (s5 !== peg$FAILED) { peg$savedPos = s0; - s0 = peg$f36(s1, s5); + s0 = peg$f37(s1, s5); } else { peg$currPos = s0; s0 = peg$FAILED; @@ -4648,7 +4686,7 @@ function peg$parse(input, options) { function peg$parse_() { var s0, s1; - var key = peg$currPos * 67 + 56; + var key = peg$currPos * 68 + 57; var cached = peg$resultsCache[key]; if (cached) { @@ -4678,7 +4716,7 @@ function peg$parse(input, options) { function peg$parse_nl() { var s0, s1; - var key = peg$currPos * 67 + 57; + var key = peg$currPos * 68 + 58; var cached = peg$resultsCache[key]; if (cached) { @@ -4714,7 +4752,7 @@ function peg$parse(input, options) { function peg$parse__() { var s0, s1; - var key = peg$currPos * 67 + 58; + var key = peg$currPos * 68 + 59; var cached = peg$resultsCache[key]; if (cached) { @@ -4750,7 +4788,7 @@ function peg$parse(input, options) { function peg$parse__nl() { var s0, s1; - var key = peg$currPos * 67 + 59; + var key = peg$currPos * 68 + 60; var cached = peg$resultsCache[key]; if (cached) { @@ -4792,7 +4830,7 @@ function peg$parse(input, options) { function peg$parsestatementSeparator() { var s0, s1, s2, s3; - var key = peg$currPos * 67 + 60; + var key = peg$currPos * 68 + 61; var cached = peg$resultsCache[key]; if (cached) { @@ -4860,7 +4898,7 @@ function peg$parse(input, options) { function peg$parsecommentOrNewLine() { var s0, s1, s2; - var key = peg$currPos * 67 + 61; + var key = peg$currPos * 68 + 62; var cached = peg$resultsCache[key]; if (cached) { @@ -4891,7 +4929,7 @@ function peg$parse(input, options) { function peg$parsefinalComment() { var s0, s1, s2, s3, s4; - var key = peg$currPos * 67 + 62; + var key = peg$currPos * 68 + 63; var cached = peg$resultsCache[key]; if (cached) { @@ -4967,7 +5005,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharactersOrComment() { var s0; - var key = peg$currPos * 67 + 63; + var key = peg$currPos * 68 + 64; var cached = peg$resultsCache[key]; if (cached) { @@ -4989,7 +5027,7 @@ function peg$parse(input, options) { function peg$parsedelimitedComment() { var s0, s1, s2, s3; - var key = peg$currPos * 67 + 64; + var key = peg$currPos * 68 + 65; var cached = peg$resultsCache[key]; if (cached) { @@ -5067,7 +5105,7 @@ function peg$parse(input, options) { function peg$parsewhiteSpaceCharacters() { var s0; - var key = peg$currPos * 67 + 65; + var key = peg$currPos * 68 + 66; var cached = peg$resultsCache[key]; if (cached) { @@ -5094,7 +5132,7 @@ function peg$parse(input, options) { function peg$parsenewLine() { var s0, s1; - var key = peg$currPos * 67 + 66; + var key = peg$currPos * 68 + 67; var cached = peg$resultsCache[key]; if (cached) { diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy index 5d3392b3..15cc05a0 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy @@ -248,8 +248,7 @@ basicValue = valueConstructor / basicLiteral basicLiteral = string - / float - / integer + / number / boolean / dollarIdentifier @@ -263,6 +262,15 @@ string 'string' = characters:("'" @([^'])* "'") {return nodeString(characters.join(''))} / characters:('"' @([^"])* '"') {return nodeString(characters.join(''))} +number = number:(float / integer) unit:identifier? + { + if (unit === null) + { return number } + else + { return makeFunctionCall('fromUnit_'+unit.value, [number]) + } + } + integer 'integer' = d+ !"\." ![e]i { return nodeInteger(parseInt(text()))} From 2079814a29440607c53a97b9d385a3e3ed4c23cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 May 2022 15:56:21 +0000 Subject: [PATCH 223/340] :arrow_up: Bump @storybook/builder-webpack5 from 6.5.3 to 6.5.4 Bumps [@storybook/builder-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.5.3 to 6.5.4. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.4/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.4/lib/core) --- updated-dependencies: - dependency-name: "@storybook/builder-webpack5" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 282 ++----------------------------- 2 files changed, 19 insertions(+), 265 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index cd47aa7c..67b2eeb5 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -21,7 +21,7 @@ "@storybook/addon-actions": "^6.5.3", "@storybook/addon-essentials": "^6.5.4", "@storybook/addon-links": "^6.5.4", - "@storybook/builder-webpack5": "^6.5.3", + "@storybook/builder-webpack5": "^6.5.4", "@storybook/manager-webpack5": "^6.5.4", "@storybook/node-logger": "^6.5.4", "@storybook/preset-create-react-app": "^4.1.1", diff --git a/yarn.lock b/yarn.lock index 8ac2f650..39329f75 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2923,23 +2923,6 @@ prop-types "^15.7.2" regenerator-runtime "^0.13.7" -"@storybook/addons@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.5.3.tgz#43dd276417edf74be0c465b968d35795f8cd994d" - integrity sha512-gzzkxZ7R4+EaEzIEBbTWmkA55JDEDQrDjg3nNY/SJklnRigYdStz41KSPx6HGkF2CaI5BYVd5vZCawYvG16gyg== - dependencies: - "@storybook/api" "6.5.3" - "@storybook/channels" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/core-events" "6.5.3" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/router" "6.5.3" - "@storybook/theming" "6.5.3" - "@types/webpack-env" "^1.16.0" - core-js "^3.8.2" - global "^4.4.0" - regenerator-runtime "^0.13.7" - "@storybook/addons@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.5.4.tgz#10cf41ab8aa3c509963599092fe8f3cf9a15edb6" @@ -2957,29 +2940,6 @@ global "^4.4.0" regenerator-runtime "^0.13.7" -"@storybook/api@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.3.tgz#f4c468f348bf6ac65dc571f3e65d67302323312c" - integrity sha512-neVW47ssdG3MqwNwTLjlifS/u6zGUkkcK7G/PC1tnQPP9Zc97BStIqS1RnPGie1iawIAT5ZJQefPGJMneSTBKA== - dependencies: - "@storybook/channels" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/core-events" "6.5.3" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/router" "6.5.3" - "@storybook/semver" "^7.3.2" - "@storybook/theming" "6.5.3" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - regenerator-runtime "^0.13.7" - store2 "^2.12.0" - telejson "^6.0.8" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/api@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.4.tgz#faa06cde4990fd3b2be551ff869fc44a80e66e53" @@ -3056,27 +3016,27 @@ webpack-hot-middleware "^2.25.1" webpack-virtual-modules "^0.2.2" -"@storybook/builder-webpack5@^6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.5.3.tgz#1fd01ea93b169afccafcc4f9d6fb15ad992e6ffd" - integrity sha512-noVd6eJE7pmBl886TahPuUdLiVkyE9ecqQhcltnZfMBCuJXeEev0/E642HRp5P2hE6uE2pBzkTAy8gaHExeY+Q== +"@storybook/builder-webpack5@^6.5.4": + version "6.5.4" + resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.5.4.tgz#bc5b87848d3b8a854b5fe29a2f646184431075d4" + integrity sha512-BoqQkgnyqwySEcfaDreBG9SUnGTzp8jcfdUPqewtqyJK5qQgh79v2VowpSxT00G+eyWcsDkct2U4JnTmjrDpDg== dependencies: "@babel/core" "^7.12.10" - "@storybook/addons" "6.5.3" - "@storybook/api" "6.5.3" - "@storybook/channel-postmessage" "6.5.3" - "@storybook/channels" "6.5.3" - "@storybook/client-api" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/components" "6.5.3" - "@storybook/core-common" "6.5.3" - "@storybook/core-events" "6.5.3" - "@storybook/node-logger" "6.5.3" - "@storybook/preview-web" "6.5.3" - "@storybook/router" "6.5.3" + "@storybook/addons" "6.5.4" + "@storybook/api" "6.5.4" + "@storybook/channel-postmessage" "6.5.4" + "@storybook/channels" "6.5.4" + "@storybook/client-api" "6.5.4" + "@storybook/client-logger" "6.5.4" + "@storybook/components" "6.5.4" + "@storybook/core-common" "6.5.4" + "@storybook/core-events" "6.5.4" + "@storybook/node-logger" "6.5.4" + "@storybook/preview-web" "6.5.4" + "@storybook/router" "6.5.4" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.3" - "@storybook/theming" "6.5.3" + "@storybook/store" "6.5.4" + "@storybook/theming" "6.5.4" "@types/node" "^14.0.10 || ^16.0.0" babel-loader "^8.0.0" babel-plugin-named-exports-order "^0.0.2" @@ -3100,19 +3060,6 @@ webpack-hot-middleware "^2.25.1" webpack-virtual-modules "^0.4.1" -"@storybook/channel-postmessage@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.5.3.tgz#c3762b92e87cb15e3a3c50d8a23ddede80a1e6d0" - integrity sha512-1vsKhFuTX53VmRm4ZKae+9z6FciSTyywZJ5cYmH2nTRWqW5GOm3UndixHzXpddVM1DWdEH4jJ/Cn15SzPRWiPg== - dependencies: - "@storybook/channels" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/core-events" "6.5.3" - core-js "^3.8.2" - global "^4.4.0" - qs "^6.10.0" - telejson "^6.0.8" - "@storybook/channel-postmessage@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.5.4.tgz#246483250e0e538d7455630d560149b1e974c5d3" @@ -3137,15 +3084,6 @@ global "^4.4.0" telejson "^6.0.8" -"@storybook/channels@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.3.tgz#d1c94f1760a27026d16705ab28a82e582cf9f2d5" - integrity sha512-wpxnMt5clUy+04o+I5LVMoQkYt7nc0e5PDz+pAtlNOvQaoFvlC7oQqsVYxxs1cYm6ZGqAJcsfecI5COtnQfT1w== - dependencies: - core-js "^3.8.2" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/channels@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.4.tgz#a3fdc20d45cf4aa74b5310e5e4eb111e353a408a" @@ -3155,32 +3093,6 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/client-api@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.3.tgz#ca7b5ddb9e745b1485d8946dd14d1e81173dd712" - integrity sha512-BxksIgSDkkt9muA41VbsSB96/u3HJAWuOJw+GCzt0yHmlBgfb3+GpQOJUDqTluWQlojg0DHJhAKgYKbejyEpIA== - dependencies: - "@storybook/addons" "6.5.3" - "@storybook/channel-postmessage" "6.5.3" - "@storybook/channels" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/core-events" "6.5.3" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/store" "6.5.3" - "@types/qs" "^6.9.5" - "@types/webpack-env" "^1.16.0" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - store2 "^2.12.0" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/client-api@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.4.tgz#e79418ffb21857deb98f5b7fd88dfe23ef12cfe7" @@ -3207,14 +3119,6 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/client-logger@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.3.tgz#4794e87d85c03aa6e38efc4c5775b9680cc1bf23" - integrity sha512-gUJUkDzQdOQBfAQSJffKlZQ6ueUANjTN6u4xA/FIfJM7+I5N43UuS3dFGEjcnZISS5sj7765ct2aZinMzf1NNQ== - dependencies: - core-js "^3.8.2" - global "^4.4.0" - "@storybook/client-logger@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.4.tgz#57348015276e0453675968f6ca31d908ceb498ae" @@ -3223,21 +3127,6 @@ core-js "^3.8.2" global "^4.4.0" -"@storybook/components@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.3.tgz#8d643d2d89c298e5e5c2957f7ffb171ba3288ecf" - integrity sha512-vYTsg9ADzkPeTsmN1bm351wGqq+oyb8SrAJzLe+FXN+dujIIA9sGEQb6eUZdGe121RDgTyFMO2zKurcJNnGnxQ== - dependencies: - "@storybook/client-logger" "6.5.3" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/theming" "6.5.3" - "@types/react-syntax-highlighter" "11.0.5" - core-js "^3.8.2" - qs "^6.10.0" - react-syntax-highlighter "^15.4.5" - regenerator-runtime "^0.13.7" - util-deprecate "^1.0.2" - "@storybook/components@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.4.tgz#8afdbba252ab957ba53318b34cb2593da964747b" @@ -3279,62 +3168,6 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" -"@storybook/core-common@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.3.tgz#5892e1ebc77f11b1058b716cb514bc2d1d5636ef" - integrity sha512-A0WJDm/Eo2eP8CZeAQPo8oep+Pbbm/uU6Gl/8GsvK7AVtDv/Sm/kyAWcvqMx5ovnZ7A+qYYjvHr90EZuDoltPg== - dependencies: - "@babel/core" "^7.12.10" - "@babel/plugin-proposal-class-properties" "^7.12.1" - "@babel/plugin-proposal-decorators" "^7.12.12" - "@babel/plugin-proposal-export-default-from" "^7.12.1" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-object-rest-spread" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" - "@babel/plugin-proposal-private-methods" "^7.12.1" - "@babel/plugin-proposal-private-property-in-object" "^7.12.1" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-transform-arrow-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.12" - "@babel/plugin-transform-classes" "^7.12.1" - "@babel/plugin-transform-destructuring" "^7.12.1" - "@babel/plugin-transform-for-of" "^7.12.1" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-transform-shorthand-properties" "^7.12.1" - "@babel/plugin-transform-spread" "^7.12.1" - "@babel/preset-env" "^7.12.11" - "@babel/preset-react" "^7.12.10" - "@babel/preset-typescript" "^7.12.7" - "@babel/register" "^7.12.1" - "@storybook/node-logger" "6.5.3" - "@storybook/semver" "^7.3.2" - "@types/node" "^14.0.10 || ^16.0.0" - "@types/pretty-hrtime" "^1.0.0" - babel-loader "^8.0.0" - babel-plugin-macros "^3.0.1" - babel-plugin-polyfill-corejs3 "^0.1.0" - chalk "^4.1.0" - core-js "^3.8.2" - express "^4.17.1" - file-system-cache "^1.0.5" - find-up "^5.0.0" - fork-ts-checker-webpack-plugin "^6.0.4" - fs-extra "^9.0.1" - glob "^7.1.6" - handlebars "^4.7.7" - interpret "^2.2.0" - json5 "^2.1.3" - lazy-universal-dotenv "^3.0.1" - picomatch "^2.3.0" - pkg-dir "^5.0.0" - pretty-hrtime "^1.0.3" - resolve-from "^5.0.0" - slash "^3.0.0" - telejson "^6.0.8" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - webpack "4" - "@storybook/core-common@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.4.tgz#e77f48a2c93b5eb656a3ad6dd0c01903ba7e57f3" @@ -3391,13 +3224,6 @@ util-deprecate "^1.0.2" webpack "4" -"@storybook/core-events@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.3.tgz#57fb45187d6d60403149d9b16953989897e2bd6e" - integrity sha512-DTWFjXJIx+sZndv3lsJohVEJoUL5MgtkSeeKaypkJmZm9kXkylhA0NnA07CMRE6GMqCWw6NYGSe+qOEGsHj5ig== - dependencies: - core-js "^3.8.2" - "@storybook/core-events@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.4.tgz#0c68ee42ac5afcc8ee7b56cd057d9a90d244067c" @@ -3600,17 +3426,6 @@ prettier ">=2.2.1 <=2.3.0" ts-dedent "^2.0.0" -"@storybook/node-logger@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.3.tgz#6917bbbdaf2bb3b191bafadfe4f19c3ea3cbfa61" - integrity sha512-iG4uQJCtuT54p3zg0zJ7+ALPUrt7PTAXmXqN7ak/9YcWbnwtMlHgg8oTlCebwr+E3QPCMauJM2eLzC6F7bI76w== - dependencies: - "@types/npmlog" "^4.1.2" - chalk "^4.1.0" - core-js "^3.8.2" - npmlog "^5.0.1" - pretty-hrtime "^1.0.3" - "@storybook/node-logger@6.5.4", "@storybook/node-logger@^6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.4.tgz#1887abd364fd401ac7b76b313f92f12005a28c6f" @@ -3641,28 +3456,6 @@ pnp-webpack-plugin "^1.7.0" semver "^7.3.5" -"@storybook/preview-web@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.5.3.tgz#f54fb17476c6a57d715ad2e46674b6b668e6729f" - integrity sha512-NI+sKFloj0vP1xAMaF1BhOAokB2u0qZ5rxx8lnU8eBmAukRURGoebuHWohBoQqniuupaNQK5hkUlJ3mkAPZi8Q== - dependencies: - "@storybook/addons" "6.5.3" - "@storybook/channel-postmessage" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/core-events" "6.5.3" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/store" "6.5.3" - ansi-to-html "^0.6.11" - core-js "^3.8.2" - global "^4.4.0" - lodash "^4.17.21" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - unfetch "^4.2.0" - util-deprecate "^1.0.2" - "@storybook/preview-web@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.5.4.tgz#a6899add3be1937ea79c14c4861c0f038c71efaa" @@ -3739,15 +3532,6 @@ util-deprecate "^1.0.2" webpack ">=4.43.0 <6.0.0" -"@storybook/router@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.5.3.tgz#55d8a0a5c3acdef9695482e38cd4d70f6926c261" - integrity sha512-UcErvdeuCTMYvmztDogrTK1DKQ8ZFkUR/46bEuVo4tg9OzlX3fr+JqD4RZHT4YOUYmDcTm6cLlUJhDalUpoU6Q== - dependencies: - "@storybook/client-logger" "6.5.3" - core-js "^3.8.2" - regenerator-runtime "^0.13.7" - "@storybook/router@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.5.4.tgz#575f4ae36629086622a8b41626226ba4da025bb7" @@ -3781,27 +3565,6 @@ prettier ">=2.2.1 <=2.3.0" regenerator-runtime "^0.13.7" -"@storybook/store@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.5.3.tgz#8bde9d3ad071c3612665b6190ed093784a98d22d" - integrity sha512-vI5w3OlDsCQE32C5AekRfHI6qX7s7iKRAUJKQE4Azqch37EAnMNLWE3E13KAzdLX1oU+JNRGHjJTogsQUR2UeQ== - dependencies: - "@storybook/addons" "6.5.3" - "@storybook/client-logger" "6.5.3" - "@storybook/core-events" "6.5.3" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - regenerator-runtime "^0.13.7" - slash "^3.0.0" - stable "^0.1.8" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/store@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.5.4.tgz#7770b7bffcc6c254a2497db2d4b1ee93b7a62659" @@ -3841,15 +3604,6 @@ read-pkg-up "^7.0.1" regenerator-runtime "^0.13.7" -"@storybook/theming@6.5.3": - version "6.5.3" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.5.3.tgz#a8df53df2812d49453a3410346123231e028c103" - integrity sha512-2tM46jahAhKRUzCcoaqPoqs+4imXqbze0dCPZ0cdVnfs14jhMB1lAfGE+diodCCaUcXUu8r2c5dTPKqqM1lHqQ== - dependencies: - "@storybook/client-logger" "6.5.3" - core-js "^3.8.2" - regenerator-runtime "^0.13.7" - "@storybook/theming@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.5.4.tgz#3be001bf425f682f6e16ce3581e8cd109c85f8ea" From a386eee570994306f8f0458814a9137d76f5bbd6 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Mon, 23 May 2022 18:17:11 +0200 Subject: [PATCH 224/340] remove unit evaluation test We provide no implementation --- .../Reducer_Peggy_ToExpression_test.res | 4 ---- .../Reducer_Dispatch_BuiltIn.res | 18 ------------------ 2 files changed, 22 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res index fa6c58f9..81bafd97 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res @@ -217,8 +217,4 @@ describe("Peggy to Expression", () => { (), ) }) - - describe("unit", () => { - testToExpression("1m", "(:$$_block_$$ (:multiply 1 (:$valueOfUnit 'm')))", ~v="1", ()) - }) }) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res index 1ab8d559..141b4a37 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res @@ -129,23 +129,6 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce ) } - let doValueOfUnit = (aUnit: string) => - switch aUnit { - | "nm" => 0.000000001->EvNumber->Ok - | "um" => 0.000001->EvNumber->Ok - | "mm" => 0.001->EvNumber->Ok - | "cm" => 0.01->EvNumber->Ok - | "dm" => 0.1->EvNumber->Ok - | "m" => 1.->EvNumber->Ok - | "dam" => 10.->EvNumber->Ok - | "hm" => 100.->EvNumber->Ok - | "km" => 1000.->EvNumber->Ok - | "Mm" => 1000000.->EvNumber->Ok - | "Gm" => 1000000000.->EvNumber->Ok - | "Tm" => 1000000000000.->EvNumber->Ok - | _ => REUnitNotFound(aUnit)->Error - } - switch call { | ("$_atIndex_$", [EvArray(aValueArray), EvNumber(fIndex)]) => arrayAtIndex(aValueArray, fIndex) | ("$_atIndex_$", [EvRecord(dict), EvString(sIndex)]) => recordAtIndex(dict, sIndex) @@ -154,7 +137,6 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce | ("$_exportBindings_$", [EvRecord(externalBindings)]) => doExportBindings(externalBindings) | ("$_setBindings_$", [EvRecord(externalBindings), EvSymbol(symbol), value]) => doSetBindings(externalBindings, symbol, value) - | ("$valueOfUnit", [EvString(aUnit)]) => doValueOfUnit(aUnit) | ("inspect", [value, EvString(label)]) => inspectLabel(value, label) | ("inspect", [value]) => inspect(value) | ("keep", [EvArray(aValueArray), EvLambda(aLambdaValue)]) => From bb5af13ddc981ccac1a2fdcd66c87dcf2442d838 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Mon, 23 May 2022 13:44:41 -0400 Subject: [PATCH 225/340] Moved DateTime functionality into separate file --- .../ReducerInterface_DateTime.res | 48 +++++------ .../ReducerInterface_ExpressionValue.res | 4 +- .../src/rescript/Utility/DateTime.res | 79 ++++++++++++++++++ .../squiggle-lang/src/rescript/Utility/E.res | 82 +------------------ 4 files changed, 106 insertions(+), 107 deletions(-) create mode 100644 packages/squiggle-lang/src/rescript/Utility/DateTime.res diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res index a0059392..ee7b1a7c 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res @@ -5,22 +5,22 @@ let dateDispatch = (call: ExpressionValue.functionCall, env: DistributionOperati result, > => { switch call { - | ("toString", [EvDate(t)]) => EvString(E.Date.toString(t))->Ok->Some + | ("toString", [EvDate(t)]) => EvString(DateTime.Date.toString(t))->Ok->Some | ("makeDateFromYear", [EvNumber(year)]) => - switch E.Date.makeFromYear(year) { + switch DateTime.Date.makeFromYear(year) { | Ok(t) => EvDate(t)->Ok->Some | Error(e) => RETodo(e)->Error->Some } - | ("dateFromNumber", [EvNumber(f)]) => EvDate(E.Date.fromFloat(f))->Ok->Some - | ("toNumber", [EvDate(f)]) => EvNumber(E.Date.toFloat(f))->Ok->Some + | ("dateFromNumber", [EvNumber(f)]) => EvDate(DateTime.Date.fromFloat(f))->Ok->Some + | ("toNumber", [EvDate(f)]) => EvNumber(DateTime.Date.toFloat(f))->Ok->Some | ("subtract", [EvDate(d1), EvDate(d2)]) => - switch E.Date.subtract(d1, d2) { + switch DateTime.Date.subtract(d1, d2) { | Ok(d) => EvTimeDuration(d)->Ok | Error(e) => Error(RETodo(e)) }->Some | ("subtract", [EvDate(d1), EvTimeDuration(d2)]) => - EvDate(E.Date.subtractDuration(d1, d2))->Ok->Some - | ("add", [EvDate(d1), EvTimeDuration(d2)]) => EvDate(E.Date.addDuration(d1, d2))->Ok->Some + EvDate(DateTime.Date.subtractDuration(d1, d2))->Ok->Some + | ("add", [EvDate(d1), EvTimeDuration(d2)]) => EvDate(DateTime.Date.addDuration(d1, d2))->Ok->Some | _ => None } } @@ -29,23 +29,23 @@ let durationDispatch = (call: ExpressionValue.functionCall, _: DistributionOpera result, > => { switch call { - | ("toString", [EvTimeDuration(t)]) => EvString(E.Duration.toString(t))->Ok->Some - | ("hours", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromHours(f))->Ok->Some - | ("minutes", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromMinutes(f))->Ok->Some - | ("days", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromDays(f))->Ok->Some - | ("years", [EvNumber(f)]) => EvTimeDuration(E.Duration.fromYears(f))->Ok->Some - | ("toHours", [EvTimeDuration(f)]) => EvNumber(E.Duration.toHours(f))->Ok->Some - | ("toMinutes", [EvTimeDuration(f)]) => EvNumber(E.Duration.toMinutes(f))->Ok->Some - | ("toDays", [EvTimeDuration(f)]) => EvNumber(E.Duration.toDays(f))->Ok->Some - | ("toYears", [EvTimeDuration(f)]) => EvNumber(E.Duration.toYears(f))->Ok->Some - | ("add", [EvTimeDuration(d1), EvTimeDuration(d2)]) => - EvTimeDuration(E.Duration.add(d1, d2))->Ok->Some - | ("subtract", [EvTimeDuration(d1), EvTimeDuration(d2)]) => - EvTimeDuration(E.Duration.subtract(d1, d2))->Ok->Some - | ("multiply", [EvTimeDuration(d1), EvNumber(d2)]) => - EvTimeDuration(E.Duration.multiply(d1, d2))->Ok->Some - | ("divide", [EvTimeDuration(d1), EvNumber(d2)]) => - EvTimeDuration(E.Duration.divide(d1, d2))->Ok->Some + | ("toString", [EvTimeDuration(t)]) => EvString(DateTime.Duration.toString(t))->Ok->Some + | ("hours", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some + | ("minutes", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromMinutes(f))->Ok->Some + | ("days", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromDays(f))->Ok->Some + | ("years", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromYears(f))->Ok->Some + | ("toHours", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toHours(f))->Ok->Some + | ("toMinutes", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toMinutes(f))->Ok->Some + | ("toDays", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toDays(f))->Ok->Some + | ("toYears", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toYears(f))->Ok->Some + | ("add", [EvTimeDuration(d1), EvTimeDuration(d2)]) => + EvTimeDuration(DateTime.Duration.add(d1, d2))->Ok->Some + | ("subtract", [EvTimeDuration(d1), EvTimeDuration(d2)]) => + EvTimeDuration(DateTime.Duration.subtract(d1, d2))->Ok->Some + | ("multiply", [EvTimeDuration(d1), EvNumber(d2)]) => + EvTimeDuration(DateTime.Duration.multiply(d1, d2))->Ok->Some + | ("divide", [EvTimeDuration(d1), EvNumber(d2)]) => + EvTimeDuration(DateTime.Duration.divide(d1, d2))->Ok->Some | _ => None } } diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res index 6da34db1..c9363606 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res @@ -53,8 +53,8 @@ let rec toString = aValue => | EvSymbol(aString) => `:${aString}` | EvRecord(aRecord) => aRecord->toStringRecord | EvDistribution(dist) => GenericDist.toString(dist) - | EvDate(date) => E.Date.toString(date) - | EvTimeDuration(t) => E.Duration.toString(t) + | EvDate(date) => DateTime.Date.toString(date) + | EvTimeDuration(t) => DateTime.Duration.toString(t) } and toStringRecord = aRecord => { let pairs = diff --git a/packages/squiggle-lang/src/rescript/Utility/DateTime.res b/packages/squiggle-lang/src/rescript/Utility/DateTime.res new file mode 100644 index 00000000..344c8760 --- /dev/null +++ b/packages/squiggle-lang/src/rescript/Utility/DateTime.res @@ -0,0 +1,79 @@ +module Duration = { + //Stores in Unix milliseconds + type t = float + let minute = Belt.Float.fromInt(60 * 1000) + let hour = Belt.Float.fromInt(60 * 60 * 1000) + let day = Belt.Float.fromInt(24 * 60 * 60 * 1000) + let year = Belt.Float.fromInt(24 * 60 * 60 * 1000) *. 365.25 + let fromFloat = (f: float): t => f + let toFloat = (d: t): float => d + let fromMinutes = (h: float): t => h *. minute + let fromHours = (h: float): t => h *. hour + let fromDays = (d: float): t => d *. day + let fromYears = (y: float): t => y *. year + let toMinutes = (t: t): float => t /. minute + let toHours = (t: t): float => t /. hour + let toDays = (t: t): float => t /. day + let toYears = (t: t): float => t /. year + + let toString = (t: t): string => { + let shouldPluralize = f => f != 1.0 + let display = (f: float, s: string) => + `${E.Float.with3DigitsPrecision(f)} ${s}${shouldPluralize(f) ? "s" : ""}` + let abs = Js.Math.abs_float(t) + if abs >= year { + display(t /. year, "year") + } else if abs >= day { + display(t /. day, "day") + } else if abs >= hour { + display(t /. hour, "hour") + } else if abs >= minute { + display(t /. minute, "minute") + } else { + E.Float.toFixed(t) ++ "ms" + } + } + let add = (t1: t, t2: t): t => t1 +. t2 + let subtract = (t1: t, t2: t): t => t1 -. t2 + let multiply = (t1: t, t2: float): t => t1 *. t2 + let divide = (t1: t, t2: float): t => t1 /. t2 +} + +module Date = { + //The Rescript/JS implementation of Date is pretty mediocre. It would be good to improve upon later. + type t = Js.Date.t + let toFloat = Js.Date.getTime + let getFullYear = Js.Date.getFullYear + let toString = Js.Date.toDateString + let fromFloat = Js.Date.fromFloat + let fmap = (t: t, fn: float => float) => t->toFloat->fn->fromFloat + let subtract = (t1: t, t2: t) => { + let (f1, f2) = (toFloat(t1), toFloat(t2)) + let diff = f1 -. f2 + if diff < 0.0 { + Error("Cannot subtract a date by one that is in its future") + } else { + Ok(Duration.fromFloat(diff)) + } + } + let addDuration = (t: t, duration: Duration.t) => fmap(t, t => t +. duration) + let subtractDuration = (t: t, duration: Duration.t) => fmap(t, t => t -. duration) + //The Js.Date.makeWithYM function accepts a float, but only treats it as a whole number. + //Our version takes an integer to make this distinction clearer. + let makeWithYearInt = (y: int): result => { + if y < 100 { + Error("Year must be over 100") + } else if y > 200000 { + Error("Year must be less than 200000") + } else { + Ok(Js.Date.makeWithYM(~year=Belt.Float.fromInt(y), ~month=0.0, ())) + } + } + let makeFromYear = (year: float): result => { + let floor = year->Js.Math.floor_float + makeWithYearInt(Belt.Float.toInt(floor))->E.R2.fmap(earlyDate => { + let diff = year -. floor + earlyDate->addDuration(diff *. Duration.year) + }) + } +} diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 46787134..77b5c5e4 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -832,84 +832,4 @@ module JsArray = { |> Js.Array.filter(O.isSome) |> Js.Array.map(O.toExn("Warning: This should not have happened")) let filter = Js.Array.filter -} - -module Duration = { - //Stores in Unix milliseconds - type t = float - let minute = Belt.Float.fromInt(60 * 1000) - let hour = Belt.Float.fromInt(60 * 60 * 1000) - let day = Belt.Float.fromInt(24 * 60 * 60 * 1000) - let year = Belt.Float.fromInt(24 * 60 * 60 * 1000) *. 365.25 - let fromFloat = (f: float): t => f - let toFloat = (d: t): float => d - let fromMinutes = (h: float): t => h *. minute - let fromHours = (h: float): t => h *. hour - let fromDays = (d: float): t => d *. day - let fromYears = (y: float): t => y *. year - let toMinutes = (t: t): float => t /. minute - let toHours = (t: t): float => t /. hour - let toDays = (t: t): float => t /. day - let toYears = (t: t): float => t /. year - - let toString = (t: t): string => { - let shouldPluralize = f => f != 1.0 - let display = (f: float, s: string) => - `${Float.with3DigitsPrecision(f)} ${s}${shouldPluralize(f) ? "s" : ""}` - let abs = Js.Math.abs_float(t) - if abs >= year { - display(t /. year, "year") - } else if abs >= day { - display(t /. day, "day") - } else if abs >= hour { - display(t /. hour, "hour") - } else if abs >= minute { - display(t /. minute, "minute") - } else { - Float.toFixed(t) ++ "ms" - } - } - let add = (t1: t, t2: t): t => t1 +. t2 - let subtract = (t1: t, t2: t): t => t1 -. t2 - let multiply = (t1: t, t2: float): t => t1 *. t2 - let divide = (t1: t, t2: float): t => t1 /. t2 -} - -module Date = { - //The Rescript/JS implementation of Date is pretty mediocre. It would be good to improve upon later. - type t = Js.Date.t - let toFloat = Js.Date.getTime - let getFullYear = Js.Date.getFullYear - let toString = Js.Date.toDateString - let fromFloat = Js.Date.fromFloat - let fmap = (t: t, fn: float => float) => t->toFloat->fn->fromFloat - let subtract = (t1: t, t2: t) => { - let (f1, f2) = (toFloat(t1), toFloat(t2)) - let diff = f1 -. f2 - if diff < 0.0 { - Error("Cannot subtract a date by one that is in its future") - } else { - Ok(Duration.fromFloat(diff)) - } - } - let addDuration = (t: t, duration: Duration.t) => fmap(t, t => t +. duration) - let subtractDuration = (t: t, duration: Duration.t) => fmap(t, t => t -. duration) - //The Js.Date.makeWithYM function accepts a float, but only treats it as a whole number. - //Our version takes an integer to make this distinction clearer. - let makeWithYearInt = (y: int): result => { - if y < 100 { - Error("Year must be over 100") - } else if y > 200000 { - Error("Year must be less than 200000") - } else { - Ok(Js.Date.makeWithYM(~year=Belt.Float.fromInt(y), ~month=0.0, ())) - } - } - let makeFromYear = (year: float): result => { - let floor = year->Js.Math.floor_float - makeWithYearInt(Belt.Float.toInt(floor))->R2.fmap(earlyDate => { - let diff = year -. floor - earlyDate->addDuration(diff *. Duration.year) - }) - } -} +} \ No newline at end of file From 054e37959382f8dab494b5f22e131cbd1072c0d5 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Mon, 23 May 2022 13:47:54 -0400 Subject: [PATCH 226/340] Fixed test --- .../ReducerInterface/ReducerInterface_Distribution_test.res | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res index 48bdcaa5..15beced4 100644 --- a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res +++ b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res @@ -23,7 +23,7 @@ describe("eval on distribution functions", () => { testEval("-normal(5,2)", "Ok(Normal(-5,2))") }) describe("to", () => { - testEval("5 to 2", "Error(Distribution Math Error: Low value must be less than high value.)") + testEval("5 to 2", "Error(TODO: Low value must be less than high value.)") testEval("to(2,5)", "Ok(Lognormal(1.1512925464970227,0.27853260523016377))") testEval("to(-2,2)", "Ok(Normal(0,1.2159136638235384))") }) From 003b320acb826bd84d56b590fdfecaf3b977eac5 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Mon, 23 May 2022 14:28:32 -0400 Subject: [PATCH 227/340] Fixing lint and tests --- .../FunctionRegistry_Core.res | 3 - .../FunctionRegistry_Core.resi | 1 - .../FunctionRegistry_Helpers.res | 121 +++++++++++------- .../FunctionRegistry_Library.res | 21 ++- .../src/rescript/FunctionRegistry/README.md | 4 +- .../ReducerInterface_GenericDistribution.res | 11 -- 6 files changed, 97 insertions(+), 64 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res index 92c575f0..99ecc78f 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res @@ -133,8 +133,6 @@ module Matcher = { } module FnDefinition = { - type definitionMatch = MatchSimple.t - let matchAssumingSameName = (f: fnDefinition, args: array) => { switch FRType.matchWithExpressionValueArray(f.inputs, args) { | Some(_) => MatchSimple.FullMatch @@ -185,7 +183,6 @@ module Matcher = { fnName: string, inputIndex: int, } - type t = Match.t, match> let makeMatch = (fnName: string, inputIndex: int) => {fnName: fnName, inputIndex: inputIndex} } diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi index 55c060be..5ca8c708 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi @@ -33,7 +33,6 @@ type function = { type registry = array - // Note: The function "name" is just used for documentation purposes module Function: { type t = function diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index f7184704..118a15d2 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -5,7 +5,7 @@ let impossibleError = "Wrong inputs / Logically impossible" module Wrappers = { let symbolic = r => DistributionTypes.Symbolic(r) let evDistribution = r => ReducerInterface_ExpressionValue.EvDistribution(r) - let symbolicEvDistribution = r => r->Symbolic->evDistribution + let symbolicEvDistribution = r => r->DistributionTypes.Symbolic->evDistribution } module Prepare = { @@ -30,6 +30,13 @@ module Prepare = { } } + let oneDistOrNumber = (values: ts): result => { + switch values { + | [FRValueDistOrNumber(a1)] => Ok(a1) + | _ => Error(impossibleError) + } + } + module Record = { let twoDistOrNumber = (values: ts): result<(frValueDistOrNumber, frValueDistOrNumber), err> => values->ToValueArray.Record.twoArgs->E.R.bind(twoDistOrNumber) @@ -38,62 +45,78 @@ module Prepare = { } module Process = { - let twoDistsOrNumbersToDist = ( - ~fn: ((float, float)) => result, - ~values: (frValueDistOrNumber, frValueDistOrNumber), - ~env: DistributionOperation.env, - ): result => { - let toSampleSet = r => GenericDist.toSampleSetDist(r, env.sampleCount) - let mapFnResult = r => - switch r { - | Ok(r) => Ok(GenericDist.sample(r)) - | Error(r) => Error(Operation.Other(r)) - } + module DistOrNumberToDist = { + module Helpers = { + let toSampleSet = (r, env: DistributionOperation.env) => + GenericDist.toSampleSetDist(r, env.sampleCount) - let singleVarSample = (dist, fn) => { - switch toSampleSet(dist) { - | Ok(dist) => - switch SampleSetDist.samplesMap(~fn=f => fn(f)->mapFnResult, dist) { - | Ok(r) => Ok(DistributionTypes.SampleSet(r)) - | Error(r) => Error(DistributionTypes.Error.toString(DistributionTypes.SampleSetError(r))) + let mapFnResult = r => + switch r { + | Ok(r) => Ok(GenericDist.sample(r)) + | Error(r) => Error(Operation.Other(r)) } - | Error(r) => Error(DistributionTypes.Error.toString(r)) - } - } - let twoVarSample = (dist1, dist2, fn) => { - let altFn = (a, b) => fn((a, b))->mapFnResult - switch E.R.merge(toSampleSet(dist1), toSampleSet(dist2)) { - | Ok((t1, t2)) => - switch SampleSetDist.map2(~fn=altFn, ~t1, ~t2) { - | Ok(r) => Ok(DistributionTypes.SampleSet(r)) - | Error(r) => Error(Operation.Error.toString(r)) + let wrapSymbolic = (fn, r) => r->fn->E.R2.fmap(Wrappers.symbolic) + + let singleVarSample = (dist, fn, env) => { + switch toSampleSet(dist, env) { + | Ok(dist) => + switch SampleSetDist.samplesMap(~fn=f => fn(f)->mapFnResult, dist) { + | Ok(r) => Ok(DistributionTypes.SampleSet(r)) + | Error(r) => Error(DistributionTypes.Error.toString(DistributionTypes.SampleSetError(r))) + } + | Error(r) => Error(DistributionTypes.Error.toString(r)) + } + } + + let twoVarSample = (dist1, dist2, fn, env) => { + let altFn = (a, b) => fn((a, b))->mapFnResult + switch E.R.merge(toSampleSet(dist1, env), toSampleSet(dist2, env)) { + | Ok((t1, t2)) => + switch SampleSetDist.map2(~fn=altFn, ~t1, ~t2) { + | Ok(r) => Ok(DistributionTypes.SampleSet(r)) + | Error(r) => Error(Operation.Error.toString(r)) + } + | Error(r) => Error(DistributionTypes.Error.toString(r)) } - | Error(r) => Error(DistributionTypes.Error.toString(r)) } } - switch values { - | (FRValueNumber(a1), FRValueNumber(a2)) => fn((a1, a2)) - | (FRValueDist(a1), FRValueNumber(a2)) => singleVarSample(a1, r => fn((r, a2))) - | (FRValueNumber(a1), FRValueDist(a2)) => singleVarSample(a2, r => fn((a1, r))) - | (FRValueDist(a1), FRValueDist(a2)) => twoVarSample(a1, a2, fn) + let oneValue = ( + ~fn: float => result, + ~value: frValueDistOrNumber, + ~env: DistributionOperation.env, + ): result => { + switch value { + | FRValueNumber(a1) => fn(a1) + | FRValueDist(a1) => Helpers.singleVarSample(a1, r => fn(r), env) + } } - } - let twoDistsOrNumbersToDistUsingSymbolicDist = ( - ~fn: ((float, float)) => result, - ~values, - ) => { - let newFn = r => fn(r)->E.R2.fmap(Wrappers.symbolic) - twoDistsOrNumbersToDist(~fn=newFn, ~values) + let oneValueUsingSymbolicDist = (~fn, ~value) => oneValue(~fn=Helpers.wrapSymbolic(fn), ~value) + + let twoValues = ( + ~fn: ((float, float)) => result, + ~values: (frValueDistOrNumber, frValueDistOrNumber), + ~env: DistributionOperation.env, + ): result => { + switch values { + | (FRValueNumber(a1), FRValueNumber(a2)) => fn((a1, a2)) + | (FRValueDist(a1), FRValueNumber(a2)) => Helpers.singleVarSample(a1, r => fn((r, a2)), env) + | (FRValueNumber(a1), FRValueDist(a2)) => Helpers.singleVarSample(a2, r => fn((a1, r)), env) + | (FRValueDist(a1), FRValueDist(a2)) => Helpers.twoVarSample(a1, a2, fn, env) + } + } + + let twoValuesUsingSymbolicDist = (~fn, ~values) => + twoValues(~fn=Helpers.wrapSymbolic(fn), ~values) } } module TwoArgDist = { let process = (~fn, ~env, r) => r - ->E.R.bind(Process.twoDistsOrNumbersToDistUsingSymbolicDist(~fn, ~values=_, ~env)) + ->E.R.bind(Process.DistOrNumberToDist.twoValuesUsingSymbolicDist(~fn, ~values=_, ~env)) ->E.R2.fmap(Wrappers.evDistribution) let make = (name, fn) => { @@ -117,5 +140,17 @@ module TwoArgDist = { ~run=(inputs, env) => inputs->Prepare.ToValueTuple.Record.twoDistOrNumber->process(~fn, ~env), ) } - +} + +module OneArgDist = { + let process = (~fn, ~env, r) => + r + ->E.R.bind(Process.DistOrNumberToDist.oneValueUsingSymbolicDist(~fn, ~value=_, ~env)) + ->E.R2.fmap(Wrappers.evDistribution) + + let make = (name, fn) => { + FnDefinition.make(~name, ~inputs=[FRTypeDistOrNumber], ~run=(inputs, env) => + inputs->Prepare.ToValueTuple.oneDistOrNumber->process(~fn, ~env) + ) + } } diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index 98f739b3..43be7118 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -8,7 +8,9 @@ let registry = [ ~name="Normal", ~definitions=[ TwoArgDist.make("normal", twoArgs(SymbolicDist.Normal.make)), - TwoArgDist.makeRecordP5P95("normal", r => twoArgs(SymbolicDist.Normal.from90PercentCI, r)->Ok), + TwoArgDist.makeRecordP5P95("normal", r => + twoArgs(SymbolicDist.Normal.from90PercentCI, r)->Ok + ), TwoArgDist.makeRecordMeanStdev("normal", twoArgs(SymbolicDist.Normal.make)), ], ), @@ -44,9 +46,20 @@ let registry = [ ), Function.make( ~name="To", - ~definitions=[TwoArgDist.make("to", twoArgs(SymbolicDist.From90thPercentile.make)), - TwoArgDist.make("credibleIntervalToDistribution", twoArgs(SymbolicDist.From90thPercentile.make)) + ~definitions=[ + TwoArgDist.make("to", twoArgs(SymbolicDist.From90thPercentile.make)), + TwoArgDist.make( + "credibleIntervalToDistribution", + twoArgs(SymbolicDist.From90thPercentile.make), + ), ], - + ), + Function.make( + ~name="Exponential", + ~definitions=[OneArgDist.make("exponential", SymbolicDist.Exponential.make)], + ), + Function.make( + ~name="Bernoulli", + ~definitions=[OneArgDist.make("bernoulli", SymbolicDist.Bernoulli.make)], ), ] diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/README.md b/packages/squiggle-lang/src/rescript/FunctionRegistry/README.md index 3bdc387a..e974b189 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/README.md +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/README.md @@ -37,10 +37,10 @@ The Function name is just there for future documentation. The function defintion ## Key Files **FunctionRegistry_Core** -Key types, internal functionality, and a ``Registry`` module with a ``matchAndRun`` function to call function definitions. +Key types, internal functionality, and a `Registry` module with a `matchAndRun` function to call function definitions. **FunctionRegistry_Library** A list of all the Functions defined in the Function Registry. **FunctionRegistry_Helpers** -A list of helper functions for the FunctionRegistry_Library. \ No newline at end of file +A list of helper functions for the FunctionRegistry_Library. diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res index dfb3d745..dc827805 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res @@ -179,13 +179,6 @@ module Helpers = { } module SymbolicConstructors = { - let oneFloat = name => - switch name { - | "exponential" => Ok(SymbolicDist.Exponential.make) - | "bernoulli" => Ok(SymbolicDist.Bernoulli.make) - | _ => Error("Unreachable state") - } - let threeFloat = name => switch name { | "triangular" => Ok(SymbolicDist.Triangular.make) @@ -207,10 +200,6 @@ let dispatchToGenericOutput = ( ): option => { let (fnName, args) = call switch (fnName, args) { - | (("exponential" | "bernoulli") as fnName, [EvNumber(f)]) => - SymbolicConstructors.oneFloat(fnName) - ->E.R.bind(r => r(f)) - ->SymbolicConstructors.symbolicResultToOutput | ("delta", [EvNumber(f)]) => SymbolicDist.Float.makeSafe(f)->SymbolicConstructors.symbolicResultToOutput | ("triangular" as fnName, [EvNumber(f1), EvNumber(f2), EvNumber(f3)]) => From 62488185312c48e433cea495f0990a4cae6a63c9 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Mon, 23 May 2022 20:49:10 -0400 Subject: [PATCH 228/340] First attempt at function declaration --- .../FunctionRegistry_Core.res | 31 +++++++++- .../FunctionRegistry_Core.resi | 58 ------------------- .../FunctionRegistry_Helpers.res | 7 +++ .../FunctionRegistry_Library.res | 20 +++++++ .../squiggle-lang/src/rescript/Utility/E.res | 1 + 5 files changed, 57 insertions(+), 60 deletions(-) delete mode 100644 packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res index 99ecc78f..a88ce239 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res @@ -8,9 +8,12 @@ type rec frType = | FRTypeNumber | FRTypeNumeric | FRTypeDistOrNumber + | FRTLambda | FRTypeRecord(frTypeRecord) - | FRTypeArray(array) + | FRTypeArray(frType) | FRTypeOption(frType) + | FRTypeString + | FRTypeVariant(array) and frTypeRecord = array and frTypeRecordParam = (string, frType) @@ -22,8 +25,12 @@ type rec frValue = | FRValueNumber(float) | FRValueDist(DistributionTypes.genericDist) | FRValueOption(option) + | FRValueArray(array) | FRValueDistOrNumber(frValueDistOrNumber) | FRValueRecord(frValueRecord) + | FRValueLambda(ReducerInterface_ExpressionValue.lambdaValue) + | FRValueString(string) + | FRValueVariant(string) and frValueRecord = array and frValueRecordParam = (string, frValue) and frValueDistOrNumber = FRValueNumber(float) | FRValueDist(DistributionTypes.genericDist) @@ -52,8 +59,9 @@ module FRType = { let input = ((name, frType): frTypeRecordParam) => `${name}: ${toString(frType)}` `record({${r->E.A2.fmap(input)->E.A2.joinWith(", ")}})` } - | FRTypeArray(r) => `record(${r->E.A2.fmap(toString)->E.A2.joinWith(", ")})` + | FRTypeArray(r) => `record(${toString(r)})` | FRTypeOption(v) => `option(${toString(v)})` + | FRTLambda => `lambda` } let rec matchWithExpressionValue = (t: t, r: expressionValue): option => @@ -66,6 +74,7 @@ module FRType = { | (FRTypeNumeric, EvNumber(f)) => Some(FRValueNumber(f)) | (FRTypeNumeric, EvDistribution(Symbolic(#Float(f)))) => Some(FRValueNumber(f)) | (FRTypeOption(v), _) => Some(FRValueOption(matchWithExpressionValue(v, r))) + | (FRTLambda, EvLambda(f)) => Some(FRValueLambda(f)) | (FRTypeRecord(recordParams), EvRecord(record)) => { let getAndMatch = (name, input) => E.Dict.get(record, name)->E.O.bind(matchWithExpressionValue(input)) @@ -80,6 +89,24 @@ module FRType = { | _ => None } + let rec matchReverse = (e: frValue): expressionValue => + switch(e){ + | FRValueNumber(f) => (EvNumber(f)) + | FRValueDistOrNumber(FRValueNumber(n)) => EvNumber(n) + | FRValueDistOrNumber(FRValueDist(n)) => EvDistribution(n) + | FRValueDist(dist) => EvDistribution(dist) + | FRValueOption(Some(r)) => matchReverse(r) + | FRValueArray(elements) => EvArray(elements->E.A2.fmap(matchReverse)) + | FRValueRecord(frValueRecord) => { + let record = frValueRecord->E.A2.fmap(((name, value)) => (name, matchReverse(value)))->E.Dict.fromArray + EvRecord(record) + } + | FRValueLambda(l) => EvLambda(l) + | FRValueString(string) => EvString(string) + | FRValueVariant(string) => EvString(string) + } + + // | FRValueOption(None) => break let matchWithExpressionValueArray = (inputs: array, args: array): option< array, > => { diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi deleted file mode 100644 index 5ca8c708..00000000 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.resi +++ /dev/null @@ -1,58 +0,0 @@ -type expressionValue = ReducerInterface_ExpressionValue.expressionValue - -type rec frType = - | FRTypeNumber - | FRTypeNumeric - | FRTypeDistOrNumber - | FRTypeRecord(frTypeRecord) - | FRTypeArray(array) - | FRTypeOption(frType) -and frTypeRecord = array -and frTypeRecordParam = (string, frType) - -type rec frValue = - | FRValueNumber(float) - | FRValueDist(DistributionTypes.genericDist) - | FRValueOption(option) - | FRValueDistOrNumber(frValueDistOrNumber) - | FRValueRecord(frValueRecord) -and frValueRecord = array -and frValueRecordParam = (string, frValue) -and frValueDistOrNumber = FRValueNumber(float) | FRValueDist(DistributionTypes.genericDist) - -type fnDefinition = { - name: string, - inputs: array, - run: (array, DistributionOperation.env) => result, -} - -type function = { - name: string, - definitions: array, -} - -type registry = array - -// Note: The function "name" is just used for documentation purposes -module Function: { - type t = function - let make: (~name: string, ~definitions: array) => t -} - -module FnDefinition: { - type t = fnDefinition - let make: ( - ~name: string, - ~inputs: array, - ~run: (array, DistributionOperation.env) => result, - ) => t -} - -module Registry: { - let matchAndRun: ( - ~registry: registry, - ~fnName: string, - ~args: array, - ~env: QuriSquiggleLang.DistributionOperation.env, - ) => option> -} diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index 118a15d2..2d21d07a 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -30,6 +30,13 @@ module Prepare = { } } + let twoNumbers = (values: ts): result<(float, float), err> => { + switch values { + | [FRValueNumber(a1), FRValueNumber(a2)] => Ok(a1, a2) + | _ => Error(impossibleError) + } + } + let oneDistOrNumber = (values: ts): result => { switch values { | [FRValueDistOrNumber(a1)] => Ok(a1) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index 43be7118..5a12e496 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -3,7 +3,27 @@ open FunctionRegistry_Helpers let twoArgs = E.Tuple2.toFnCall +// ~run=(inputs, env) => switch(inputs->FunctionRegistry_Helpers.Prepare.ToValueArray.Record.twoArgs){ +// | (FRTypeArray(records), FRValueLambdaValue(fn)) => { +// records->E.A.fmap2(r => r->FunctionRegistry_Helpers.Prepare.ToValueArray.Record.twoArgs->FunctionRegistry_Helpers.Prepare) +// }) +// } +// let variant = FRTypeVariant(["Numeric", "Date"]) +let recordType = FRTypeRecord([("min", FRTypeNumber), ("max", FRTypeNumber)]) let registry = [ + Function.make( + ~name="FnMake", + ~definitions=[ + FnDefinition.make( + ~name="declareFn", + ~inputs=[FRTypeRecord([("inputs", FRTypeArray(recordType))])], + ~run=(inputs, _) => { + let foo = FunctionRegistry_Core.FRType.matchReverse(inputs->E.A.unsafe_get(0)) + foo->Ok + } + ), + ], + ), Function.make( ~name="Normal", ~definitions=[ diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 3357f4f4..35d9fe4d 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -864,4 +864,5 @@ module Dict = { type t<'a> = Js.Dict.t<'a> let get = Js.Dict.get let keys = Js.Dict.keys + let fromArray = Js.Dict.fromArray } From 31e6f13472e83a3fe974a7c9d123ba408e123efa Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 24 May 2022 07:52:27 -0400 Subject: [PATCH 229/340] Minor cleanup --- .../FunctionRegistry_Core.res | 12 +++- .../FunctionRegistry_Helpers.res | 6 ++ .../FunctionRegistry_Library.res | 60 ++++++++++++++----- 3 files changed, 60 insertions(+), 18 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res index a88ce239..da5260c6 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res @@ -8,7 +8,7 @@ type rec frType = | FRTypeNumber | FRTypeNumeric | FRTypeDistOrNumber - | FRTLambda + | FRTypeLambda | FRTypeRecord(frTypeRecord) | FRTypeArray(frType) | FRTypeOption(frType) @@ -61,7 +61,9 @@ module FRType = { } | FRTypeArray(r) => `record(${toString(r)})` | FRTypeOption(v) => `option(${toString(v)})` - | FRTLambda => `lambda` + | FRTypeLambda => `lambda` + | FRTypeString => `string` + | FRTypeVariant(_) => "variant" } let rec matchWithExpressionValue = (t: t, r: expressionValue): option => @@ -74,7 +76,11 @@ module FRType = { | (FRTypeNumeric, EvNumber(f)) => Some(FRValueNumber(f)) | (FRTypeNumeric, EvDistribution(Symbolic(#Float(f)))) => Some(FRValueNumber(f)) | (FRTypeOption(v), _) => Some(FRValueOption(matchWithExpressionValue(v, r))) - | (FRTLambda, EvLambda(f)) => Some(FRValueLambda(f)) + | (FRTypeLambda, EvLambda(f)) => Some(FRValueLambda(f)) + | (FRTypeArray(intendedType), EvArray(elements)) => { + let el = elements->E.A2.fmap(matchWithExpressionValue(intendedType)) + E.A.O.openIfAllSome(el)->E.O2.fmap(r => FRValueArray(r)) + } | (FRTypeRecord(recordParams), EvRecord(record)) => { let getAndMatch = (name, input) => E.Dict.get(record, name)->E.O.bind(matchWithExpressionValue(input)) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index 2d21d07a..d10bbff5 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -19,6 +19,12 @@ module Prepare = { | [FRValueRecord([(_, n1), (_, n2)])] => Ok([n1, n2]) | _ => Error(impossibleError) } + + let toArgs = (inputs: ts): result => + switch inputs { + | [FRValueRecord(args)] => args->E.A2.fmap(((_, b)) => b)->Ok + | _ => Error(impossibleError) + } } } diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index 5a12e496..d2611b9d 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -3,25 +3,55 @@ open FunctionRegistry_Helpers let twoArgs = E.Tuple2.toFnCall -// ~run=(inputs, env) => switch(inputs->FunctionRegistry_Helpers.Prepare.ToValueArray.Record.twoArgs){ -// | (FRTypeArray(records), FRValueLambdaValue(fn)) => { -// records->E.A.fmap2(r => r->FunctionRegistry_Helpers.Prepare.ToValueArray.Record.twoArgs->FunctionRegistry_Helpers.Prepare) -// }) -// } -// let variant = FRTypeVariant(["Numeric", "Date"]) -let recordType = FRTypeRecord([("min", FRTypeNumber), ("max", FRTypeNumber)]) +module FnDeclaration = { + type range = {min: float, max: float} + let makeRange = (min, max) => {min: min, max: max} + type t = { + fn: ReducerInterface_ExpressionValue.lambdaValue, + args: array, + } + + let validate = (def: t) => { + let {parameters, _} = def.fn + E.A.length(parameters) == E.A.length(def.args) + } + + let frType = FRTypeRecord([ + ("fn", FRTypeLambda), + ("inputs", FRTypeArray(FRTypeRecord([("min", FRTypeNumber), ("max", FRTypeNumber)]))), + ]) + + let fromExpressionValue = (e: expressionValue) => { + let values = FunctionRegistry_Core.FRType.matchWithExpressionValue(frType, e) + switch values->E.O2.fmap(r => + FunctionRegistry_Helpers.Prepare.ToValueArray.Record.twoArgs([r]) + ) { + | Some(Ok([FRValueLambda(lambda), FRValueArray(inputs)])) => { + open FunctionRegistry_Helpers.Prepare + let getMinMax = arg => + ToValueArray.Record.toArgs([arg]) + ->E.R.bind(ToValueTuple.twoNumbers) + ->E.R2.fmap(((min, max)) => makeRange(min, max)) + inputs + ->E.A2.fmap(getMinMax) + ->E.A.R.firstErrorOrOpen + ->E.R2.fmap(args => {fn: lambda, args: args}) + } + | _ => Error("Error") + } + } +} + let registry = [ Function.make( ~name="FnMake", ~definitions=[ - FnDefinition.make( - ~name="declareFn", - ~inputs=[FRTypeRecord([("inputs", FRTypeArray(recordType))])], - ~run=(inputs, _) => { - let foo = FunctionRegistry_Core.FRType.matchReverse(inputs->E.A.unsafe_get(0)) - foo->Ok - } - ), + FnDefinition.make(~name="declareFn", ~inputs=[FnDeclaration.frType], ~run=(inputs, _) => { + let result = inputs->E.A.unsafe_get(0)->FunctionRegistry_Core.FRType.matchReverse->Ok + let foo = result->E.R2.fmap(FnDeclaration.fromExpressionValue) + Js.log2("HIHIHI", foo) + result + }), ], ), Function.make( From 5fd5c1c1f86fe863da751e47d4652482f082e5cc Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 24 May 2022 14:12:49 -0400 Subject: [PATCH 230/340] Formatted Code --- packages/squiggle-lang/src/js/rescript_interop.ts | 2 +- .../rescript/ReducerInterface/ReducerInterface_DateTime.res | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/squiggle-lang/src/js/rescript_interop.ts b/packages/squiggle-lang/src/js/rescript_interop.ts index 3bc7ccbb..7bb98b5d 100644 --- a/packages/squiggle-lang/src/js/rescript_interop.ts +++ b/packages/squiggle-lang/src/js/rescript_interop.ts @@ -96,7 +96,7 @@ export type squiggleExpression = | tagged<"number", number> | tagged<"date", Date> | tagged<"timeDuration", number> - | tagged<"record", { [key: string]: squiggleExpression }> + | tagged<"record", { [key: string]: squiggleExpression }>; export { lambdaValue }; diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res index ee7b1a7c..0fcd04e9 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res @@ -1,11 +1,11 @@ module ExpressionValue = ReducerInterface_ExpressionValue type expressionValue = ExpressionValue.expressionValue -let dateDispatch = (call: ExpressionValue.functionCall, env: DistributionOperation.env): option< +let dateDispatch = (call: ExpressionValue.functionCall, _: DistributionOperation.env): option< result, > => { switch call { - | ("toString", [EvDate(t)]) => EvString(DateTime.Date.toString(t))->Ok->Some + | ("toString", [EvDate(t)]) => ExpressionValue.EvString(DateTime.Date.toString(t))->Ok->Some | ("makeDateFromYear", [EvNumber(year)]) => switch DateTime.Date.makeFromYear(year) { | Ok(t) => EvDate(t)->Ok->Some From 1e4aecd4fcd8efe47e7ea10a4c4e96eecfb28dc0 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 24 May 2022 14:23:26 -0400 Subject: [PATCH 231/340] Delete Reducer_Peggy_GeneratedParser.js I'm pretty sure this should be in the gitignore. --- .../Reducer_Peggy_GeneratedParser.js | 4740 ----------------- 1 file changed, 4740 deletions(-) delete mode 100644 packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js deleted file mode 100644 index 239cc876..00000000 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.js +++ /dev/null @@ -1,4740 +0,0 @@ -// Generated by Peggy 1.2.0. -// -// https://peggyjs.org/ - -"use strict"; - - - var toFunction = { - '-': 'subtract', - '->': 'pipe', - '!=': 'unequal', - '.-': 'dotSubtract', - '.*': 'dotMultiply', - './': 'dotDivide', - '.^': 'dotPow', - '.+': 'dotAdd', - '*': 'multiply', - '/': 'divide', - '&&': 'and', - '^': 'pow', // or xor - '+': 'add', - '<': 'smaller', - '<=': 'smallerEq', - '==': 'equal', - '>': 'larger', - '>=': 'largerEq', - '||': 'or', - 'to': 'credibleIntervalToDistribution', - } - - var unaryToFunction = { - '-': 'unaryMinus', - '!': 'not', - '.-': 'unaryDotMinus', - } - - var postOperatorToFunction = { - '.': '$_atIndex_$', - '()': '$$_applyAll_$$', - '[]': '$_atIndex_$', - } - - function nodeBlock(statements) {return{type: 'Block', statements: statements}} - function nodeBoolean(value) {return {type: 'Boolean', value: value}} - function nodeCallIndentifier(value) {return {type: 'CallIdentifier', value: value}} - function nodeExpression(args) {return {type: 'Expression', nodes: args}} - function nodeFloat(value) {return {type: 'Float', value: value}} - function makeFunctionCall(fn, args) { - if (fn === '$$_applyAll_$$') { - // Any list of values is applied from left to right anyway. - // Like in Haskell and Lisp. - // So we remove the redundant $$_applyAll_$$. - if (args[0].type === "Identifier") {args[0].type = "CallIdentifier"} - return nodeExpression(args) - } else { - return nodeExpression([nodeCallIndentifier(fn), ...args]) - } - } - function nodeIdentifier(value) {return {type: 'Identifier', value: value}} - function nodeInteger(value) {return {type: 'Integer', value: value}} - function nodeKeyValue(key, value) { - if (key.type === 'Identifier') {key.type = 'String'} - return {type: 'KeyValue', key: key, value: value}} - function nodeLambda(args, body) {return {type: 'Lambda', args: args, body: body}} - function nodeLetStatment(variable, value) {return {type: 'LetStatement', variable: variable, value: value}} - function nodeString(value) {return {type: 'String', value: value}} - function nodeTernary(condition, trueExpression, falseExpression) {return {type: 'Ternary', condition: condition, trueExpression: trueExpression, falseExpression: falseExpression}} - - -function peg$subclass(child, parent) { - function C() { this.constructor = child; } - C.prototype = parent.prototype; - child.prototype = new C(); -} - -function peg$SyntaxError(message, expected, found, location) { - var self = Error.call(this, message); - if (Object.setPrototypeOf) { - Object.setPrototypeOf(self, peg$SyntaxError.prototype); - } - self.expected = expected; - self.found = found; - self.location = location; - self.name = "SyntaxError"; - return self; -} - -peg$subclass(peg$SyntaxError, Error); - -function peg$padEnd(str, targetLength, padString) { - padString = padString || " "; - if (str.length > targetLength) { return str; } - targetLength -= str.length; - padString += padString.repeat(targetLength); - return str + padString.slice(0, targetLength); -} - -peg$SyntaxError.prototype.format = function(sources) { - var str = "Error: " + this.message; - if (this.location) { - var src = null; - var k; - for (k = 0; k < sources.length; k++) { - if (sources[k].source === this.location.source) { - src = sources[k].text.split(/\r\n|\n|\r/g); - break; - } - } - var s = this.location.start; - var loc = this.location.source + ":" + s.line + ":" + s.column; - if (src) { - var e = this.location.end; - var filler = peg$padEnd("", s.line.toString().length); - var line = src[s.line - 1]; - var last = s.line === e.line ? e.column : line.length + 1; - str += "\n --> " + loc + "\n" - + filler + " |\n" - + s.line + " | " + line + "\n" - + filler + " | " + peg$padEnd("", s.column - 1) - + peg$padEnd("", last - s.column, "^"); - } else { - str += "\n at " + loc; - } - } - return str; -}; - -peg$SyntaxError.buildMessage = function(expected, found) { - var DESCRIBE_EXPECTATION_FNS = { - literal: function(expectation) { - return "\"" + literalEscape(expectation.text) + "\""; - }, - - class: function(expectation) { - var escapedParts = expectation.parts.map(function(part) { - return Array.isArray(part) - ? classEscape(part[0]) + "-" + classEscape(part[1]) - : classEscape(part); - }); - - return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]"; - }, - - any: function() { - return "any character"; - }, - - end: function() { - return "end of input"; - }, - - other: function(expectation) { - return expectation.description; - } - }; - - function hex(ch) { - return ch.charCodeAt(0).toString(16).toUpperCase(); - } - - function literalEscape(s) { - return s - .replace(/\\/g, "\\\\") - .replace(/"/g, "\\\"") - .replace(/\0/g, "\\0") - .replace(/\t/g, "\\t") - .replace(/\n/g, "\\n") - .replace(/\r/g, "\\r") - .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) - .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); - } - - function classEscape(s) { - return s - .replace(/\\/g, "\\\\") - .replace(/\]/g, "\\]") - .replace(/\^/g, "\\^") - .replace(/-/g, "\\-") - .replace(/\0/g, "\\0") - .replace(/\t/g, "\\t") - .replace(/\n/g, "\\n") - .replace(/\r/g, "\\r") - .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) - .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); - } - - function describeExpectation(expectation) { - return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation); - } - - function describeExpected(expected) { - var descriptions = expected.map(describeExpectation); - var i, j; - - descriptions.sort(); - - if (descriptions.length > 0) { - for (i = 1, j = 1; i < descriptions.length; i++) { - if (descriptions[i - 1] !== descriptions[i]) { - descriptions[j] = descriptions[i]; - j++; - } - } - descriptions.length = j; - } - - switch (descriptions.length) { - case 1: - return descriptions[0]; - - case 2: - return descriptions[0] + " or " + descriptions[1]; - - default: - return descriptions.slice(0, -1).join(", ") - + ", or " - + descriptions[descriptions.length - 1]; - } - } - - function describeFound(found) { - return found ? "\"" + literalEscape(found) + "\"" : "end of input"; - } - - return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found."; -}; - -function peg$parse(input, options) { - options = options !== undefined ? options : {}; - - var peg$FAILED = {}; - var peg$source = options.grammarSource; - - var peg$startRuleFunctions = { start: peg$parsestart }; - var peg$startRuleFunction = peg$parsestart; - - var peg$c0 = "{"; - var peg$c1 = "}"; - var peg$c2 = "("; - var peg$c3 = ")"; - var peg$c4 = "="; - var peg$c5 = ","; - var peg$c6 = "if"; - var peg$c7 = "then"; - var peg$c8 = "else"; - var peg$c9 = "?"; - var peg$c10 = ":"; - var peg$c11 = "||"; - var peg$c12 = "&&"; - var peg$c13 = "=="; - var peg$c14 = "!="; - var peg$c15 = "<="; - var peg$c16 = "<"; - var peg$c17 = ">="; - var peg$c18 = ">"; - var peg$c19 = "+"; - var peg$c20 = "-"; - var peg$c21 = ".+"; - var peg$c22 = ".-"; - var peg$c23 = "*"; - var peg$c24 = "/"; - var peg$c25 = ".*"; - var peg$c26 = "./"; - var peg$c27 = "^"; - var peg$c28 = ".^"; - var peg$c29 = "to"; - var peg$c30 = "->"; - var peg$c31 = "|>"; - var peg$c32 = "!"; - var peg$c33 = "["; - var peg$c34 = "."; - var peg$c35 = "]"; - var peg$c36 = "'"; - var peg$c37 = "\""; - var peg$c38 = "true"; - var peg$c39 = "false"; - var peg$c40 = "|"; - var peg$c41 = ";"; - var peg$c42 = "//"; - var peg$c43 = "#"; - var peg$c44 = "/*"; - var peg$c45 = "*/"; - - var peg$r0 = /^[_a-z]/; - var peg$r1 = /^[_a-z0-9]/i; - var peg$r2 = /^[$_a-z]/; - var peg$r3 = /^[$_a-z0-9]/i; - var peg$r4 = /^[^']/; - var peg$r5 = /^[^"]/; - var peg$r6 = /^[e]/i; - var peg$r7 = /^[0-9]/; - var peg$r8 = /^[^\r\n]/; - var peg$r9 = /^[^*]/; - var peg$r10 = /^[ \t]/; - var peg$r11 = /^[\n\r]/; - - var peg$e0 = peg$literalExpectation("{", false); - var peg$e1 = peg$literalExpectation("}", false); - var peg$e2 = peg$literalExpectation("(", false); - var peg$e3 = peg$literalExpectation(")", false); - var peg$e4 = peg$otherExpectation("assignment"); - var peg$e5 = peg$literalExpectation("=", false); - var peg$e6 = peg$literalExpectation(",", false); - var peg$e7 = peg$literalExpectation("if", false); - var peg$e8 = peg$literalExpectation("then", false); - var peg$e9 = peg$literalExpectation("else", false); - var peg$e10 = peg$literalExpectation("?", false); - var peg$e11 = peg$literalExpectation(":", false); - var peg$e12 = peg$otherExpectation("operator"); - var peg$e13 = peg$literalExpectation("||", false); - var peg$e14 = peg$literalExpectation("&&", false); - var peg$e15 = peg$literalExpectation("==", false); - var peg$e16 = peg$literalExpectation("!=", false); - var peg$e17 = peg$literalExpectation("<=", false); - var peg$e18 = peg$literalExpectation("<", false); - var peg$e19 = peg$literalExpectation(">=", false); - var peg$e20 = peg$literalExpectation(">", false); - var peg$e21 = peg$literalExpectation("+", false); - var peg$e22 = peg$literalExpectation("-", false); - var peg$e23 = peg$literalExpectation(".+", false); - var peg$e24 = peg$literalExpectation(".-", false); - var peg$e25 = peg$literalExpectation("*", false); - var peg$e26 = peg$literalExpectation("/", false); - var peg$e27 = peg$literalExpectation(".*", false); - var peg$e28 = peg$literalExpectation("./", false); - var peg$e29 = peg$literalExpectation("^", false); - var peg$e30 = peg$literalExpectation(".^", false); - var peg$e31 = peg$literalExpectation("to", false); - var peg$e32 = peg$literalExpectation("->", false); - var peg$e33 = peg$literalExpectation("|>", false); - var peg$e34 = peg$otherExpectation("unary operator"); - var peg$e35 = peg$literalExpectation("!", false); - var peg$e36 = peg$literalExpectation("[", false); - var peg$e37 = peg$literalExpectation(".", false); - var peg$e38 = peg$literalExpectation("]", false); - var peg$e39 = peg$otherExpectation("identifier"); - var peg$e40 = peg$classExpectation(["_", ["a", "z"]], false, false); - var peg$e41 = peg$classExpectation(["_", ["a", "z"], ["0", "9"]], false, true); - var peg$e42 = peg$otherExpectation("$identifier"); - var peg$e43 = peg$classExpectation(["$", "_", ["a", "z"]], false, false); - var peg$e44 = peg$classExpectation(["$", "_", ["a", "z"], ["0", "9"]], false, true); - var peg$e45 = peg$otherExpectation("string"); - var peg$e46 = peg$literalExpectation("'", false); - var peg$e47 = peg$classExpectation(["'"], true, false); - var peg$e48 = peg$literalExpectation("\"", false); - var peg$e49 = peg$classExpectation(["\""], true, false); - var peg$e50 = peg$otherExpectation("integer"); - var peg$e51 = peg$classExpectation(["e"], false, true); - var peg$e52 = peg$otherExpectation("float"); - var peg$e53 = peg$classExpectation([["0", "9"]], false, false); - var peg$e54 = peg$otherExpectation("boolean"); - var peg$e55 = peg$literalExpectation("true", false); - var peg$e56 = peg$literalExpectation("false", false); - var peg$e57 = peg$literalExpectation("|", false); - var peg$e58 = peg$otherExpectation("array"); - var peg$e59 = peg$otherExpectation("record"); - var peg$e60 = peg$otherExpectation("whitespace"); - var peg$e61 = peg$otherExpectation("optional whitespace or newline"); - var peg$e62 = peg$otherExpectation("whitespace or newline"); - var peg$e63 = peg$otherExpectation("statement separator"); - var peg$e64 = peg$literalExpectation(";", false); - var peg$e65 = peg$otherExpectation("line comment"); - var peg$e66 = peg$literalExpectation("//", false); - var peg$e67 = peg$literalExpectation("#", false); - var peg$e68 = peg$classExpectation(["\r", "\n"], true, false); - var peg$e69 = peg$otherExpectation("comment"); - var peg$e70 = peg$literalExpectation("/*", false); - var peg$e71 = peg$classExpectation(["*"], true, false); - var peg$e72 = peg$literalExpectation("*/", false); - var peg$e73 = peg$classExpectation([" ", "\t"], false, false); - var peg$e74 = peg$otherExpectation("newline"); - var peg$e75 = peg$classExpectation(["\n", "\r"], false, false); - - var peg$f0 = function(start) {return start}; - var peg$f1 = function(statements, finalExpression) { if (finalExpression != null) { statements.push(finalExpression) } - return nodeBlock(statements) }; - var peg$f2 = function(finalExpression) { return nodeBlock([finalExpression])}; - var peg$f3 = function(statements, finalExpression) { statements.push(finalExpression) - return nodeBlock(statements) }; - var peg$f4 = function(finalExpression) { return nodeBlock([finalExpression]) }; - var peg$f5 = function(head, tail) { return [head, ...tail] }; - var peg$f6 = function(head) { return [head] }; - var peg$f7 = function(variable, value) { return nodeLetStatment(variable, value) }; - var peg$f8 = function(variable, args, body) { var value = nodeLambda(args, body) - return nodeLetStatment(variable, value) }; - var peg$f9 = function(head, tail) { return [head, ...tail]; }; - var peg$f10 = function(condition, trueExpression, falseExpression) { return nodeTernary(condition, trueExpression, falseExpression) }; - var peg$f11 = function(head, operator, arg) {return {operator: operator, right: arg}}; - var peg$f12 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(toFunction[element.operator], [result, element.right]) - }, head)}; - var peg$f13 = function(left, operator, right) { return makeFunctionCall(toFunction[operator], [left, right])}; - var peg$f14 = function(head, chained) {return chained}; - var peg$f15 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(element.fnName, [result, ...element.args]) - }, head)}; - var peg$f16 = function(fn, args) { return {fnName: fn.value, args: args}}; - var peg$f17 = function(fn) { return {fnName: fn.value, args: []}}; - var peg$f18 = function(unaryOperator, right) { return makeFunctionCall(unaryToFunction[unaryOperator], [right])}; - var peg$f19 = function(head, arg) {return {fn: postOperatorToFunction['[]'], args: [arg]}}; - var peg$f20 = function(head, args) {return {fn: postOperatorToFunction['()'], args: args}}; - var peg$f21 = function(head, arg) {return {fn: postOperatorToFunction['[]'], args: [nodeString(arg)]}}; - var peg$f22 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(element.fn, [result, ...element.args]) - }, head)}; - var peg$f23 = function(head, arg) {return {fn: postOperatorToFunction['.'], args: [nodeString(arg)]}}; - var peg$f24 = function(head, tail) { return tail.reduce(function(result, element) { - return makeFunctionCall(element.fn, [result, ...element.args]) - }, head)}; - var peg$f25 = function(expression) {return expression}; - var peg$f26 = function() {return nodeIdentifier(text())}; - var peg$f27 = function(characters) {return nodeString(characters.join(''))}; - var peg$f28 = function(number, unit) { - if (unit === null) - { return number } - else - { return makeFunctionCall('fromUnit_'+unit.value, [number]) - } - }; - var peg$f29 = function() { return nodeInteger(parseInt(text()))}; - var peg$f30 = function() { return nodeFloat(parseFloat(text()))}; - var peg$f31 = function() { return nodeBoolean(text() === 'true')}; - var peg$f32 = function(args, statements, finalExpression) { statements.push(finalExpression) - return nodeLambda(args, nodeBlock(statements)) }; - var peg$f33 = function(args, finalExpression) { return nodeLambda(args, nodeBlock([finalExpression])) }; - var peg$f34 = function() { return makeFunctionCall('$_constructArray_$', [nodeExpression([])])}; - var peg$f35 = function(args) { return makeFunctionCall('$_constructArray_$', [nodeExpression(args)])}; - var peg$f36 = function(args) { return makeFunctionCall('$_constructRecord_$', [nodeExpression(args)])}; - var peg$f37 = function(key, value) { return nodeKeyValue(key, value)}; - - var peg$currPos = 0; - var peg$savedPos = 0; - var peg$posDetailsCache = [{ line: 1, column: 1 }]; - var peg$maxFailPos = 0; - var peg$maxFailExpected = []; - var peg$silentFails = 0; - - var peg$resultsCache = {}; - - var peg$result; - - if ("startRule" in options) { - if (!(options.startRule in peg$startRuleFunctions)) { - throw new Error("Can't start parsing from rule \"" + options.startRule + "\"."); - } - - peg$startRuleFunction = peg$startRuleFunctions[options.startRule]; - } - - function text() { - return input.substring(peg$savedPos, peg$currPos); - } - - function offset() { - return peg$savedPos; - } - - function range() { - return { - source: peg$source, - start: peg$savedPos, - end: peg$currPos - }; - } - - function location() { - return peg$computeLocation(peg$savedPos, peg$currPos); - } - - function expected(description, location) { - location = location !== undefined - ? location - : peg$computeLocation(peg$savedPos, peg$currPos); - - throw peg$buildStructuredError( - [peg$otherExpectation(description)], - input.substring(peg$savedPos, peg$currPos), - location - ); - } - - function error(message, location) { - location = location !== undefined - ? location - : peg$computeLocation(peg$savedPos, peg$currPos); - - throw peg$buildSimpleError(message, location); - } - - function peg$literalExpectation(text, ignoreCase) { - return { type: "literal", text: text, ignoreCase: ignoreCase }; - } - - function peg$classExpectation(parts, inverted, ignoreCase) { - return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase }; - } - - function peg$anyExpectation() { - return { type: "any" }; - } - - function peg$endExpectation() { - return { type: "end" }; - } - - function peg$otherExpectation(description) { - return { type: "other", description: description }; - } - - function peg$computePosDetails(pos) { - var details = peg$posDetailsCache[pos]; - var p; - - if (details) { - return details; - } else { - p = pos - 1; - while (!peg$posDetailsCache[p]) { - p--; - } - - details = peg$posDetailsCache[p]; - details = { - line: details.line, - column: details.column - }; - - while (p < pos) { - if (input.charCodeAt(p) === 10) { - details.line++; - details.column = 1; - } else { - details.column++; - } - - p++; - } - - peg$posDetailsCache[pos] = details; - - return details; - } - } - - function peg$computeLocation(startPos, endPos) { - var startPosDetails = peg$computePosDetails(startPos); - var endPosDetails = peg$computePosDetails(endPos); - - return { - source: peg$source, - start: { - offset: startPos, - line: startPosDetails.line, - column: startPosDetails.column - }, - end: { - offset: endPos, - line: endPosDetails.line, - column: endPosDetails.column - } - }; - } - - function peg$fail(expected) { - if (peg$currPos < peg$maxFailPos) { return; } - - if (peg$currPos > peg$maxFailPos) { - peg$maxFailPos = peg$currPos; - peg$maxFailExpected = []; - } - - peg$maxFailExpected.push(expected); - } - - function peg$buildSimpleError(message, location) { - return new peg$SyntaxError(message, null, null, location); - } - - function peg$buildStructuredError(expected, found, location) { - return new peg$SyntaxError( - peg$SyntaxError.buildMessage(expected, found), - expected, - found, - location - ); - } - - function peg$parsestart() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 68 + 0; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parse_nl(); - s2 = peg$parseouterBlock(); - if (s2 !== peg$FAILED) { - s3 = peg$parse_nl(); - s4 = peg$parsefinalComment(); - if (s4 === peg$FAILED) { - s4 = null; - } - peg$savedPos = s0; - s0 = peg$f0(s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsezeroOMoreArgumentsBlockOrExpression() { - var s0; - - var key = peg$currPos * 68 + 1; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parseinnerBlockOrExpression(); - if (s0 === peg$FAILED) { - s0 = peg$parselambda(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseouterBlock() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 68 + 2; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsearray_statements(); - if (s1 !== peg$FAILED) { - s2 = peg$currPos; - s3 = peg$parsestatementSeparator(); - if (s3 !== peg$FAILED) { - s4 = peg$parseexpression(); - if (s4 !== peg$FAILED) { - s2 = s4; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - if (s2 === peg$FAILED) { - s2 = null; - } - peg$savedPos = s0; - s0 = peg$f1(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parseexpression(); - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f2(s1); - } - s0 = s1; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseinnerBlockOrExpression() { - var s0, s1; - - var key = peg$currPos * 68 + 3; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parsequotedInnerBlock(); - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parseexpression(); - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f2(s1); - } - s0 = s1; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsequotedInnerBlock() { - var s0, s1, s2, s3, s4, s5, s6; - - var key = peg$currPos * 68 + 4; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parsearray_statements(); - if (s3 !== peg$FAILED) { - s4 = peg$currPos; - s5 = peg$parsestatementSeparator(); - if (s5 !== peg$FAILED) { - s6 = peg$parseexpression(); - if (s6 !== peg$FAILED) { - s4 = s6; - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - if (s4 !== peg$FAILED) { - s5 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 125) { - s6 = peg$c1; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s6 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f3(s3, s4); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parseexpression(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 125) { - s5 = peg$c1; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f4(s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearray_statements() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 68 + 5; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsestatement(); - if (s1 !== peg$FAILED) { - s2 = peg$currPos; - s3 = peg$parsestatementSeparator(); - if (s3 !== peg$FAILED) { - s4 = peg$parsearray_statements(); - if (s4 !== peg$FAILED) { - s2 = s4; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f5(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parsestatement(); - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f6(s1); - } - s0 = s1; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsestatement() { - var s0; - - var key = peg$currPos * 68 + 6; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parseletStatement(); - if (s0 === peg$FAILED) { - s0 = peg$parsedefunStatement(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseletStatement() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 68 + 7; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseidentifier(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_(); - s3 = peg$parseassignmentOp(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parsezeroOMoreArgumentsBlockOrExpression(); - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f7(s1, s5); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsedefunStatement() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - - var key = peg$currPos * 68 + 8; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseidentifier(); - if (s1 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 40) { - s2 = peg$c2; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s2 !== peg$FAILED) { - s3 = peg$parse_nl(); - s4 = peg$parsearray_parameters(); - if (s4 !== peg$FAILED) { - s5 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s6 = peg$c3; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_(); - s8 = peg$parseassignmentOp(); - if (s8 !== peg$FAILED) { - s9 = peg$parse_nl(); - s10 = peg$parseinnerBlockOrExpression(); - if (s10 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f8(s1, s4, s10); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseassignmentOp() { - var s0, s1; - - var key = peg$currPos * 68 + 9; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 61) { - s0 = peg$c4; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e5); } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e4); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearray_parameters() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 10; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsedollarIdentifier(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsedollarIdentifier(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsedollarIdentifier(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f9(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseexpression() { - var s0; - - var key = peg$currPos * 68 + 11; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parseifthenelse(); - if (s0 === peg$FAILED) { - s0 = peg$parseternary(); - if (s0 === peg$FAILED) { - s0 = peg$parselogicalAdditive(); - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseifthenelse() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11; - - var key = peg$currPos * 68 + 12; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c6) { - s1 = peg$c6; - peg$currPos += 2; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e7); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse__nl(); - if (s2 !== peg$FAILED) { - s3 = peg$parselogicalAdditive(); - if (s3 !== peg$FAILED) { - s4 = peg$parse__nl(); - if (s4 !== peg$FAILED) { - if (input.substr(peg$currPos, 4) === peg$c7) { - s5 = peg$c7; - peg$currPos += 4; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e8); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse__nl(); - if (s6 !== peg$FAILED) { - s7 = peg$parseinnerBlockOrExpression(); - if (s7 !== peg$FAILED) { - s8 = peg$parse__nl(); - if (s8 !== peg$FAILED) { - if (input.substr(peg$currPos, 4) === peg$c8) { - s9 = peg$c8; - peg$currPos += 4; - } else { - s9 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e9); } - } - if (s9 !== peg$FAILED) { - s10 = peg$parse__nl(); - if (s10 !== peg$FAILED) { - s11 = peg$parseifthenelse(); - if (s11 === peg$FAILED) { - s11 = peg$parseinnerBlockOrExpression(); - } - if (s11 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f10(s3, s7, s11); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseternary() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - - var key = peg$currPos * 68 + 13; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parselogicalAdditive(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 63) { - s3 = peg$c9; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e10); } - } - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parselogicalAdditive(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 58) { - s7 = peg$c10; - peg$currPos++; - } else { - s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e11); } - } - if (s7 !== peg$FAILED) { - s8 = peg$parse_nl(); - s9 = peg$parseternary(); - if (s9 === peg$FAILED) { - s9 = peg$parselogicalAdditive(); - } - if (s9 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f10(s1, s5, s9); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parselogicalAdditive() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 14; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parselogicalMultiplicative(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parselogicalAdditiveOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parselogicalMultiplicative(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parselogicalAdditiveOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parselogicalMultiplicative(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parselogicalAdditiveOp() { - var s0, s1; - - var key = peg$currPos * 68 + 15; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.substr(peg$currPos, 2) === peg$c11) { - s0 = peg$c11; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e13); } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parselogicalMultiplicative() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 16; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseequality(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parselogicalMultiplicativeOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseequality(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parselogicalMultiplicativeOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseequality(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parselogicalMultiplicativeOp() { - var s0, s1; - - var key = peg$currPos * 68 + 17; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.substr(peg$currPos, 2) === peg$c12) { - s0 = peg$c12; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e14); } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseequality() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 68 + 18; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parserelational(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_(); - s3 = peg$parseequalityOp(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parserelational(); - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f13(s1, s3, s5); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$parserelational(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseequalityOp() { - var s0, s1; - - var key = peg$currPos * 68 + 19; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.substr(peg$currPos, 2) === peg$c13) { - s0 = peg$c13; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e15); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c14) { - s0 = peg$c14; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e16); } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parserelational() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 68 + 20; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseadditive(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_(); - s3 = peg$parserelationalOp(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parseadditive(); - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f13(s1, s3, s5); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$parseadditive(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parserelationalOp() { - var s0, s1; - - var key = peg$currPos * 68 + 21; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.substr(peg$currPos, 2) === peg$c15) { - s0 = peg$c15; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e17); } - } - if (s0 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 60) { - s0 = peg$c16; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e18); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c17) { - s0 = peg$c17; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e19); } - } - if (s0 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 62) { - s0 = peg$c18; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e20); } - } - } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseadditive() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 22; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsemultiplicative(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parseadditiveOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsemultiplicative(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parseadditiveOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsemultiplicative(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseadditiveOp() { - var s0, s1; - - var key = peg$currPos * 68 + 23; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 43) { - s0 = peg$c19; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e21); } - } - if (s0 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 45) { - s0 = peg$c20; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c21) { - s0 = peg$c21; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e23); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c22) { - s0 = peg$c22; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e24); } - } - } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsemultiplicative() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 24; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsepower(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parsemultiplicativeOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsepower(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parsemultiplicativeOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsepower(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsemultiplicativeOp() { - var s0, s1; - - var key = peg$currPos * 68 + 25; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 42) { - s0 = peg$c23; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e25); } - } - if (s0 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 47) { - s0 = peg$c24; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e26); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c25) { - s0 = peg$c25; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e27); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c26) { - s0 = peg$c26; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e28); } - } - } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsepower() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 26; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsecredibleInterval(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parsepowerOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsecredibleInterval(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - s5 = peg$parsepowerOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsecredibleInterval(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsepowerOp() { - var s0, s1; - - var key = peg$currPos * 68 + 27; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 94) { - s0 = peg$c27; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e29); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c28) { - s0 = peg$c28; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e30); } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsecredibleInterval() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 28; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsechainFunctionCall(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - s5 = peg$parsecredibleIntervalOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse__nl(); - if (s6 !== peg$FAILED) { - s7 = peg$parsechainFunctionCall(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse__(); - if (s4 !== peg$FAILED) { - s5 = peg$parsecredibleIntervalOp(); - if (s5 !== peg$FAILED) { - s6 = peg$parse__nl(); - if (s6 !== peg$FAILED) { - s7 = peg$parsechainFunctionCall(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f11(s1, s5, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f12(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsecredibleIntervalOp() { - var s0, s1; - - var key = peg$currPos * 68 + 29; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.substr(peg$currPos, 2) === peg$c29) { - s0 = peg$c29; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e31); } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e12); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsechainFunctionCall() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 30; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseunary(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c30) { - s5 = peg$c30; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e32); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c31) { - s5 = peg$c31; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } - } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsechainedFunction(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f14(s1, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c30) { - s5 = peg$c30; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e32); } - } - if (s5 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c31) { - s5 = peg$c31; - peg$currPos += 2; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e33); } - } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsechainedFunction(); - if (s7 !== peg$FAILED) { - peg$savedPos = s3; - s3 = peg$f14(s1, s7); - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f15(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsechainedFunction() { - var s0, s1, s2, s3, s4, s5, s6; - - var key = peg$currPos * 68 + 31; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsedollarIdentifier(); - if (s1 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 40) { - s2 = peg$c2; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s2 !== peg$FAILED) { - s3 = peg$parse_nl(); - s4 = peg$parsearray_functionArguments(); - if (s4 !== peg$FAILED) { - s5 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s6 = peg$c3; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s6 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f16(s1, s4); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parsedollarIdentifier(); - if (s1 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 40) { - s2 = peg$c2; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s2 !== peg$FAILED) { - s3 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s4 = peg$c3; - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s4 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f17(s1); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$parsedollarIdentifier(); - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f17(s1); - } - s0 = s1; - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseunary() { - var s0, s1, s2, s3; - - var key = peg$currPos * 68 + 32; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseunaryOperator(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parseunary(); - if (s3 === peg$FAILED) { - s3 = peg$parseindexedValue(); - } - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f18(s1, s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$parseindexedValue(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseunaryOperator() { - var s0, s1; - - var key = peg$currPos * 68 + 33; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 45) { - s0 = peg$c20; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } - } - if (s0 === peg$FAILED) { - if (input.substr(peg$currPos, 2) === peg$c22) { - s0 = peg$c22; - peg$currPos += 2; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e24); } - } - if (s0 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 33) { - s0 = peg$c32; - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e35); } - } - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e34); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseindexedValue() { - var s0; - - var key = peg$currPos * 68 + 34; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parsecollectionElement(); - if (s0 === peg$FAILED) { - s0 = peg$parserecordElement(); - if (s0 === peg$FAILED) { - s0 = peg$parseatom(); - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsecollectionElement() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10; - - var key = peg$currPos * 68 + 35; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseatom(); - if (s1 !== peg$FAILED) { - s2 = peg$currPos; - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 91) { - s3 = peg$c33; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - if (s3 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 40) { - s3 = peg$c2; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s3 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 46) { - s3 = peg$c34; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - } - } - peg$silentFails--; - if (s3 !== peg$FAILED) { - peg$currPos = s2; - s2 = undefined; - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = []; - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 91) { - s6 = peg$c33; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$parseexpression(); - if (s8 !== peg$FAILED) { - s9 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 93) { - s10 = peg$c35; - peg$currPos++; - } else { - s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } - } - if (s10 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f19(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - if (s4 === peg$FAILED) { - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 40) { - s6 = peg$c2; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$parsearray_functionArguments(); - if (s8 !== peg$FAILED) { - s9 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s10 = peg$c3; - peg$currPos++; - } else { - s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s10 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f20(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - if (s4 === peg$FAILED) { - s4 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 46) { - s5 = peg$c34; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s5 !== peg$FAILED) { - s6 = peg$currPos; - s7 = peg$parsedollarIdentifier(); - if (s7 !== peg$FAILED) { - s6 = input.substring(s6, peg$currPos); - } else { - s6 = s7; - } - if (s6 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f21(s1, s6); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 91) { - s6 = peg$c33; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$parseexpression(); - if (s8 !== peg$FAILED) { - s9 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 93) { - s10 = peg$c35; - peg$currPos++; - } else { - s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } - } - if (s10 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f19(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - if (s4 === peg$FAILED) { - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 40) { - s6 = peg$c2; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$parsearray_functionArguments(); - if (s8 !== peg$FAILED) { - s9 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s10 = peg$c3; - peg$currPos++; - } else { - s10 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s10 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f20(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - if (s4 === peg$FAILED) { - s4 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 46) { - s5 = peg$c34; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s5 !== peg$FAILED) { - s6 = peg$currPos; - s7 = peg$parsedollarIdentifier(); - if (s7 !== peg$FAILED) { - s6 = input.substring(s6, peg$currPos); - } else { - s6 = s7; - } - if (s6 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f21(s1, s6); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } - } - } - peg$savedPos = s0; - s0 = peg$f22(s1, s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearray_functionArguments() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 36; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseexpression(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseexpression(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseexpression(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f9(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parserecordElement() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9; - - var key = peg$currPos * 68 + 37; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsedollarIdentifier(); - if (s1 !== peg$FAILED) { - s2 = peg$currPos; - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 46) { - s3 = peg$c34; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - peg$silentFails--; - if (s3 !== peg$FAILED) { - peg$currPos = s2; - s2 = undefined; - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = []; - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 46) { - s6 = peg$c34; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$currPos; - s9 = peg$parsedollarIdentifier(); - if (s9 !== peg$FAILED) { - s8 = input.substring(s8, peg$currPos); - } else { - s8 = s9; - } - if (s8 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f23(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - while (s4 !== peg$FAILED) { - s3.push(s4); - s4 = peg$currPos; - s5 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 46) { - s6 = peg$c34; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s6 !== peg$FAILED) { - s7 = peg$parse_nl(); - s8 = peg$currPos; - s9 = peg$parsedollarIdentifier(); - if (s9 !== peg$FAILED) { - s8 = input.substring(s8, peg$currPos); - } else { - s8 = s9; - } - if (s8 !== peg$FAILED) { - peg$savedPos = s4; - s4 = peg$f23(s1, s8); - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } else { - peg$currPos = s4; - s4 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f24(s1, s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseatom() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 68 + 38; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 40) { - s1 = peg$c2; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e2); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parseexpression(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 41) { - s5 = peg$c3; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e3); } - } - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f25(s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$parsebasicValue(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsebasicValue() { - var s0; - - var key = peg$currPos * 68 + 39; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parsevalueConstructor(); - if (s0 === peg$FAILED) { - s0 = peg$parsebasicLiteral(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsebasicLiteral() { - var s0; - - var key = peg$currPos * 68 + 40; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parsestring(); - if (s0 === peg$FAILED) { - s0 = peg$parsenumber(); - if (s0 === peg$FAILED) { - s0 = peg$parseboolean(); - if (s0 === peg$FAILED) { - s0 = peg$parsedollarIdentifier(); - } - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseidentifier() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 68 + 41; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$currPos; - s2 = []; - if (peg$r0.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } - } - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - if (peg$r0.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e40); } - } - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = []; - if (peg$r1.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - if (peg$r1.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e41); } - } - } - s2 = [s2, s3]; - s1 = s2; - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f26(); - } - s0 = s1; - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e39); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsedollarIdentifier() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 68 + 42; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$currPos; - s2 = []; - if (peg$r2.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } - } - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - if (peg$r2.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e43); } - } - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = []; - if (peg$r3.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - if (peg$r3.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e44); } - } - } - s2 = [s2, s3]; - s1 = s2; - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f26(); - } - s0 = s1; - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e42); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsestring() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 68 + 43; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 39) { - s2 = peg$c36; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } - } - if (s2 !== peg$FAILED) { - s3 = []; - if (peg$r4.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - if (peg$r4.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e47); } - } - } - if (input.charCodeAt(peg$currPos) === 39) { - s4 = peg$c36; - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e46); } - } - if (s4 !== peg$FAILED) { - s1 = s3; - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f27(s1); - } - s0 = s1; - if (s0 === peg$FAILED) { - s0 = peg$currPos; - s1 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 34) { - s2 = peg$c37; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } - } - if (s2 !== peg$FAILED) { - s3 = []; - if (peg$r5.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - if (peg$r5.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e49); } - } - } - if (input.charCodeAt(peg$currPos) === 34) { - s4 = peg$c37; - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e48); } - } - if (s4 !== peg$FAILED) { - s1 = s3; - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - } else { - peg$currPos = s1; - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f27(s1); - } - s0 = s1; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e45); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsenumber() { - var s0, s1, s2; - - var key = peg$currPos * 68 + 44; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsefloat(); - if (s1 === peg$FAILED) { - s1 = peg$parseinteger(); - } - if (s1 !== peg$FAILED) { - s2 = peg$parseidentifier(); - if (s2 === peg$FAILED) { - s2 = null; - } - peg$savedPos = s0; - s0 = peg$f28(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseinteger() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 68 + 45; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = []; - s2 = peg$parsed(); - if (s2 !== peg$FAILED) { - while (s2 !== peg$FAILED) { - s1.push(s2); - s2 = peg$parsed(); - } - } else { - s1 = peg$FAILED; - } - if (s1 !== peg$FAILED) { - s2 = peg$currPos; - peg$silentFails++; - if (input.charCodeAt(peg$currPos) === 46) { - s3 = peg$c34; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - peg$silentFails--; - if (s3 === peg$FAILED) { - s2 = undefined; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = peg$currPos; - peg$silentFails++; - if (peg$r6.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } - } - peg$silentFails--; - if (s4 === peg$FAILED) { - s3 = undefined; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f29(); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e50); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsefloat() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 46; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$currPos; - s2 = peg$currPos; - s3 = peg$currPos; - s4 = []; - s5 = peg$parsed(); - if (s5 !== peg$FAILED) { - while (s5 !== peg$FAILED) { - s4.push(s5); - s5 = peg$parsed(); - } - } else { - s4 = peg$FAILED; - } - if (s4 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 46) { - s5 = peg$c34; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s5 !== peg$FAILED) { - s6 = []; - s7 = peg$parsed(); - while (s7 !== peg$FAILED) { - s6.push(s7); - s7 = peg$parsed(); - } - s4 = [s4, s5, s6]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - if (s3 === peg$FAILED) { - s3 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 46) { - s4 = peg$c34; - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e37); } - } - if (s4 !== peg$FAILED) { - s5 = []; - s6 = peg$parsed(); - if (s6 !== peg$FAILED) { - while (s6 !== peg$FAILED) { - s5.push(s6); - s6 = peg$parsed(); - } - } else { - s5 = peg$FAILED; - } - if (s5 !== peg$FAILED) { - s4 = [s4, s5]; - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - if (s3 !== peg$FAILED) { - s4 = peg$parsefloatExponent(); - if (s4 === peg$FAILED) { - s4 = null; - } - s3 = [s3, s4]; - s2 = s3; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - if (s2 === peg$FAILED) { - s2 = peg$currPos; - s3 = []; - s4 = peg$parsed(); - if (s4 !== peg$FAILED) { - while (s4 !== peg$FAILED) { - s3.push(s4); - s4 = peg$parsed(); - } - } else { - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - s4 = peg$parsefloatExponent(); - if (s4 !== peg$FAILED) { - s3 = [s3, s4]; - s2 = s3; - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } else { - peg$currPos = s2; - s2 = peg$FAILED; - } - } - if (s2 !== peg$FAILED) { - s1 = input.substring(s1, peg$currPos); - } else { - s1 = s2; - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f30(); - } - s0 = s1; - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e52); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsefloatExponent() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 68 + 47; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - if (peg$r6.test(input.charAt(peg$currPos))) { - s1 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e51); } - } - if (s1 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 45) { - s2 = peg$c20; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e22); } - } - if (s2 === peg$FAILED) { - s2 = null; - } - s3 = []; - s4 = peg$parsed(); - if (s4 !== peg$FAILED) { - while (s4 !== peg$FAILED) { - s3.push(s4); - s4 = peg$parsed(); - } - } else { - s3 = peg$FAILED; - } - if (s3 !== peg$FAILED) { - s1 = [s1, s2, s3]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsed() { - var s0; - - var key = peg$currPos * 68 + 48; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - if (peg$r7.test(input.charAt(peg$currPos))) { - s0 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e53); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parseboolean() { - var s0, s1; - - var key = peg$currPos * 68 + 49; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - if (input.substr(peg$currPos, 4) === peg$c38) { - s1 = peg$c38; - peg$currPos += 4; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e55); } - } - if (s1 === peg$FAILED) { - if (input.substr(peg$currPos, 5) === peg$c39) { - s1 = peg$c39; - peg$currPos += 5; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e56); } - } - } - if (s1 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$f31(); - } - s0 = s1; - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e54); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsevalueConstructor() { - var s0; - - var key = peg$currPos * 68 + 50; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parserecordConstructor(); - if (s0 === peg$FAILED) { - s0 = peg$parsearrayConstructor(); - if (s0 === peg$FAILED) { - s0 = peg$parselambda(); - if (s0 === peg$FAILED) { - s0 = peg$parsequotedInnerBlock(); - } - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parselambda() { - var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12; - - var key = peg$currPos * 68 + 51; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 124) { - s3 = peg$c40; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } - } - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parsearray_parameters(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 124) { - s7 = peg$c40; - peg$currPos++; - } else { - s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } - } - if (s7 !== peg$FAILED) { - s8 = peg$parse_nl(); - s9 = peg$parsearray_statements(); - if (s9 !== peg$FAILED) { - s10 = peg$currPos; - s11 = peg$parsestatementSeparator(); - if (s11 !== peg$FAILED) { - s12 = peg$parseexpression(); - if (s12 !== peg$FAILED) { - s10 = s12; - } else { - peg$currPos = s10; - s10 = peg$FAILED; - } - } else { - peg$currPos = s10; - s10 = peg$FAILED; - } - if (s10 !== peg$FAILED) { - s11 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 125) { - s12 = peg$c1; - peg$currPos++; - } else { - s12 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s12 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f32(s5, s9, s10); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 124) { - s3 = peg$c40; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } - } - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parsearray_parameters(); - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 124) { - s7 = peg$c40; - peg$currPos++; - } else { - s7 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e57); } - } - if (s7 !== peg$FAILED) { - s8 = peg$parse_nl(); - s9 = peg$parseexpression(); - if (s9 !== peg$FAILED) { - s10 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 125) { - s11 = peg$c1; - peg$currPos++; - } else { - s11 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s11 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f33(s5, s9); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearrayConstructor() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 68 + 52; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 91) { - s1 = peg$c33; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 93) { - s3 = peg$c35; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } - } - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f34(); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - if (s0 === peg$FAILED) { - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 91) { - s1 = peg$c33; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e36); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parsearray_elements(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 93) { - s5 = peg$c35; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e38); } - } - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f35(s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e58); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearray_elements() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 53; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseexpression(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseexpression(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parseexpression(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f9(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parserecordConstructor() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 68 + 54; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 123) { - s1 = peg$c0; - peg$currPos++; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e0); } - } - if (s1 !== peg$FAILED) { - s2 = peg$parse_nl(); - s3 = peg$parsearray_recordArguments(); - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - if (input.charCodeAt(peg$currPos) === 125) { - s5 = peg$c1; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e1); } - } - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f36(s3); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e59); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsearray_recordArguments() { - var s0, s1, s2, s3, s4, s5, s6, s7; - - var key = peg$currPos * 68 + 55; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsekeyValuePair(); - if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsekeyValuePair(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; - s4 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 44) { - s5 = peg$c5; - peg$currPos++; - } else { - s5 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e6); } - } - if (s5 !== peg$FAILED) { - s6 = peg$parse_nl(); - s7 = peg$parsekeyValuePair(); - if (s7 !== peg$FAILED) { - s3 = s7; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } - peg$savedPos = s0; - s0 = peg$f9(s1, s2); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsekeyValuePair() { - var s0, s1, s2, s3, s4, s5; - - var key = peg$currPos * 68 + 56; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parseexpression(); - if (s1 !== peg$FAILED) { - s2 = peg$parse_(); - if (input.charCodeAt(peg$currPos) === 58) { - s3 = peg$c10; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e11); } - } - if (s3 !== peg$FAILED) { - s4 = peg$parse_nl(); - s5 = peg$parseexpression(); - if (s5 !== peg$FAILED) { - peg$savedPos = s0; - s0 = peg$f37(s1, s5); - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parse_() { - var s0, s1; - - var key = peg$currPos * 68 + 57; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = []; - s1 = peg$parsewhiteSpaceCharactersOrComment(); - while (s1 !== peg$FAILED) { - s0.push(s1); - s1 = peg$parsewhiteSpaceCharactersOrComment(); - } - peg$silentFails--; - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parse_nl() { - var s0, s1; - - var key = peg$currPos * 68 + 58; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = []; - s1 = peg$parsewhiteSpaceCharactersOrComment(); - if (s1 === peg$FAILED) { - s1 = peg$parsecommentOrNewLine(); - } - while (s1 !== peg$FAILED) { - s0.push(s1); - s1 = peg$parsewhiteSpaceCharactersOrComment(); - if (s1 === peg$FAILED) { - s1 = peg$parsecommentOrNewLine(); - } - } - peg$silentFails--; - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e61); } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parse__() { - var s0, s1; - - var key = peg$currPos * 68 + 59; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = []; - s1 = peg$parsewhiteSpaceCharactersOrComment(); - if (s1 !== peg$FAILED) { - while (s1 !== peg$FAILED) { - s0.push(s1); - s1 = peg$parsewhiteSpaceCharactersOrComment(); - } - } else { - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e60); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parse__nl() { - var s0, s1; - - var key = peg$currPos * 68 + 60; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = []; - s1 = peg$parsewhiteSpaceCharactersOrComment(); - if (s1 === peg$FAILED) { - s1 = peg$parsecommentOrNewLine(); - } - if (s1 !== peg$FAILED) { - while (s1 !== peg$FAILED) { - s0.push(s1); - s1 = peg$parsewhiteSpaceCharactersOrComment(); - if (s1 === peg$FAILED) { - s1 = peg$parsecommentOrNewLine(); - } - } - } else { - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e62); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsestatementSeparator() { - var s0, s1, s2, s3; - - var key = peg$currPos * 68 + 61; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$parse_(); - s2 = []; - if (input.charCodeAt(peg$currPos) === 59) { - s3 = peg$c41; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } - } - if (s3 === peg$FAILED) { - s3 = peg$parsecommentOrNewLine(); - } - if (s3 !== peg$FAILED) { - while (s3 !== peg$FAILED) { - s2.push(s3); - if (input.charCodeAt(peg$currPos) === 59) { - s3 = peg$c41; - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e64); } - } - if (s3 === peg$FAILED) { - s3 = peg$parsecommentOrNewLine(); - } - } - } else { - s2 = peg$FAILED; - } - if (s2 !== peg$FAILED) { - s3 = peg$parse_nl(); - s1 = [s1, s2, s3]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e63); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsecommentOrNewLine() { - var s0, s1, s2; - - var key = peg$currPos * 68 + 62; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$currPos; - s1 = peg$parsefinalComment(); - if (s1 === peg$FAILED) { - s1 = null; - } - s2 = peg$parsenewLine(); - if (s2 !== peg$FAILED) { - s1 = [s1, s2]; - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsefinalComment() { - var s0, s1, s2, s3, s4; - - var key = peg$currPos * 68 + 63; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - s1 = peg$parse_(); - if (input.substr(peg$currPos, 2) === peg$c42) { - s2 = peg$c42; - peg$currPos += 2; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e66); } - } - if (s2 === peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 35) { - s2 = peg$c43; - peg$currPos++; - } else { - s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e67); } - } - } - if (s2 !== peg$FAILED) { - s3 = []; - if (peg$r8.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } - } - while (s4 !== peg$FAILED) { - s3.push(s4); - if (peg$r8.test(input.charAt(peg$currPos))) { - s4 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e68); } - } - } - s0 = s3; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e65); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsewhiteSpaceCharactersOrComment() { - var s0; - - var key = peg$currPos * 68 + 64; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - s0 = peg$parsewhiteSpaceCharacters(); - if (s0 === peg$FAILED) { - s0 = peg$parsedelimitedComment(); - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsedelimitedComment() { - var s0, s1, s2, s3; - - var key = peg$currPos * 68 + 65; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - s0 = peg$currPos; - if (input.substr(peg$currPos, 2) === peg$c44) { - s1 = peg$c44; - peg$currPos += 2; - } else { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e70); } - } - if (s1 !== peg$FAILED) { - s2 = []; - if (peg$r9.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } - } - while (s3 !== peg$FAILED) { - s2.push(s3); - if (peg$r9.test(input.charAt(peg$currPos))) { - s3 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e71); } - } - } - if (input.substr(peg$currPos, 2) === peg$c45) { - s3 = peg$c45; - peg$currPos += 2; - } else { - s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e72); } - } - if (s3 !== peg$FAILED) { - s0 = s2; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e69); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsewhiteSpaceCharacters() { - var s0; - - var key = peg$currPos * 68 + 66; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - if (peg$r10.test(input.charAt(peg$currPos))) { - s0 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e73); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - function peg$parsenewLine() { - var s0, s1; - - var key = peg$currPos * 68 + 67; - var cached = peg$resultsCache[key]; - - if (cached) { - peg$currPos = cached.nextPos; - - return cached.result; - } - - peg$silentFails++; - if (peg$r11.test(input.charAt(peg$currPos))) { - s0 = input.charAt(peg$currPos); - peg$currPos++; - } else { - s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e75); } - } - peg$silentFails--; - if (s0 === peg$FAILED) { - s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$e74); } - } - - peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 }; - - return s0; - } - - peg$result = peg$startRuleFunction(); - - if (peg$result !== peg$FAILED && peg$currPos === input.length) { - return peg$result; - } else { - if (peg$result !== peg$FAILED && peg$currPos < input.length) { - peg$fail(peg$endExpectation()); - } - - throw peg$buildStructuredError( - peg$maxFailExpected, - peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null, - peg$maxFailPos < input.length - ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1) - : peg$computeLocation(peg$maxFailPos, peg$maxFailPos) - ); - } -} - -module.exports = { - SyntaxError: peg$SyntaxError, - parse: peg$parse -}; From 8757448900527b1c4c0719394123eefca98ea46a Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 24 May 2022 14:28:02 -0400 Subject: [PATCH 232/340] Trying to appease the CI tests, which are failing here for some reason. --- .../rescript/ReducerInterface/ReducerInterface_DateTime.res | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res index 0fcd04e9..17ea5a75 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res @@ -4,8 +4,9 @@ type expressionValue = ExpressionValue.expressionValue let dateDispatch = (call: ExpressionValue.functionCall, _: DistributionOperation.env): option< result, > => { + open ExpressionValue switch call { - | ("toString", [EvDate(t)]) => ExpressionValue.EvString(DateTime.Date.toString(t))->Ok->Some + | ("toString", [EvDate(t)]) => EvString(DateTime.Date.toString(t))->Ok->Some | ("makeDateFromYear", [EvNumber(year)]) => switch DateTime.Date.makeFromYear(year) { | Ok(t) => EvDate(t)->Ok->Some From 628cb0c807a7944c850dfdd79dd37be6f98f5f70 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 24 May 2022 14:49:04 -0400 Subject: [PATCH 233/340] Minor additions to datetime units --- .../ReducerInterface/ReducerInterface_DateTime.res | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res index 17ea5a75..08c96309 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res @@ -4,13 +4,12 @@ type expressionValue = ExpressionValue.expressionValue let dateDispatch = (call: ExpressionValue.functionCall, _: DistributionOperation.env): option< result, > => { - open ExpressionValue switch call { | ("toString", [EvDate(t)]) => EvString(DateTime.Date.toString(t))->Ok->Some | ("makeDateFromYear", [EvNumber(year)]) => switch DateTime.Date.makeFromYear(year) { | Ok(t) => EvDate(t)->Ok->Some - | Error(e) => RETodo(e)->Error->Some + | Error(e) => Reducer_ErrorValue.RETodo(e)->Error->Some } | ("dateFromNumber", [EvNumber(f)]) => EvDate(DateTime.Date.fromFloat(f))->Ok->Some | ("toNumber", [EvDate(f)]) => EvNumber(DateTime.Date.toFloat(f))->Ok->Some @@ -31,10 +30,14 @@ let durationDispatch = (call: ExpressionValue.functionCall, _: DistributionOpera > => { switch call { | ("toString", [EvTimeDuration(t)]) => EvString(DateTime.Duration.toString(t))->Ok->Some - | ("hours", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some | ("minutes", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromMinutes(f))->Ok->Some + | ("fromUnit_minutes", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromMinutes(f))->Ok->Some + | ("hours", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some + | ("fromUnit_hours", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some | ("days", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromDays(f))->Ok->Some + | ("fromUnit_days", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromDays(f))->Ok->Some | ("years", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromYears(f))->Ok->Some + | ("fromUnit_years", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromYears(f))->Ok->Some | ("toHours", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toHours(f))->Ok->Some | ("toMinutes", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toMinutes(f))->Ok->Some | ("toDays", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toDays(f))->Ok->Some From f5fcd4f9ae6ab9f080d1dcc6547042642d871b31 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 24 May 2022 15:51:22 -0400 Subject: [PATCH 234/340] Added type to appease bisect --- .../ReducerInterface_DateTime.res | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res index 08c96309..fe30b0f8 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res @@ -1,60 +1,62 @@ -module ExpressionValue = ReducerInterface_ExpressionValue -type expressionValue = ExpressionValue.expressionValue +module EV = ReducerInterface_ExpressionValue +type expressionValue = EV.expressionValue -let dateDispatch = (call: ExpressionValue.functionCall, _: DistributionOperation.env): option< +let dateDispatch = (call: EV.functionCall, _: DistributionOperation.env): option< result, > => { switch call { - | ("toString", [EvDate(t)]) => EvString(DateTime.Date.toString(t))->Ok->Some + | ("toString", [EvDate(t)]) => EV.EvString(DateTime.Date.toString(t))->Ok->Some | ("makeDateFromYear", [EvNumber(year)]) => switch DateTime.Date.makeFromYear(year) { - | Ok(t) => EvDate(t)->Ok->Some + | Ok(t) => EV.EvDate(t)->Ok->Some | Error(e) => Reducer_ErrorValue.RETodo(e)->Error->Some } - | ("dateFromNumber", [EvNumber(f)]) => EvDate(DateTime.Date.fromFloat(f))->Ok->Some - | ("toNumber", [EvDate(f)]) => EvNumber(DateTime.Date.toFloat(f))->Ok->Some + | ("dateFromNumber", [EvNumber(f)]) => EV.EvDate(DateTime.Date.fromFloat(f))->Ok->Some + | ("toNumber", [EvDate(f)]) => EV.EvNumber(DateTime.Date.toFloat(f))->Ok->Some | ("subtract", [EvDate(d1), EvDate(d2)]) => switch DateTime.Date.subtract(d1, d2) { - | Ok(d) => EvTimeDuration(d)->Ok + | Ok(d) => EV.EvTimeDuration(d)->Ok | Error(e) => Error(RETodo(e)) }->Some | ("subtract", [EvDate(d1), EvTimeDuration(d2)]) => - EvDate(DateTime.Date.subtractDuration(d1, d2))->Ok->Some - | ("add", [EvDate(d1), EvTimeDuration(d2)]) => EvDate(DateTime.Date.addDuration(d1, d2))->Ok->Some + EV.EvDate(DateTime.Date.subtractDuration(d1, d2))->Ok->Some + | ("add", [EvDate(d1), EvTimeDuration(d2)]) => + EV.EvDate(DateTime.Date.addDuration(d1, d2))->Ok->Some | _ => None } } -let durationDispatch = (call: ExpressionValue.functionCall, _: DistributionOperation.env): option< +let durationDispatch = (call: EV.functionCall, _: DistributionOperation.env): option< result, > => { switch call { - | ("toString", [EvTimeDuration(t)]) => EvString(DateTime.Duration.toString(t))->Ok->Some - | ("minutes", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromMinutes(f))->Ok->Some - | ("fromUnit_minutes", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromMinutes(f))->Ok->Some - | ("hours", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some - | ("fromUnit_hours", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some - | ("days", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromDays(f))->Ok->Some - | ("fromUnit_days", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromDays(f))->Ok->Some - | ("years", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromYears(f))->Ok->Some - | ("fromUnit_years", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromYears(f))->Ok->Some - | ("toHours", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toHours(f))->Ok->Some - | ("toMinutes", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toMinutes(f))->Ok->Some - | ("toDays", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toDays(f))->Ok->Some - | ("toYears", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toYears(f))->Ok->Some + | ("toString", [EvTimeDuration(t)]) => EV.EvString(DateTime.Duration.toString(t))->Ok->Some + | ("minutes", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromMinutes(f))->Ok->Some + | ("fromUnit_minutes", [EvNumber(f)]) => + EV.EvTimeDuration(DateTime.Duration.fromMinutes(f))->Ok->Some + | ("hours", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some + | ("fromUnit_hours", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some + | ("days", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromDays(f))->Ok->Some + | ("fromUnit_days", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromDays(f))->Ok->Some + | ("years", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromYears(f))->Ok->Some + | ("fromUnit_years", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromYears(f))->Ok->Some + | ("toHours", [EvTimeDuration(f)]) => EV.EvNumber(DateTime.Duration.toHours(f))->Ok->Some + | ("toMinutes", [EvTimeDuration(f)]) => EV.EvNumber(DateTime.Duration.toMinutes(f))->Ok->Some + | ("toDays", [EvTimeDuration(f)]) => EV.EvNumber(DateTime.Duration.toDays(f))->Ok->Some + | ("toYears", [EvTimeDuration(f)]) => EV.EvNumber(DateTime.Duration.toYears(f))->Ok->Some | ("add", [EvTimeDuration(d1), EvTimeDuration(d2)]) => - EvTimeDuration(DateTime.Duration.add(d1, d2))->Ok->Some + EV.EvTimeDuration(DateTime.Duration.add(d1, d2))->Ok->Some | ("subtract", [EvTimeDuration(d1), EvTimeDuration(d2)]) => - EvTimeDuration(DateTime.Duration.subtract(d1, d2))->Ok->Some + EV.EvTimeDuration(DateTime.Duration.subtract(d1, d2))->Ok->Some | ("multiply", [EvTimeDuration(d1), EvNumber(d2)]) => - EvTimeDuration(DateTime.Duration.multiply(d1, d2))->Ok->Some + EV.EvTimeDuration(DateTime.Duration.multiply(d1, d2))->Ok->Some | ("divide", [EvTimeDuration(d1), EvNumber(d2)]) => - EvTimeDuration(DateTime.Duration.divide(d1, d2))->Ok->Some + EV.EvTimeDuration(DateTime.Duration.divide(d1, d2))->Ok->Some | _ => None } } -let dispatch = (call: ExpressionValue.functionCall, env: DistributionOperation.env): option< +let dispatch = (call: EV.functionCall, env: DistributionOperation.env): option< result, > => { switch dateDispatch(call, env) { From d1f2f71912fd3904481691008958b012614f8c96 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 24 May 2022 17:02:27 -0400 Subject: [PATCH 235/340] Made formal Declaration type --- .../FunctionRegistry_Library.res | 40 ++++++------------- .../ReducerInterface_ExpressionValue.res | 4 ++ .../src/rescript/Utility/Declaration.res | 33 +++++++++++++++ 3 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 packages/squiggle-lang/src/rescript/Utility/Declaration.res diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index d2611b9d..fcfd469b 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -3,39 +3,26 @@ open FunctionRegistry_Helpers let twoArgs = E.Tuple2.toFnCall -module FnDeclaration = { - type range = {min: float, max: float} - let makeRange = (min, max) => {min: min, max: max} - type t = { - fn: ReducerInterface_ExpressionValue.lambdaValue, - args: array, - } - - let validate = (def: t) => { - let {parameters, _} = def.fn - E.A.length(parameters) == E.A.length(def.args) - } - +module Declaration = { let frType = FRTypeRecord([ ("fn", FRTypeLambda), ("inputs", FRTypeArray(FRTypeRecord([("min", FRTypeNumber), ("max", FRTypeNumber)]))), ]) - let fromExpressionValue = (e: expressionValue) => { - let values = FunctionRegistry_Core.FRType.matchWithExpressionValue(frType, e) - switch values->E.O2.fmap(r => - FunctionRegistry_Helpers.Prepare.ToValueArray.Record.twoArgs([r]) - ) { - | Some(Ok([FRValueLambda(lambda), FRValueArray(inputs)])) => { + let fromExpressionValue = (e: frValue): result => { + switch FunctionRegistry_Helpers.Prepare.ToValueArray.Record.twoArgs([e]) { + | Ok([FRValueLambda(lambda), FRValueArray(inputs)]) => { open FunctionRegistry_Helpers.Prepare - let getMinMax = arg => + let getMinMax = arg => ToValueArray.Record.toArgs([arg]) ->E.R.bind(ToValueTuple.twoNumbers) - ->E.R2.fmap(((min, max)) => makeRange(min, max)) + ->E.R2.fmap(((min, max)) => Declaration.ContinuousFloatArg.make(min, max)) inputs ->E.A2.fmap(getMinMax) ->E.A.R.firstErrorOrOpen - ->E.R2.fmap(args => {fn: lambda, args: args}) + ->E.R2.fmap(args => ReducerInterface_ExpressionValue.EvDeclaration( + Declaration.ContinuousDeclaration.make(lambda, args), + )) } | _ => Error("Error") } @@ -46,12 +33,9 @@ let registry = [ Function.make( ~name="FnMake", ~definitions=[ - FnDefinition.make(~name="declareFn", ~inputs=[FnDeclaration.frType], ~run=(inputs, _) => { - let result = inputs->E.A.unsafe_get(0)->FunctionRegistry_Core.FRType.matchReverse->Ok - let foo = result->E.R2.fmap(FnDeclaration.fromExpressionValue) - Js.log2("HIHIHI", foo) - result - }), + FnDefinition.make(~name="declareFn", ~inputs=[Declaration.frType], ~run=(inputs, _) => + inputs->E.A.unsafe_get(0)->Declaration.fromExpressionValue + ), ], ), Function.make( diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res index c9363606..8f3dea42 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res @@ -22,6 +22,7 @@ type rec expressionValue = | EvSymbol(string) | EvDate(Js.Date.t) | EvTimeDuration(float) + | EvDeclaration(lambdaDeclaration) and record = Js.Dict.t and externalBindings = record and lambdaValue = { @@ -29,6 +30,7 @@ and lambdaValue = { context: externalBindings, body: internalCode, } +and lambdaDeclaration = Declaration.declaration @genType let defaultExternalBindings: externalBindings = Js.Dict.empty() @@ -55,6 +57,7 @@ let rec toString = aValue => | EvDistribution(dist) => GenericDist.toString(dist) | EvDate(date) => DateTime.Date.toString(date) | EvTimeDuration(t) => DateTime.Duration.toString(t) + | EvDeclaration(t) => "Declaration" } and toStringRecord = aRecord => { let pairs = @@ -79,6 +82,7 @@ let toStringWithType = aValue => | EvSymbol(_) => `Symbol::${toString(aValue)}` | EvDate(_) => `Date::${toString(aValue)}` | EvTimeDuration(_) => `Date::${toString(aValue)}` + | EvDeclaration(_) => `Declaration::${toString(aValue)}` } let argsToString = (args: array): string => { diff --git a/packages/squiggle-lang/src/rescript/Utility/Declaration.res b/packages/squiggle-lang/src/rescript/Utility/Declaration.res new file mode 100644 index 00000000..188f01ca --- /dev/null +++ b/packages/squiggle-lang/src/rescript/Utility/Declaration.res @@ -0,0 +1,33 @@ +@genType +type continuousArg = Float({min: float, max: float}) | Time({min: Js.Date.t, max: Js.Date.t}) +@genType +type continuousDeclaration<'a> = {fn: 'a, args: array} +@genType +type relativeComparisonDeclaration<'a> = {fn: 'a, options: array} +@genType +type declaration<'a> = + Continuous(continuousDeclaration<'a>) | RelativeComparison(relativeComparisonDeclaration<'a>) + +module ContinuousFloatArg = { + let make = (min: float, max: float): continuousArg => { + Float({min: min, max: max}) + } +} + +module ContinuousTimeArg = { + let make = (min: Js.Date.t, max: Js.Date.t): continuousArg => { + Time({min: min, max: max}) + } +} + +module ContinuousDeclaration = { + let make = (fn: 'a, args: array): declaration<'a> => { + Continuous({fn: fn, args: args}) + } +} + +module RelativeComparisonDeclaration = { + let make = (fn: 'a, options: array): declaration<'a> => { + RelativeComparison({fn: fn, options: options}) + } +} From 533c97c41c5bc972010ec4dd434b3364f3c37005 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 24 May 2022 17:23:37 -0400 Subject: [PATCH 236/340] Added very simple lambdaDeclaration to React components --- .../src/components/SquiggleChart.tsx | 19 +++++++++++++++++++ packages/squiggle-lang/src/js/index.ts | 2 ++ .../squiggle-lang/src/js/rescript_interop.ts | 8 ++++++++ .../src/rescript/TypescriptInterface.res | 3 +++ 4 files changed, 32 insertions(+) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 50fcebb3..1c5407c9 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -202,6 +202,25 @@ const SquiggleItem: React.FC = ({ ); } + case "lambdaDeclaration": { + switch (expression.value.tag) { + case "Continuous": { + return ( + + ); + } + case "RelativeComparison": { + return <>; + } + } + } case "lambda": return ( | tagged<"date", Date> | tagged<"timeDuration", number> + | tagged<"lambdaDeclaration", lambdaDeclaration> | tagged<"record", { [key: string]: squiggleExpression }>; export { lambdaValue }; @@ -141,6 +147,8 @@ export function convertRawToTypescript( return tag("date", result._0); case 11: // EvTimeDuration return tag("number", result._0); + case 12: // EvDeclaration + return tag("lambdaDeclaration", result._0); } } diff --git a/packages/squiggle-lang/src/rescript/TypescriptInterface.res b/packages/squiggle-lang/src/rescript/TypescriptInterface.res index 93af9832..44051cc1 100644 --- a/packages/squiggle-lang/src/rescript/TypescriptInterface.res +++ b/packages/squiggle-lang/src/rescript/TypescriptInterface.res @@ -76,6 +76,9 @@ let distributionErrorToString = DistributionTypes.Error.toString @genType type lambdaValue = ReducerInterface_ExpressionValue.lambdaValue +@genType +type lambdaDeclaration = ReducerInterface_ExpressionValue.lambdaDeclaration + @genType let defaultSamplingEnv = DistributionOperation.defaultEnv From c5673fd1b1b44bdba5a035996bc6022669699f5d Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 24 May 2022 19:14:13 -0400 Subject: [PATCH 237/340] Trying to add squigglechart types for declaration --- .../src/components/SquiggleChart.tsx | 22 +++++++++++++++++++ packages/squiggle-lang/src/js/index.ts | 3 +++ .../src/rescript/TypescriptInterface.res | 12 ++++++++++ 3 files changed, 37 insertions(+) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 1c5407c9..6adfa5a6 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -11,12 +11,34 @@ import { defaultImports, defaultBindings, defaultEnvironment, + continuousDeclaration, + declarationContinuousArg, } from "@quri/squiggle-lang"; import { NumberShower } from "./NumberShower"; import { DistributionChart } from "./DistributionChart"; import { ErrorBox } from "./ErrorBox"; import { FunctionChart, FunctionChartSettings } from "./FunctionChart"; +function getRange(x: continuousDeclaration) { + let first = x.args[0] + switch(first.tag){ + case "Float": {return{floats: {min: first.value.min, max: first.value.max}}} + case "Time": {return{time: {min: first.value.min, max: first.value.max}}} + } +} +function getChartSettings(x: continuousDeclaration):FunctionChartSettings { + console.log("HERE") + let foo = getRange(x) + console.log("HIHI", foo) + let min = foo.floats ? foo.floats.min : 0 + let max = foo.floats ? foo.floats.max : 10 + return ({ + start: min, + stop: max, + count: 20, + }) +} + const variableBox = { Component: styled.div` background: white; diff --git a/packages/squiggle-lang/src/js/index.ts b/packages/squiggle-lang/src/js/index.ts index 3da19334..f06dac99 100644 --- a/packages/squiggle-lang/src/js/index.ts +++ b/packages/squiggle-lang/src/js/index.ts @@ -14,6 +14,9 @@ export { errorValueToString, distributionErrorToString, distributionError, + continuousDeclaration, + relativeComparisonDeclaration, + declarationContinuousArg, } from "../rescript/TypescriptInterface.gen"; export type { errorValue, externalBindings as bindings, jsImports }; import { diff --git a/packages/squiggle-lang/src/rescript/TypescriptInterface.res b/packages/squiggle-lang/src/rescript/TypescriptInterface.res index 44051cc1..e6170366 100644 --- a/packages/squiggle-lang/src/rescript/TypescriptInterface.res +++ b/packages/squiggle-lang/src/rescript/TypescriptInterface.res @@ -90,3 +90,15 @@ let defaultEnvironment = ReducerInterface_ExpressionValue.defaultEnvironment @genType let foreignFunctionInterface = Reducer.foreignFunctionInterface + +@genType +type declarationContinuousArg = Declaration.continuousArg + +@genType +type continuousDeclaration<'a> = Declaration.continuousDeclaration<'a> + +@genType +type relativeComparisonDeclaration<'a> = Declaration.relativeComparisonDeclaration<'a> + +@genType +type declaration<'a> = Declaration.declaration<'a> From 5d8f07c1b4098bbcddcad753e755576c8f88de51 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Wed, 25 May 2022 10:55:03 -0400 Subject: [PATCH 238/340] Minor fixes --- .../src/components/SquiggleChart.tsx | 33 +++++++++++-------- .../FunctionRegistry_Library.res | 3 +- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 6adfa5a6..092a2e2b 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -12,7 +12,6 @@ import { defaultBindings, defaultEnvironment, continuousDeclaration, - declarationContinuousArg, } from "@quri/squiggle-lang"; import { NumberShower } from "./NumberShower"; import { DistributionChart } from "./DistributionChart"; @@ -20,23 +19,29 @@ import { ErrorBox } from "./ErrorBox"; import { FunctionChart, FunctionChartSettings } from "./FunctionChart"; function getRange(x: continuousDeclaration) { - let first = x.args[0] - switch(first.tag){ - case "Float": {return{floats: {min: first.value.min, max: first.value.max}}} - case "Time": {return{time: {min: first.value.min, max: first.value.max}}} + let first = x.args[0]; + switch (first.tag) { + case "Float": { + return { floats: { min: first.value.min, max: first.value.max } }; + } + case "Time": { + return { time: { min: first.value.min, max: first.value.max } }; + } } } -function getChartSettings(x: continuousDeclaration):FunctionChartSettings { - console.log("HERE") - let foo = getRange(x) - console.log("HIHI", foo) - let min = foo.floats ? foo.floats.min : 0 - let max = foo.floats ? foo.floats.max : 10 - return ({ +function getChartSettings( + x: continuousDeclaration +): FunctionChartSettings { + console.log("HERE"); + let foo = getRange(x); + console.log("HIHI", foo); + let min = foo.floats ? foo.floats.min : 0; + let max = foo.floats ? foo.floats.max : 10; + return { start: min, stop: max, count: 20, - }) + }; } const variableBox = { @@ -230,7 +235,7 @@ const SquiggleItem: React.FC = ({ return ( + FnDefinition.make(~name="declareFn", ~inputs=[Declaration.frType], ~run=(inputs, _) => { inputs->E.A.unsafe_get(0)->Declaration.fromExpressionValue + } ), ], ), From 3404534b10da52cc1b2af604bfc1ad8f5afd7483 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Wed, 25 May 2022 13:11:35 -0400 Subject: [PATCH 239/340] Found some of the problem, will debug that next --- .../src/components/SquiggleChart.tsx | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 092a2e2b..1a3c4414 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -32,11 +32,9 @@ function getRange(x: continuousDeclaration) { function getChartSettings( x: continuousDeclaration ): FunctionChartSettings { - console.log("HERE"); - let foo = getRange(x); - console.log("HIHI", foo); - let min = foo.floats ? foo.floats.min : 0; - let max = foo.floats ? foo.floats.max : 10; + let range = getRange(x); + let min = range.floats ? range.floats.min : 0; + let max = range.floats ? range.floats.max : 10; return { start: min, stop: max, @@ -208,6 +206,7 @@ const SquiggleItem: React.FC = ({ />
))} + ) ); case "arraystring": @@ -229,6 +228,17 @@ const SquiggleItem: React.FC = ({ ); } + case "lambda": + return ( + + ); case "lambdaDeclaration": { switch (expression.value.tag) { case "Continuous": { @@ -244,21 +254,16 @@ const SquiggleItem: React.FC = ({ ); } case "RelativeComparison": { - return <>; + return <>"Relative"; + } + default: { + return <>LambdaDeclaration: Should be unreachable; } } } - case "lambda": - return ( - - ); + default: { + return <>Should be unreachable; + } } }; From 298d3923bc096bf48622169cb49079e38807fc29 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Wed, 25 May 2022 19:27:15 -0400 Subject: [PATCH 240/340] Fixed bug caused by bad genType format of Declaration --- .../src/components/SquiggleChart.tsx | 21 +++------- packages/squiggle-lang/src/js/index.ts | 5 +-- .../squiggle-lang/src/js/rescript_interop.ts | 38 +++++++++++++++++-- .../FunctionRegistry_Core.res | 21 +++++----- .../FunctionRegistry_Library.res | 5 +-- .../src/rescript/TypescriptInterface.res | 8 +--- .../src/rescript/Utility/Declaration.res | 31 ++++++--------- 7 files changed, 68 insertions(+), 61 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 1a3c4414..2971a3e1 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -11,14 +11,15 @@ import { defaultImports, defaultBindings, defaultEnvironment, - continuousDeclaration, + declarationArg, + declaration } from "@quri/squiggle-lang"; import { NumberShower } from "./NumberShower"; import { DistributionChart } from "./DistributionChart"; import { ErrorBox } from "./ErrorBox"; import { FunctionChart, FunctionChartSettings } from "./FunctionChart"; -function getRange(x: continuousDeclaration) { +function getRange(x: declaration) { let first = x.args[0]; switch (first.tag) { case "Float": { @@ -30,7 +31,7 @@ function getRange(x: continuousDeclaration) { } } function getChartSettings( - x: continuousDeclaration + x: declaration ): FunctionChartSettings { let range = getRange(x); let min = range.floats ? range.floats.min : 0; @@ -240,27 +241,17 @@ const SquiggleItem: React.FC = ({ /> ); case "lambdaDeclaration": { - switch (expression.value.tag) { - case "Continuous": { return ( ); - } - case "RelativeComparison": { - return <>"Relative"; - } - default: { - return <>LambdaDeclaration: Should be unreachable; - } } - } default: { return <>Should be unreachable; } diff --git a/packages/squiggle-lang/src/js/index.ts b/packages/squiggle-lang/src/js/index.ts index f06dac99..03068a51 100644 --- a/packages/squiggle-lang/src/js/index.ts +++ b/packages/squiggle-lang/src/js/index.ts @@ -14,9 +14,8 @@ export { errorValueToString, distributionErrorToString, distributionError, - continuousDeclaration, - relativeComparisonDeclaration, - declarationContinuousArg, + declarationArg, + declaration, } from "../rescript/TypescriptInterface.gen"; export type { errorValue, externalBindings as bindings, jsImports }; import { diff --git a/packages/squiggle-lang/src/js/rescript_interop.ts b/packages/squiggle-lang/src/js/rescript_interop.ts index 9d521927..64e7a64f 100644 --- a/packages/squiggle-lang/src/js/rescript_interop.ts +++ b/packages/squiggle-lang/src/js/rescript_interop.ts @@ -9,7 +9,8 @@ import { discreteShape, continuousShape, lambdaValue, - lambdaDeclaration + lambdaDeclaration, + declarationArg, } from "../rescript/TypescriptInterface.gen"; import { Distribution } from "./distribution"; import { tagged, tag } from "./types"; @@ -67,7 +68,7 @@ export type rescriptExport = } | { TAG: 12; // EvDeclaration - _0: lambdaDeclaration; + _0: rescriptLambdaDeclaration; }; type rescriptDist = @@ -89,6 +90,23 @@ type rescriptPointSetDist = _0: continuousShape; }; +type rescriptLambdaDeclaration = { + readonly fn: lambdaValue; + readonly args: rescriptDeclarationArg[]; +}; + +type rescriptDeclarationArg = + | { + TAG: 0; // Float + min: number; + max: number; + } + | { + TAG: 1; // Float + min: Date; + max: Date; + }; + export type squiggleExpression = | tagged<"symbol", string> | tagged<"string", string> @@ -148,7 +166,21 @@ export function convertRawToTypescript( case 11: // EvTimeDuration return tag("number", result._0); case 12: // EvDeclaration - return tag("lambdaDeclaration", result._0); + return tag("lambdaDeclaration", { + fn: result._0.fn, + args: result._0.args.map(convertDeclaration), + }); + } +} + +function convertDeclaration( + declarationArg: rescriptDeclarationArg +): declarationArg { + switch (declarationArg.TAG) { + case 0: // Float + return tag("Float", { min: declarationArg.min, max: declarationArg.max }); + case 1: // Date + return tag("Date", { min: declarationArg.min, max: declarationArg.max }); } } diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res index da5260c6..582df17d 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res @@ -78,9 +78,9 @@ module FRType = { | (FRTypeOption(v), _) => Some(FRValueOption(matchWithExpressionValue(v, r))) | (FRTypeLambda, EvLambda(f)) => Some(FRValueLambda(f)) | (FRTypeArray(intendedType), EvArray(elements)) => { - let el = elements->E.A2.fmap(matchWithExpressionValue(intendedType)) - E.A.O.openIfAllSome(el)->E.O2.fmap(r => FRValueArray(r)) - } + let el = elements->E.A2.fmap(matchWithExpressionValue(intendedType)) + E.A.O.openIfAllSome(el)->E.O2.fmap(r => FRValueArray(r)) + } | (FRTypeRecord(recordParams), EvRecord(record)) => { let getAndMatch = (name, input) => E.Dict.get(record, name)->E.O.bind(matchWithExpressionValue(input)) @@ -96,23 +96,24 @@ module FRType = { } let rec matchReverse = (e: frValue): expressionValue => - switch(e){ - | FRValueNumber(f) => (EvNumber(f)) + switch e { + | FRValueNumber(f) => EvNumber(f) | FRValueDistOrNumber(FRValueNumber(n)) => EvNumber(n) | FRValueDistOrNumber(FRValueDist(n)) => EvDistribution(n) | FRValueDist(dist) => EvDistribution(dist) | FRValueOption(Some(r)) => matchReverse(r) | FRValueArray(elements) => EvArray(elements->E.A2.fmap(matchReverse)) | FRValueRecord(frValueRecord) => { - let record = frValueRecord->E.A2.fmap(((name, value)) => (name, matchReverse(value)))->E.Dict.fromArray - EvRecord(record) - } + let record = + frValueRecord->E.A2.fmap(((name, value)) => (name, matchReverse(value)))->E.Dict.fromArray + EvRecord(record) + } | FRValueLambda(l) => EvLambda(l) | FRValueString(string) => EvString(string) | FRValueVariant(string) => EvString(string) - } + } - // | FRValueOption(None) => break + // | FRValueOption(None) => break let matchWithExpressionValueArray = (inputs: array, args: array): option< array, > => { diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index 39f20d4d..54933d20 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -21,7 +21,7 @@ module Declaration = { ->E.A2.fmap(getMinMax) ->E.A.R.firstErrorOrOpen ->E.R2.fmap(args => ReducerInterface_ExpressionValue.EvDeclaration( - Declaration.ContinuousDeclaration.make(lambda, args), + Declaration.make(lambda, args), )) } | _ => Error("Error") @@ -35,8 +35,7 @@ let registry = [ ~definitions=[ FnDefinition.make(~name="declareFn", ~inputs=[Declaration.frType], ~run=(inputs, _) => { inputs->E.A.unsafe_get(0)->Declaration.fromExpressionValue - } - ), + }), ], ), Function.make( diff --git a/packages/squiggle-lang/src/rescript/TypescriptInterface.res b/packages/squiggle-lang/src/rescript/TypescriptInterface.res index e6170366..932edaa1 100644 --- a/packages/squiggle-lang/src/rescript/TypescriptInterface.res +++ b/packages/squiggle-lang/src/rescript/TypescriptInterface.res @@ -92,13 +92,7 @@ let defaultEnvironment = ReducerInterface_ExpressionValue.defaultEnvironment let foreignFunctionInterface = Reducer.foreignFunctionInterface @genType -type declarationContinuousArg = Declaration.continuousArg - -@genType -type continuousDeclaration<'a> = Declaration.continuousDeclaration<'a> - -@genType -type relativeComparisonDeclaration<'a> = Declaration.relativeComparisonDeclaration<'a> +type declarationArg = Declaration.arg @genType type declaration<'a> = Declaration.declaration<'a> diff --git a/packages/squiggle-lang/src/rescript/Utility/Declaration.res b/packages/squiggle-lang/src/rescript/Utility/Declaration.res index 188f01ca..d26e1833 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Declaration.res +++ b/packages/squiggle-lang/src/rescript/Utility/Declaration.res @@ -1,33 +1,24 @@ @genType -type continuousArg = Float({min: float, max: float}) | Time({min: Js.Date.t, max: Js.Date.t}) +type arg = Float({min: float, max: float}) | Date({min: Js.Date.t, max: Js.Date.t}) + @genType -type continuousDeclaration<'a> = {fn: 'a, args: array} -@genType -type relativeComparisonDeclaration<'a> = {fn: 'a, options: array} -@genType -type declaration<'a> = - Continuous(continuousDeclaration<'a>) | RelativeComparison(relativeComparisonDeclaration<'a>) +type declaration<'a> = { + fn: 'a, + args: array, +} module ContinuousFloatArg = { - let make = (min: float, max: float): continuousArg => { + let make = (min: float, max: float): arg => { Float({min: min, max: max}) } } module ContinuousTimeArg = { - let make = (min: Js.Date.t, max: Js.Date.t): continuousArg => { - Time({min: min, max: max}) + let make = (min: Js.Date.t, max: Js.Date.t): arg => { + Date({min: min, max: max}) } } -module ContinuousDeclaration = { - let make = (fn: 'a, args: array): declaration<'a> => { - Continuous({fn: fn, args: args}) - } -} - -module RelativeComparisonDeclaration = { - let make = (fn: 'a, options: array): declaration<'a> => { - RelativeComparison({fn: fn, options: options}) - } +let make = (fn: 'a, args: array): declaration<'a> => { + {fn: fn, args: args} } From d630f7335dea257cda12b35d4355457a00b7c745 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 26 May 2022 08:23:43 -0400 Subject: [PATCH 241/340] Minor fixes --- .../src/components/SquiggleChart.tsx | 33 +++++++++---------- .../src/vega-specs/spec-percentiles.json | 1 + .../squiggle-lang/src/js/rescript_interop.ts | 2 +- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 2971a3e1..31d48a1c 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -12,7 +12,7 @@ import { defaultBindings, defaultEnvironment, declarationArg, - declaration + declaration, } from "@quri/squiggle-lang"; import { NumberShower } from "./NumberShower"; import { DistributionChart } from "./DistributionChart"; @@ -25,14 +25,12 @@ function getRange(x: declaration) { case "Float": { return { floats: { min: first.value.min, max: first.value.max } }; } - case "Time": { - return { time: { min: first.value.min, max: first.value.max } }; + case "Date": { + return { time: { min: first.value.min, max: first.value.max} }; } } } -function getChartSettings( - x: declaration -): FunctionChartSettings { +function getChartSettings(x: declaration): FunctionChartSettings { let range = getRange(x); let min = range.floats ? range.floats.min : 0; let max = range.floats ? range.floats.max : 10; @@ -207,7 +205,6 @@ const SquiggleItem: React.FC = ({ />
))} - ) ); case "arraystring": @@ -241,17 +238,17 @@ const SquiggleItem: React.FC = ({ /> ); case "lambdaDeclaration": { - return ( - - ); - } + return ( + + ); + } default: { return <>Should be unreachable; } diff --git a/packages/components/src/vega-specs/spec-percentiles.json b/packages/components/src/vega-specs/spec-percentiles.json index d533a866..36e4450c 100644 --- a/packages/components/src/vega-specs/spec-percentiles.json +++ b/packages/components/src/vega-specs/spec-percentiles.json @@ -75,6 +75,7 @@ "name": "xscale", "type": "linear", "nice": true, + "zero": false, "domain": { "data": "facet", "field": "x" diff --git a/packages/squiggle-lang/src/js/rescript_interop.ts b/packages/squiggle-lang/src/js/rescript_interop.ts index 64e7a64f..9f9bdb39 100644 --- a/packages/squiggle-lang/src/js/rescript_interop.ts +++ b/packages/squiggle-lang/src/js/rescript_interop.ts @@ -102,7 +102,7 @@ type rescriptDeclarationArg = max: number; } | { - TAG: 1; // Float + TAG: 1; // Date min: Date; max: Date; }; From 554e50901e8e313585b7c7bb9bdb2c27f2b5b42a Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 26 May 2022 08:30:37 -0400 Subject: [PATCH 242/340] Added VariableBox for functiona and function declaration --- packages/components/src/components/SquiggleChart.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 31d48a1c..4479013e 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -228,6 +228,7 @@ const SquiggleItem: React.FC = ({ } case "lambda": return ( + = ({ xyPointLength: environment.xyPointLength / 10, }} /> + ); case "lambdaDeclaration": { return ( + = ({ xyPointLength: environment.xyPointLength / 10, }} /> + ); } default: { From c9a54d4c1402acc9a6688d676be8a814774199df Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 26 May 2022 10:08:19 -0400 Subject: [PATCH 243/340] First attempt at playground configurable toggles --- packages/components/package.json | 5 +- .../src/components/FunctionChart.tsx | 5 +- .../components/src/components/JsonEditor.tsx | 55 +++++++++++ .../src/components/SquiggleChart.tsx | 1 + .../src/components/SquigglePlayground.tsx | 95 +++++++++++++++++-- yarn.lock | 62 ++++++++++-- 6 files changed, 205 insertions(+), 18 deletions(-) create mode 100644 packages/components/src/components/JsonEditor.tsx diff --git a/packages/components/package.json b/packages/components/package.json index 67b2eeb5..3b594bc5 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -3,18 +3,21 @@ "version": "0.2.20", "license": "MIT", "dependencies": { + "@hookform/resolvers": "^2.8.10", "@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-dom": "^18.1.0", + "react-hook-form": "^7.31.2", "react-use": "^17.4.0", "react-vega": "^7.5.1", "styled-components": "^5.3.5", "vega": "^5.22.1", "vega-embed": "^6.20.6", - "vega-lite": "^5.2.0" + "vega-lite": "^5.2.0", + "yup": "^0.32.11" }, "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.17.12", diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index 242bf719..d774f3db 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -45,6 +45,7 @@ interface FunctionChartProps { fn: lambdaValue; chartSettings: FunctionChartSettings; environment: environment; + height: number; } type percentiles = { @@ -149,6 +150,7 @@ export const FunctionChart: React.FC = ({ fn, chartSettings, environment, + height }: FunctionChartProps) => { let [mouseOverlay, setMouseOverlay] = React.useState(0); function handleHover(_name: string, value: unknown) { @@ -172,7 +174,7 @@ export const FunctionChart: React.FC = ({ ) : ( @@ -188,6 +190,7 @@ export const FunctionChart: React.FC = ({ <> diff --git a/packages/components/src/components/JsonEditor.tsx b/packages/components/src/components/JsonEditor.tsx new file mode 100644 index 00000000..eeac3de8 --- /dev/null +++ b/packages/components/src/components/JsonEditor.tsx @@ -0,0 +1,55 @@ +import _ from "lodash"; +import React, { FC } from "react"; +import AceEditor from "react-ace"; + +import "ace-builds/src-noconflict/mode-json"; +import "ace-builds/src-noconflict/theme-github"; +import { + jsImports, + defaultImports, +} from "@quri/squiggle-lang"; + +interface CodeEditorProps { + value: string; + onChange: (value: string) => void; + oneLine?: boolean; + width?: number; + height: number; + showGutter?: boolean; +} + +export let JsonEditor: FC = ({ + value, + onChange, + oneLine = false, + showGutter = false, + height, +}: CodeEditorProps) => { + let lineCount = value.split("\n").length; + let id = _.uniqueId(); + return ( + + ); +}; + +export default JsonEditor; diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 50fcebb3..5cbebc8e 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -207,6 +207,7 @@ const SquiggleItem: React.FC = ({ = ({ initialSquiggleString = "", height = 300, @@ -95,9 +125,12 @@ let SquigglePlayground: FC = ({ showSummary = false, }: PlaygroundProps) => { let [squiggleString, setSquiggleString] = useState(initialSquiggleString); - let [sampleCount, setSampleCount] = useState(1000); - let [outputXYPoints, setOutputXYPoints] = useState(1000); - let [pointDistLength, setPointDistLength] = useState(1000); + let [importString, setImportString] = useState("{}"); + let [imports, setImports] = useState({}); + let [importsAreValid, setImportsAreValid] = useState(true); + let [showTypesInput, setShowTypesInput] = useState(showTypes); + let [showControlsInput, setShowControlsInput] = useState(showControls); + let [showSummaryInput, setShowSummaryInput] = useState(showSummary); let [diagramStart, setDiagramStart] = useState(0); let [diagramStop, setDiagramStop] = useState(10); let [diagramCount, setDiagramCount] = useState(20); @@ -106,12 +139,46 @@ let SquigglePlayground: FC = ({ stop: diagramStop, count: diagramCount, }; + const { + register, + formState: { errors }, + control, + } = useForm({ + resolver: yupResolver(schema), + defaultValues: { + sampleCount: 1000, + xyPointLength: 1000, + chartHeight: 150, + showTypes: showTypes, + showControls: showControls, + showSummary: showSummary, + }, + }); + const foo = useWatch({ + control, + }); let env: environment = { - sampleCount: sampleCount, - xyPointLength: outputXYPoints, + sampleCount: Number(foo.sampleCount), + xyPointLength: Number(foo.xyPointLength), + }; + let getChangeJson = (r: string) => { + setImportString(r); + try { + setImports(JSON.parse(r)); + setImportsAreValid(true); + } catch (e) { + setImportsAreValid(false); + } + (""); }; return ( + + + + + + = ({ showGutter={true} height={height - 3} /> + + {importsAreValid ? "Valid" : "INVALID"} @@ -128,12 +203,12 @@ let SquigglePlayground: FC = ({ squiggleString={squiggleString} environment={env} chartSettings={chartSettings} - height={150} - showTypes={showTypes} - showControls={showControls} + height={foo.chartHeight} + showTypes={foo.showTypes} + showControls={foo.showControls} bindings={defaultBindings} - jsImports={defaultImports} - showSummary={showSummary} + jsImports={imports} + showSummary={foo.showSummary} /> diff --git a/yarn.lock b/yarn.lock index 39329f75..680465a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1245,6 +1245,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.15.4": + version "7.18.3" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4" + integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.12.7", "@babel/template@^7.16.7", "@babel/template@^7.3.3": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" @@ -1839,6 +1846,11 @@ dependencies: "@hapi/hoek" "^9.0.0" +"@hookform/resolvers@^2.8.10": + version "2.8.10" + resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-2.8.10.tgz#b66d7a7848b1b1dd5b976a73fff36bb366666e7d" + integrity sha512-DDFtNlugsbwAhCJHYp3NcN5LvJrwSsCLPi41Wo5O8UAIbUFnBfY/jW+zKnlX57BZ4jE0j/g6R9rB3JlO89ad0g== + "@humanwhocodes/config-array@^0.9.2": version "0.9.5" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7" @@ -4163,7 +4175,7 @@ resolved "https://registry.yarnpkg.com/@types/katex/-/katex-0.11.1.tgz#34de04477dcf79e2ef6c8d23b41a3d81f9ebeaf5" integrity sha512-DUlIj2nk0YnJdlWgsFuVKcX27MLW0KbKmGVoUHmFr+74FYYNUDAaj9ZqTADvsbE8rfxuVmSFc7KczYn5Y09ozg== -"@types/lodash@^4.14.167", "@types/lodash@^4.14.182": +"@types/lodash@^4.14.167", "@types/lodash@^4.14.175", "@types/lodash@^4.14.182": version "4.14.182" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.182.tgz#05301a4d5e62963227eaafe0ce04dd77c54ea5c2" integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q== @@ -4298,10 +4310,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.1", "@types/react@^18.0.9": - version "18.0.9" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" - integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== +"@types/react@*", "@types/react@17.0.43", "@types/react@^18.0.9": + version "17.0.43" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.43.tgz#4adc142887dd4a2601ce730bc56c3436fdb07a55" + integrity sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -11601,6 +11613,11 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +lodash-es@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== + lodash.assignin@^4.0.9: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" @@ -12290,6 +12307,11 @@ nano-css@^5.3.1: stacktrace-js "^2.0.2" stylis "^4.0.6" +nanoclone@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4" + integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA== + nanoid@^3.3.1, nanoid@^3.3.3: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" @@ -13998,6 +14020,11 @@ prop-types@^15.0.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: object-assign "^4.1.1" react-is "^16.13.1" +property-expr@^2.0.4: + version "2.0.5" + resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4" + integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA== + property-information@^5.0.0, property-information@^5.3.0: version "5.6.0" resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" @@ -14328,6 +14355,11 @@ react-helmet-async@*, react-helmet-async@^1.3.0: react-fast-compare "^3.2.0" shallowequal "^1.1.0" +react-hook-form@^7.31.2: + version "7.31.2" + resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.31.2.tgz#efb7ac469810954488b7cf40be4e5017122c6e5e" + integrity sha512-oPudn3YuyzWg//IsT9z2cMEjWocAgHWX/bmueDT8cmsYQnGY5h7/njjvMDfLVv3mbdhYBjslTRnII2MIT7eNCA== + react-inspector@^5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-5.1.1.tgz#58476c78fde05d5055646ed8ec02030af42953c8" @@ -14525,7 +14557,7 @@ react-vega@^7.5.1: prop-types "^15.8.1" vega-embed "^6.5.1" -react@^18.0.0, react@^18.1.0: +react@^18.1.0: version "18.1.0" resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890" integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ== @@ -16559,6 +16591,11 @@ topojson-client@^3.1.0: dependencies: commander "2" +toposort@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" + integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA= + totalist@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df" @@ -18440,6 +18477,19 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +yup@^0.32.11: + version "0.32.11" + resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5" + integrity sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg== + dependencies: + "@babel/runtime" "^7.15.4" + "@types/lodash" "^4.14.175" + lodash "^4.17.21" + lodash-es "^4.17.21" + nanoclone "^0.2.1" + property-expr "^2.0.4" + toposort "^2.0.2" + zwitch@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" From f393cfda9f0c807d885dab6ef943c9ee0e3e1413 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 26 May 2022 14:41:58 -0400 Subject: [PATCH 244/340] Simple line chart for Functions --- .../src/components/FunctionChart.tsx | 219 +++--------------- .../src/components/FunctionChart1Dist.tsx | 214 +++++++++++++++++ .../src/components/FunctionChart1Number.tsx | 145 ++++++++++++ .../src/components/SquigglePlayground.tsx | 28 ++- .../src/vega-specs/spec-line-chart.json | 88 +++++++ packages/components/tsconfig.json | 3 +- 6 files changed, 504 insertions(+), 193 deletions(-) create mode 100644 packages/components/src/components/FunctionChart1Dist.tsx create mode 100644 packages/components/src/components/FunctionChart1Number.tsx create mode 100644 packages/components/src/vega-specs/spec-line-chart.json diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index d774f3db..5a37f0ca 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -7,34 +7,11 @@ import { lambdaValue, environment, runForeign, - squiggleExpression, - errorValue, - errorValueToString, } from "@quri/squiggle-lang"; -import { createClassFromSpec } from "react-vega"; -import * as percentilesSpec from "../vega-specs/spec-percentiles.json"; -import { DistributionChart } from "./DistributionChart"; -import { NumberShower } from "./NumberShower"; +import { FunctionChart1Dist } from "./FunctionChart1Dist"; +import { FunctionChart1Number } from "./FunctionChart1Number"; import { ErrorBox } from "./ErrorBox"; -let SquigglePercentilesChart = createClassFromSpec({ - spec: percentilesSpec as Spec, -}); - -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"); - } -} export type FunctionChartSettings = { start: number; stop: number; @@ -48,167 +25,47 @@ interface FunctionChartProps { height: number; } -type percentiles = { - x: number; - p1: number; - p5: number; - p10: number; - p20: number; - p30: number; - p40: number; - p50: number; - p60: number; - p70: number; - p80: number; - p90: number; - p95: number; - p99: number; -}[]; - -type errors = _.Dictionary< - { - x: number; - value: string; - }[] ->; - -type point = { x: number; value: result }; - -let getPercentiles = ({ chartSettings, fn, environment }) => { - let chartPointsToRender = _rangeByCount( - chartSettings.start, - chartSettings.stop, - chartSettings.count - ); - - let chartPointsData: point[] = chartPointsToRender.map((x) => { - let result = runForeign(fn, [x], environment); - if (result.tag === "Ok") { - if (result.value.tag == "distribution") { - return { x, value: { tag: "Ok", value: result.value.value } }; - } else { - return { - x, - value: { - tag: "Error", - value: - "Cannot currently render functions that don't return distributions", - }, - }; - } - } else { - return { - x, - value: { tag: "Error", value: errorValueToString(result.value) }, - }; - } - }); - - let initialPartition: [ - { x: number; value: Distribution }[], - { x: number; value: string }[] - ] = [[], []]; - - let [functionImage, errors] = chartPointsData.reduce((acc, current) => { - if (current.value.tag === "Ok") { - acc[0].push({ x: current.x, value: current.value.value }); - } else { - acc[1].push({ x: current.x, value: current.value.value }); - } - return acc; - }, initialPartition); - - let groupedErrors: errors = _.groupBy(errors, (x) => x.value); - - let percentiles: percentiles = functionImage.map(({ x, value }) => { - // We convert it to to a pointSet distribution first, so that in case its a sample set - // distribution, it doesn't internally convert it to a pointSet distribution for every - // single inv() call. - let toPointSet: Distribution = unwrap(value.toPointSet()); - return { - x: x, - p1: unwrap(toPointSet.inv(0.01)), - p5: unwrap(toPointSet.inv(0.05)), - p10: unwrap(toPointSet.inv(0.1)), - p20: unwrap(toPointSet.inv(0.2)), - p30: unwrap(toPointSet.inv(0.3)), - p40: unwrap(toPointSet.inv(0.4)), - p50: unwrap(toPointSet.inv(0.5)), - p60: unwrap(toPointSet.inv(0.6)), - p70: unwrap(toPointSet.inv(0.7)), - p80: unwrap(toPointSet.inv(0.8)), - p90: unwrap(toPointSet.inv(0.9)), - p95: unwrap(toPointSet.inv(0.95)), - p99: unwrap(toPointSet.inv(0.99)), - }; - }); - - return { percentiles, errors: groupedErrors }; -}; - export const FunctionChart: React.FC = ({ fn, chartSettings, environment, - height + height, }: FunctionChartProps) => { - let [mouseOverlay, setMouseOverlay] = React.useState(0); - function handleHover(_name: string, value: unknown) { - setMouseOverlay(value as number); - } - function handleOut() { - setMouseOverlay(NaN); - } - const signalListeners = { mousemove: handleHover, mouseout: handleOut }; - let mouseItem: result = !!mouseOverlay - ? runForeign(fn, [mouseOverlay], environment) - : { - tag: "Error", - value: { - tag: "REExpectedType", - value: "Hover x-coordinate returned NaN. Expected a number.", - }, - }; - let showChart = - mouseItem.tag === "Ok" && mouseItem.value.tag == "distribution" ? ( - - ) : ( - <> - ); + let result = runForeign(fn, [chartSettings.start], environment); + let resultType = result.tag === "Ok" ? result.value.tag : "Error"; - let getPercentilesMemoized = React.useMemo( - () => getPercentiles({ chartSettings, fn, environment }), - [environment, fn] - ); - - return ( - <> - - {showChart} - {_.entries(getPercentilesMemoized.errors).map( - ([errorName, errorPoints]) => ( - - Values:{" "} - {errorPoints - .map((r, i) => ) - .reduce((a, b) => ( - <> - {a}, {b} - - ))} + let comp = () => { + switch (resultType) { + case "distribution": + return ( + + ); + case "number": + return ( + + ); + case "Error": + return ( + The function failed to be run + ); + default: + return ( + + There is no function visualization for this type of function - ) - )} - - ); + ); + } + }; + + return comp(); }; diff --git a/packages/components/src/components/FunctionChart1Dist.tsx b/packages/components/src/components/FunctionChart1Dist.tsx new file mode 100644 index 00000000..e1d8333c --- /dev/null +++ b/packages/components/src/components/FunctionChart1Dist.tsx @@ -0,0 +1,214 @@ +import * as React from "react"; +import _ from "lodash"; +import type { Spec } from "vega"; +import { + Distribution, + result, + lambdaValue, + environment, + runForeign, + squiggleExpression, + errorValue, + errorValueToString, +} from "@quri/squiggle-lang"; +import { createClassFromSpec } from "react-vega"; +import * as percentilesSpec from "../vega-specs/spec-percentiles.json"; +import { DistributionChart } from "./DistributionChart"; +import { NumberShower } from "./NumberShower"; +import { ErrorBox } from "./ErrorBox"; + +let SquigglePercentilesChart = createClassFromSpec({ + spec: percentilesSpec as Spec, +}); + +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"); + } +} +export type FunctionChartSettings = { + start: number; + stop: number; + count: number; +}; + +interface FunctionChartProps { + fn: lambdaValue; + chartSettings: FunctionChartSettings; + environment: environment; + height: number; +} + +type percentiles = { + x: number; + p1: number; + p5: number; + p10: number; + p20: number; + p30: number; + p40: number; + p50: number; + p60: number; + p70: number; + p80: number; + p90: number; + p95: number; + p99: number; +}[]; + +type errors = _.Dictionary< + { + x: number; + value: string; + }[] +>; + +type point = { x: number; value: result }; + +let getPercentiles = ({ chartSettings, fn, environment }) => { + let chartPointsToRender = _rangeByCount( + chartSettings.start, + chartSettings.stop, + chartSettings.count + ); + + let chartPointsData: point[] = chartPointsToRender.map((x) => { + let result = runForeign(fn, [x], environment); + if (result.tag === "Ok") { + if (result.value.tag == "distribution") { + return { x, value: { tag: "Ok", value: result.value.value } }; + } else { + return { + x, + value: { + tag: "Error", + value: + "Cannot currently render functions that don't return distributions", + }, + }; + } + } else { + return { + x, + value: { tag: "Error", value: errorValueToString(result.value) }, + }; + } + }); + + let initialPartition: [ + { x: number; value: Distribution }[], + { x: number; value: string }[] + ] = [[], []]; + + let [functionImage, errors] = chartPointsData.reduce((acc, current) => { + if (current.value.tag === "Ok") { + acc[0].push({ x: current.x, value: current.value.value }); + } else { + acc[1].push({ x: current.x, value: current.value.value }); + } + return acc; + }, initialPartition); + + let groupedErrors: errors = _.groupBy(errors, (x) => x.value); + + let percentiles: percentiles = functionImage.map(({ x, value }) => { + // We convert it to to a pointSet distribution first, so that in case its a sample set + // distribution, it doesn't internally convert it to a pointSet distribution for every + // single inv() call. + let toPointSet: Distribution = unwrap(value.toPointSet()); + return { + x: x, + p1: unwrap(toPointSet.inv(0.01)), + p5: unwrap(toPointSet.inv(0.05)), + p10: unwrap(toPointSet.inv(0.1)), + p20: unwrap(toPointSet.inv(0.2)), + p30: unwrap(toPointSet.inv(0.3)), + p40: unwrap(toPointSet.inv(0.4)), + p50: unwrap(toPointSet.inv(0.5)), + p60: unwrap(toPointSet.inv(0.6)), + p70: unwrap(toPointSet.inv(0.7)), + p80: unwrap(toPointSet.inv(0.8)), + p90: unwrap(toPointSet.inv(0.9)), + p95: unwrap(toPointSet.inv(0.95)), + p99: unwrap(toPointSet.inv(0.99)), + }; + }); + + return { percentiles, errors: groupedErrors }; +}; + +export const FunctionChart1Dist: React.FC = ({ + fn, + chartSettings, + environment, + height +}: FunctionChartProps) => { + let [mouseOverlay, setMouseOverlay] = React.useState(0); + function handleHover(_name: string, value: unknown) { + setMouseOverlay(value as number); + } + function handleOut() { + setMouseOverlay(NaN); + } + const signalListeners = { mousemove: handleHover, mouseout: handleOut }; + let mouseItem: result = !!mouseOverlay + ? runForeign(fn, [mouseOverlay], environment) + : { + tag: "Error", + value: { + tag: "REExpectedType", + value: "Hover x-coordinate returned NaN. Expected a number.", + }, + }; + let showChart = + mouseItem.tag === "Ok" && mouseItem.value.tag == "distribution" ? ( + + ) : ( + <> + ); + + let getPercentilesMemoized = React.useMemo( + () => getPercentiles({ chartSettings, fn, environment }), + [environment, fn] + ); + + return ( + <> + + {showChart} + {_.entries(getPercentilesMemoized.errors).map( + ([errorName, errorPoints]) => ( + + Values:{" "} + {errorPoints + .map((r, i) => ) + .reduce((a, b) => ( + <> + {a}, {b} + + ))} + + ) + )} + + ); +}; diff --git a/packages/components/src/components/FunctionChart1Number.tsx b/packages/components/src/components/FunctionChart1Number.tsx new file mode 100644 index 00000000..fa72bf71 --- /dev/null +++ b/packages/components/src/components/FunctionChart1Number.tsx @@ -0,0 +1,145 @@ +import * as React from "react"; +import _ from "lodash"; +import type { Spec } from "vega"; +import { + Distribution, + result, + lambdaValue, + environment, + runForeign, + squiggleExpression, + errorValue, + errorValueToString, +} from "@quri/squiggle-lang"; +import { createClassFromSpec } from "react-vega"; +import * as lineChartSpec from "../vega-specs/spec-line-chart.json"; +import { DistributionChart } from "./DistributionChart"; +import { NumberShower } from "./NumberShower"; +import { ErrorBox } from "./ErrorBox"; + +let SquiggleLineChart = createClassFromSpec({ + spec: lineChartSpec as Spec, +}); + +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"); + } +} +export type FunctionChartSettings = { + start: number; + stop: number; + count: number; +}; + +interface FunctionChartProps { + fn: lambdaValue; + chartSettings: FunctionChartSettings; + environment: environment; + height: number; +} + +type point = { x: number; value: result }; + +let getFunctionImage = ({ chartSettings, fn, environment }) => { + let chartPointsToRender = _rangeByCount( + chartSettings.start, + chartSettings.stop, + chartSettings.count + ); + + let chartPointsData: point[] = chartPointsToRender.map((x) => { + let result = runForeign(fn, [x], environment); + if (result.tag === "Ok") { + if (result.value.tag == "number") { + return { x, value: { tag: "Ok", value: result.value.value } }; + } else { + return { + x, + value: { + tag: "Error", + value: + "Cannot currently render functions that don't return distributions", + }, + }; + } + } else { + return { + x, + value: { tag: "Error", value: errorValueToString(result.value) }, + }; + } + }); + + let initialPartition: [ + { x: number; value: number }[], + { x: number; value: string }[] + ] = [[], []]; + + let [functionImage, errors] = chartPointsData.reduce((acc, current) => { + if (current.value.tag === "Ok") { + acc[0].push({ x: current.x, value: current.value.value }); + } else { + acc[1].push({ x: current.x, value: current.value.value }); + } + return acc; + }, initialPartition); + + return { errors, functionImage }; +}; + +export const FunctionChart1Number: React.FC = ({ + fn, + chartSettings, + environment, + height, +}: FunctionChartProps) => { + let [mouseOverlay, setMouseOverlay] = React.useState(0); + function handleHover(_name: string, value: unknown) { + setMouseOverlay(value as number); + } + function handleOut() { + setMouseOverlay(NaN); + } + const signalListeners = { mousemove: handleHover, mouseout: handleOut }; + let mouseItem: result = !!mouseOverlay + ? runForeign(fn, [mouseOverlay], environment) + : { + tag: "Error", + value: { + tag: "REExpectedType", + value: "Hover x-coordinate returned NaN. Expected a number.", + }, + }; + + let getFunctionImageMemoized = React.useMemo( + () => getFunctionImage({ chartSettings, fn, environment }), + [environment, fn] + ); + + let data = getFunctionImageMemoized.functionImage.map(({x, value}) => ({x, y:value})) + return ( + <> + + {getFunctionImageMemoized.errors.map(({ x, value }) => ( + + Error at point ${x} + + ))} + + ); +}; diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index 1bbd84a2..c28bf11a 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -72,9 +72,13 @@ const Display = styled.div` max-height: ${(props) => props.maxHeight}px; `; -const Row = styled.div` +interface RowProps { + readonly leftPercentage: number; +} + +const Row = styled.div` display: grid; - grid-template-columns: 50% 50%; + grid-template-columns: ${(p) => p.leftPercentage}% ${(p) => 100 - p.leftPercentage}%; `; const Col = styled.div``; @@ -111,6 +115,7 @@ const schema = yup .min(10) .max(10000), chartHeight: yup.number().required().positive().integer().default(350), + leftSize: yup.number().required().positive().integer().min(10).max(100).default(50), showTypes: yup.boolean(), showControls: yup.boolean(), showSummary: yup.boolean(), @@ -152,14 +157,15 @@ let SquigglePlayground: FC = ({ showTypes: showTypes, showControls: showControls, showSummary: showSummary, + leftSize: 50, }, }); - const foo = useWatch({ + const vars = useWatch({ control, }); let env: environment = { - sampleCount: Number(foo.sampleCount), - xyPointLength: Number(foo.xyPointLength), + sampleCount: Number(vars.sampleCount), + xyPointLength: Number(vars.xyPointLength), }; let getChangeJson = (r: string) => { setImportString(r); @@ -169,17 +175,17 @@ let SquigglePlayground: FC = ({ } catch (e) { setImportsAreValid(false); } - (""); }; return ( + - + = ({ squiggleString={squiggleString} environment={env} chartSettings={chartSettings} - height={foo.chartHeight} - showTypes={foo.showTypes} - showControls={foo.showControls} + height={vars.chartHeight} + showTypes={vars.showTypes} + showControls={vars.showControls} bindings={defaultBindings} jsImports={imports} - showSummary={foo.showSummary} + showSummary={vars.showSummary} /> diff --git a/packages/components/src/vega-specs/spec-line-chart.json b/packages/components/src/vega-specs/spec-line-chart.json new file mode 100644 index 00000000..117d9543 --- /dev/null +++ b/packages/components/src/vega-specs/spec-line-chart.json @@ -0,0 +1,88 @@ +{ + "$schema": "https://vega.github.io/schema/vega/v5.json", + "width": 500, + "height": 200, + "padding": 5, + "data": [ + { + "name": "facet", + "values": [], + "format": { + "type": "json", + "parse": { + "timestamp": "date" + } + } + } + ], + "scales": [ + { + "name": "x", + "type": "linear", + "nice": true, + "domain": { + "data": "facet", + "field": "x" + }, + "range": "width" + }, + { + "name": "y", + "type": "linear", + "range": "height", + "nice": true, + "zero": true, + "domain": { + "data": "facet", + "field": "y" + } + } + ], + "signals": [ + { + "name": "mousemove", + "on": [{ "events": "mousemove", "update": "invert('x', x())" }] + }, + { + "name": "mouseout", + "on": [{ "events": "mouseout", "update": "invert('x', x())" }] + } + ], + "axes": [ + { + "orient": "bottom", + "scale": "x", + "grid": false, + "labelColor": "#727d93", + "tickColor": "#fff", + "tickOpacity": 0.0, + "domainColor": "#727d93", + "domainOpacity": 0.1, + "tickCount": 5 + }, + { + "orient": "left", + "scale": "y", + "grid": false, + "labelColor": "#727d93", + "tickColor": "#fff", + "tickOpacity": 0.0, + "domainColor": "#727d93", + "domainOpacity": 0.1, + "tickCount": 5 + } + ], + "marks": [ + { + "type": "line", + "from": { "data": "facet" }, + "encode": { + "enter": { + "x": { "scale": "x", "field": "x" }, + "y": { "scale": "y", "field": "y" }, + "strokeWidth": { "value": 2 } + } + } + } + ] +} diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json index c8d799d5..38d28704 100644 --- a/packages/components/tsconfig.json +++ b/packages/components/tsconfig.json @@ -20,7 +20,8 @@ }, "files": [ "src/vega-specs/spec-distributions.json", - "src/vega-specs/spec-percentiles.json" + "src/vega-specs/spec-percentiles.json", + "src/vega-specs/spec-line-chart.json" ], "target": "ES6", "include": ["src/**/*", "src/*"], From d38caff28f7671595b8ce8012b3db8401ae0c8ba Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 26 May 2022 16:16:40 -0400 Subject: [PATCH 245/340] Minor cleanup --- .../src/components/FunctionChart.tsx | 16 ++++- .../src/components/FunctionChart1Number.tsx | 5 +- .../src/components/SquiggleChart.tsx | 24 ++++--- .../src/components/SquigglePlayground.tsx | 71 +++++++++++-------- 4 files changed, 72 insertions(+), 44 deletions(-) diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index 5a37f0ca..bfe50684 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -1,5 +1,4 @@ import * as React from "react"; -import _ from "lodash"; import type { Spec } from "vega"; import { Distribution, @@ -31,8 +30,19 @@ export const FunctionChart: React.FC = ({ environment, height, }: FunctionChartProps) => { - let result = runForeign(fn, [chartSettings.start], environment); - let resultType = result.tag === "Ok" ? result.value.tag : "Error"; + let result1 = runForeign(fn, [chartSettings.start], environment); + let result2 = runForeign(fn, [chartSettings.stop], environment); + let getValidResult = () => { + if (result1.tag === "Ok") { + return result1; + } else if (result2.tag === "Ok") { + return result2; + } else { + return result1; + } + }; + let validResult = getValidResult(); + let resultType = validResult.tag === "Ok" ? validResult.value.tag : "Error"; let comp = () => { switch (resultType) { diff --git a/packages/components/src/components/FunctionChart1Number.tsx b/packages/components/src/components/FunctionChart1Number.tsx index fa72bf71..4dae8cf0 100644 --- a/packages/components/src/components/FunctionChart1Number.tsx +++ b/packages/components/src/components/FunctionChart1Number.tsx @@ -51,10 +51,13 @@ interface FunctionChartProps { type point = { x: number; value: result }; let getFunctionImage = ({ chartSettings, fn, environment }) => { + //We adjust the count, because the count is made for distributions, which are much more expensive to estimate + let adjustedCount = chartSettings.count * 20; + let chartPointsToRender = _rangeByCount( chartSettings.start, chartSettings.stop, - chartSettings.count + adjustedCount ); let chartPointsData: point[] = chartPointsToRender.map((x) => { diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 5cbebc8e..f07f5cc8 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -172,7 +172,7 @@ const SquiggleItem: React.FC = ({ = ({ } case "lambda": return ( - + + + ); } }; @@ -255,7 +257,7 @@ export const SquiggleChart: React.FC = ({ squiggleString = "", environment, onChange = () => {}, - height = 60, + height = 200, bindings = defaultBindings, jsImports = defaultImports, showSummary = false, diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index c28bf11a..1c7acd6f 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -78,7 +78,8 @@ interface RowProps { const Row = styled.div` display: grid; - grid-template-columns: ${(p) => p.leftPercentage}% ${(p) => 100 - p.leftPercentage}%; + grid-template-columns: ${(p) => p.leftPercentage}% ${(p) => + 100 - p.leftPercentage}%; `; const Col = styled.div``; @@ -115,10 +116,18 @@ const schema = yup .min(10) .max(10000), chartHeight: yup.number().required().positive().integer().default(350), - leftSize: yup.number().required().positive().integer().min(10).max(100).default(50), + leftSizePercent: yup + .number() + .required() + .positive() + .integer() + .min(10) + .max(100) + .default(50), showTypes: yup.boolean(), showControls: yup.boolean(), showSummary: yup.boolean(), + showSettingsPage: yup.boolean().default(false), }) .required(); @@ -133,9 +142,6 @@ let SquigglePlayground: FC = ({ let [importString, setImportString] = useState("{}"); let [imports, setImports] = useState({}); let [importsAreValid, setImportsAreValid] = useState(true); - let [showTypesInput, setShowTypesInput] = useState(showTypes); - let [showControlsInput, setShowControlsInput] = useState(showControls); - let [showSummaryInput, setShowSummaryInput] = useState(showSummary); let [diagramStart, setDiagramStart] = useState(0); let [diagramStop, setDiagramStop] = useState(10); let [diagramCount, setDiagramCount] = useState(20); @@ -157,7 +163,8 @@ let SquigglePlayground: FC = ({ showTypes: showTypes, showControls: showControls, showSummary: showSummary, - leftSize: 50, + leftSizePercent: 50, + showSettingsPage: false, }, }); const vars = useWatch({ @@ -178,30 +185,36 @@ let SquigglePlayground: FC = ({ }; return ( - - - - - - - - + + - - - {importsAreValid ? "Valid" : "INVALID"} + {vars.showSettingsPage ? ( +
+ + + + + + + + + {importsAreValid ? "Valid" : "Invalid"} +
+ ) : ( + + )} From f5474030ec0faecf7d7d41042d6a8e0a6952c6ec Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 26 May 2022 17:18:10 -0400 Subject: [PATCH 246/340] Added number function to SquiggleChart --- .../src/stories/SquiggleChart.stories.mdx | 18 ++++++++++++++++-- .../src/vega-specs/spec-distributions.json | 3 +++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/packages/components/src/stories/SquiggleChart.stories.mdx b/packages/components/src/stories/SquiggleChart.stories.mdx index 9ad98ef0..bce22c1c 100644 --- a/packages/components/src/stories/SquiggleChart.stories.mdx +++ b/packages/components/src/stories/SquiggleChart.stories.mdx @@ -153,11 +153,11 @@ to allow large and small numbers being printed cleanly. -## Functions +## Functions (Distribution Output) +## Functions (Number Output) + + + + {Template.bind({})} + + + ## Records diff --git a/packages/components/src/vega-specs/spec-distributions.json b/packages/components/src/vega-specs/spec-distributions.json index 74559a03..29ca4e1d 100644 --- a/packages/components/src/vega-specs/spec-distributions.json +++ b/packages/components/src/vega-specs/spec-distributions.json @@ -82,6 +82,9 @@ "y2": { "scale": "yscale", "value": 0 + }, + "fill": { + "value": "#2f65a7" } } } From 30dc66db7c6bec2e4163dc46d452006852074cd7 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 26 May 2022 17:21:17 -0400 Subject: [PATCH 247/340] Ran prettier --- packages/components/src/components/FunctionChart1Dist.tsx | 2 +- packages/components/src/components/FunctionChart1Number.tsx | 5 ++++- packages/components/src/components/JsonEditor.tsx | 5 +---- packages/components/src/components/SquigglePlayground.tsx | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/components/src/components/FunctionChart1Dist.tsx b/packages/components/src/components/FunctionChart1Dist.tsx index e1d8333c..2090af44 100644 --- a/packages/components/src/components/FunctionChart1Dist.tsx +++ b/packages/components/src/components/FunctionChart1Dist.tsx @@ -150,7 +150,7 @@ export const FunctionChart1Dist: React.FC = ({ fn, chartSettings, environment, - height + height, }: FunctionChartProps) => { let [mouseOverlay, setMouseOverlay] = React.useState(0); function handleHover(_name: string, value: unknown) { diff --git a/packages/components/src/components/FunctionChart1Number.tsx b/packages/components/src/components/FunctionChart1Number.tsx index 4dae8cf0..b07b9263 100644 --- a/packages/components/src/components/FunctionChart1Number.tsx +++ b/packages/components/src/components/FunctionChart1Number.tsx @@ -129,7 +129,10 @@ export const FunctionChart1Number: React.FC = ({ [environment, fn] ); - let data = getFunctionImageMemoized.functionImage.map(({x, value}) => ({x, y:value})) + let data = getFunctionImageMemoized.functionImage.map(({ x, value }) => ({ + x, + y: value, + })); return ( <> = ({ }; return ( - + {vars.showSettingsPage ? ( From 7f6fe1a0aad8ef48b8b4458f140c2f2ccc9b3e1a Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 26 May 2022 17:39:28 -0400 Subject: [PATCH 248/340] Minor component cleanup --- .../src/components/FunctionChart.tsx | 13 ++---- .../src/components/FunctionChart1Dist.tsx | 6 +-- .../src/components/FunctionChart1Number.tsx | 40 ++----------------- .../components/src/components/JsonEditor.tsx | 1 - 4 files changed, 10 insertions(+), 50 deletions(-) diff --git a/packages/components/src/components/FunctionChart.tsx b/packages/components/src/components/FunctionChart.tsx index bfe50684..bb5a9e24 100644 --- a/packages/components/src/components/FunctionChart.tsx +++ b/packages/components/src/components/FunctionChart.tsx @@ -1,12 +1,5 @@ import * as React from "react"; -import type { Spec } from "vega"; -import { - Distribution, - result, - lambdaValue, - environment, - runForeign, -} from "@quri/squiggle-lang"; +import { lambdaValue, environment, runForeign } from "@quri/squiggle-lang"; import { FunctionChart1Dist } from "./FunctionChart1Dist"; import { FunctionChart1Number } from "./FunctionChart1Number"; import { ErrorBox } from "./ErrorBox"; @@ -44,7 +37,7 @@ export const FunctionChart: React.FC = ({ let validResult = getValidResult(); let resultType = validResult.tag === "Ok" ? validResult.value.tag : "Error"; - let comp = () => { + let component = () => { switch (resultType) { case "distribution": return ( @@ -77,5 +70,5 @@ export const FunctionChart: React.FC = ({ } }; - return comp(); + return component(); }; diff --git a/packages/components/src/components/FunctionChart1Dist.tsx b/packages/components/src/components/FunctionChart1Dist.tsx index 2090af44..836bcdd5 100644 --- a/packages/components/src/components/FunctionChart1Dist.tsx +++ b/packages/components/src/components/FunctionChart1Dist.tsx @@ -41,7 +41,7 @@ export type FunctionChartSettings = { count: number; }; -interface FunctionChartProps { +interface FunctionChart1DistProps { fn: lambdaValue; chartSettings: FunctionChartSettings; environment: environment; @@ -146,12 +146,12 @@ let getPercentiles = ({ chartSettings, fn, environment }) => { return { percentiles, errors: groupedErrors }; }; -export const FunctionChart1Dist: React.FC = ({ +export const FunctionChart1Dist: React.FC = ({ fn, chartSettings, environment, height, -}: FunctionChartProps) => { +}: FunctionChart1DistProps) => { let [mouseOverlay, setMouseOverlay] = React.useState(0); function handleHover(_name: string, value: unknown) { setMouseOverlay(value as number); diff --git a/packages/components/src/components/FunctionChart1Number.tsx b/packages/components/src/components/FunctionChart1Number.tsx index b07b9263..9d2feca7 100644 --- a/packages/components/src/components/FunctionChart1Number.tsx +++ b/packages/components/src/components/FunctionChart1Number.tsx @@ -2,19 +2,14 @@ import * as React from "react"; import _ from "lodash"; import type { Spec } from "vega"; import { - Distribution, result, lambdaValue, environment, runForeign, - squiggleExpression, - errorValue, errorValueToString, } from "@quri/squiggle-lang"; import { createClassFromSpec } from "react-vega"; import * as lineChartSpec from "../vega-specs/spec-line-chart.json"; -import { DistributionChart } from "./DistributionChart"; -import { NumberShower } from "./NumberShower"; import { ErrorBox } from "./ErrorBox"; let SquiggleLineChart = createClassFromSpec({ @@ -28,20 +23,13 @@ const _rangeByCount = (start: number, stop: number, count: number) => { return result; }; -function unwrap(x: result): a { - if (x.tag === "Ok") { - return x.value; - } else { - throw Error("FAILURE TO UNWRAP"); - } -} export type FunctionChartSettings = { start: number; stop: number; count: number; }; -interface FunctionChartProps { +interface FunctionChart1NumberProps { fn: lambdaValue; chartSettings: FunctionChartSettings; environment: environment; @@ -70,8 +58,7 @@ let getFunctionImage = ({ chartSettings, fn, environment }) => { x, value: { tag: "Error", - value: - "Cannot currently render functions that don't return distributions", + value: "This component expected number outputs", }, }; } @@ -100,30 +87,12 @@ let getFunctionImage = ({ chartSettings, fn, environment }) => { return { errors, functionImage }; }; -export const FunctionChart1Number: React.FC = ({ +export const FunctionChart1Number: React.FC = ({ fn, chartSettings, environment, height, -}: FunctionChartProps) => { - let [mouseOverlay, setMouseOverlay] = React.useState(0); - function handleHover(_name: string, value: unknown) { - setMouseOverlay(value as number); - } - function handleOut() { - setMouseOverlay(NaN); - } - const signalListeners = { mousemove: handleHover, mouseout: handleOut }; - let mouseItem: result = !!mouseOverlay - ? runForeign(fn, [mouseOverlay], environment) - : { - tag: "Error", - value: { - tag: "REExpectedType", - value: "Hover x-coordinate returned NaN. Expected a number.", - }, - }; - +}: FunctionChart1NumberProps) => { let getFunctionImageMemoized = React.useMemo( () => getFunctionImage({ chartSettings, fn, environment }), [environment, fn] @@ -139,7 +108,6 @@ export const FunctionChart1Number: React.FC = ({ data={{ facet: data }} height={height} actions={false} - signalListeners={signalListeners} /> {getFunctionImageMemoized.errors.map(({ x, value }) => ( diff --git a/packages/components/src/components/JsonEditor.tsx b/packages/components/src/components/JsonEditor.tsx index 6d9068c1..c81debf4 100644 --- a/packages/components/src/components/JsonEditor.tsx +++ b/packages/components/src/components/JsonEditor.tsx @@ -4,7 +4,6 @@ import AceEditor from "react-ace"; import "ace-builds/src-noconflict/mode-json"; import "ace-builds/src-noconflict/theme-github"; -import { jsImports, defaultImports } from "@quri/squiggle-lang"; interface CodeEditorProps { value: string; From afb7613bcc1bbd2fb09e71f69a19a32dc09aecba Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Thu, 26 May 2022 18:39:06 -0400 Subject: [PATCH 249/340] Added simple input component for SquigglePlayground --- .../src/components/SquigglePlayground.tsx | 69 ++++++++++++++----- .../stories/SquigglePlayground.stories.mdx | 2 +- 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index 3d550a5a..bb19dee0 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -11,7 +11,6 @@ import { yupResolver } from "@hookform/resolvers/yup"; import { defaultBindings, environment, - defaultImports, } from "@quri/squiggle-lang"; interface FieldFloatProps { @@ -131,9 +130,19 @@ const schema = yup }) .required(); +type InputProps = { + label: string; +}; +const InputItem: React.FC = ({ label, children }) => ( +
+ + {children} +
+); + let SquigglePlayground: FC = ({ initialSquiggleString = "", - height = 300, + height = 500, showTypes = false, showControls = false, showSummary = false, @@ -189,23 +198,45 @@ let SquigglePlayground: FC = ({ {vars.showSettingsPage ? ( -
- - - - - - - - - {importsAreValid ? "Valid" : "Invalid"} -
+ <> + + + + + + + + + + + + + + + + + + + + + + + + {importsAreValid ? "Valid" : "Invalid"} + + ) : ( {Template.bind({})} From 8482a51332a192be059ed6d614eb9293dd24746b Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 07:23:17 -0400 Subject: [PATCH 250/340] Minor fixes to get build to pass --- .../src/components/SquigglePlayground.tsx | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index bb19dee0..921a3282 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -8,10 +8,7 @@ import styled from "styled-components"; import { useForm, useWatch } from "react-hook-form"; import * as yup from "yup"; import { yupResolver } from "@hookform/resolvers/yup"; -import { - defaultBindings, - environment, -} from "@quri/squiggle-lang"; +import { defaultBindings, environment } from "@quri/squiggle-lang"; interface FieldFloatProps { label: string; @@ -132,7 +129,9 @@ const schema = yup type InputProps = { label: string; + children: ReactElement; }; + const InputItem: React.FC = ({ label, children }) => (
@@ -227,14 +226,16 @@ let SquigglePlayground: FC = ({ /> - - {importsAreValid ? "Valid" : "Invalid"} + <> + + {importsAreValid ? "Valid" : "Invalid"} + ) : ( From cbc51c23de28e7a356bfee01484be9efc6ce3b8d Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 07:29:39 -0400 Subject: [PATCH 251/340] Minor improvement of error type --- .../src/rescript/FunctionRegistry/FunctionRegistry_Library.res | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index 54933d20..532f534d 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -24,7 +24,8 @@ module Declaration = { Declaration.make(lambda, args), )) } - | _ => Error("Error") + | Error(r) => Error(r) + | Ok(_) => Error(FunctionRegistry_Helpers.impossibleError) } } } From 4eac2f59beed9855ee8121a0aa34618549acc8ff Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 07:32:03 -0400 Subject: [PATCH 252/340] Ran formatter --- .../src/components/SquiggleChart.tsx | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 4479013e..bb166682 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -26,7 +26,7 @@ function getRange(x: declaration) { return { floats: { min: first.value.min, max: first.value.max } }; } case "Date": { - return { time: { min: first.value.min, max: first.value.max} }; + return { time: { min: first.value.min, max: first.value.max } }; } } } @@ -229,27 +229,27 @@ const SquiggleItem: React.FC = ({ case "lambda": return ( - + ); case "lambdaDeclaration": { return ( - + ); } From 529a8a6763491acc7bed7d5e4dccfdb101579bae Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 07:44:55 -0400 Subject: [PATCH 253/340] Ran yarn --- yarn.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 680465a1..f5044f7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4310,10 +4310,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@17.0.43", "@types/react@^18.0.9": - version "17.0.43" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.43.tgz#4adc142887dd4a2601ce730bc56c3436fdb07a55" - integrity sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A== +"@types/react@*", "@types/react@^18.0.1", "@types/react@^18.0.9": + version "18.0.9" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" + integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -14557,7 +14557,7 @@ react-vega@^7.5.1: prop-types "^15.8.1" vega-embed "^6.5.1" -react@^18.1.0: +react@^18.0.0, react@^18.1.0: version "18.1.0" resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890" integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ== From 20f901e3f863545d45d6ab1646a32ce00c712cb1 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 07:58:43 -0400 Subject: [PATCH 254/340] Added Declaration toString --- .../FunctionRegistry/FunctionRegistry_Core.res | 6 ------ .../ReducerInterface_ExpressionValue.res | 5 ++++- .../src/rescript/Utility/Declaration.res | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res index 582df17d..eed48ffc 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Core.res @@ -11,7 +11,6 @@ type rec frType = | FRTypeLambda | FRTypeRecord(frTypeRecord) | FRTypeArray(frType) - | FRTypeOption(frType) | FRTypeString | FRTypeVariant(array) and frTypeRecord = array @@ -24,7 +23,6 @@ and frTypeRecordParam = (string, frType) type rec frValue = | FRValueNumber(float) | FRValueDist(DistributionTypes.genericDist) - | FRValueOption(option) | FRValueArray(array) | FRValueDistOrNumber(frValueDistOrNumber) | FRValueRecord(frValueRecord) @@ -60,7 +58,6 @@ module FRType = { `record({${r->E.A2.fmap(input)->E.A2.joinWith(", ")}})` } | FRTypeArray(r) => `record(${toString(r)})` - | FRTypeOption(v) => `option(${toString(v)})` | FRTypeLambda => `lambda` | FRTypeString => `string` | FRTypeVariant(_) => "variant" @@ -75,7 +72,6 @@ module FRType = { | (FRTypeDistOrNumber, EvDistribution(f)) => Some(FRValueDistOrNumber(FRValueDist(f))) | (FRTypeNumeric, EvNumber(f)) => Some(FRValueNumber(f)) | (FRTypeNumeric, EvDistribution(Symbolic(#Float(f)))) => Some(FRValueNumber(f)) - | (FRTypeOption(v), _) => Some(FRValueOption(matchWithExpressionValue(v, r))) | (FRTypeLambda, EvLambda(f)) => Some(FRValueLambda(f)) | (FRTypeArray(intendedType), EvArray(elements)) => { let el = elements->E.A2.fmap(matchWithExpressionValue(intendedType)) @@ -101,7 +97,6 @@ module FRType = { | FRValueDistOrNumber(FRValueNumber(n)) => EvNumber(n) | FRValueDistOrNumber(FRValueDist(n)) => EvDistribution(n) | FRValueDist(dist) => EvDistribution(dist) - | FRValueOption(Some(r)) => matchReverse(r) | FRValueArray(elements) => EvArray(elements->E.A2.fmap(matchReverse)) | FRValueRecord(frValueRecord) => { let record = @@ -113,7 +108,6 @@ module FRType = { | FRValueVariant(string) => EvString(string) } - // | FRValueOption(None) => break let matchWithExpressionValueArray = (inputs: array, args: array): option< array, > => { diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res index 8f3dea42..aa040fc2 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_ExpressionValue.res @@ -57,7 +57,7 @@ let rec toString = aValue => | EvDistribution(dist) => GenericDist.toString(dist) | EvDate(date) => DateTime.Date.toString(date) | EvTimeDuration(t) => DateTime.Duration.toString(t) - | EvDeclaration(t) => "Declaration" + | EvDeclaration(d) => Declaration.toString(d, r => toString(EvLambda(r))) } and toStringRecord = aRecord => { let pairs = @@ -128,6 +128,7 @@ type expressionValueType = | EvtSymbol | EvtDate | EvtTimeDuration + | EvtDeclaration type functionCallSignature = CallSignature(string, array) type functionDefinitionSignature = @@ -147,6 +148,7 @@ let valueToValueType = value => | EvSymbol(_) => EvtSymbol | EvDate(_) => EvtDate | EvTimeDuration(_) => EvtTimeDuration + | EvDeclaration(_) => EvtDeclaration } let functionCallToCallSignature = (functionCall: functionCall): functionCallSignature => { @@ -168,6 +170,7 @@ let valueTypeToString = (valueType: expressionValueType): string => | EvtSymbol => `Symbol` | EvtDate => `Date` | EvtTimeDuration => `Duration` + | EvtDeclaration => `Declaration` } let functionCallSignatureToString = (functionCallSignature: functionCallSignature): string => { diff --git a/packages/squiggle-lang/src/rescript/Utility/Declaration.res b/packages/squiggle-lang/src/rescript/Utility/Declaration.res index d26e1833..871dd580 100644 --- a/packages/squiggle-lang/src/rescript/Utility/Declaration.res +++ b/packages/squiggle-lang/src/rescript/Utility/Declaration.res @@ -19,6 +19,24 @@ module ContinuousTimeArg = { } } +module Arg = { + let toString = (arg: arg) => { + switch arg { + | Float({min, max}) => + `Float({min: ${E.Float.with2DigitsPrecision(min)}, max: ${E.Float.with2DigitsPrecision( + max, + )}})` + | Date({min, max}) => + `Date({min: ${DateTime.Date.toString(min)}, max: ${DateTime.Date.toString(max)}})` + } + } +} + let make = (fn: 'a, args: array): declaration<'a> => { {fn: fn, args: args} } + +let toString = (r: declaration<'a>, fnToString): string => { + let args = r.args->E.A2.fmap(Arg.toString) |> E.A.joinWith(", ") + return`fn: ${fnToString(r.fn)}, args: [${args}]` +} From d0102ae4f2acdcf7b6f8ff8ecd54d4a6c7e45f10 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 08:26:10 -0400 Subject: [PATCH 255/340] Changed graph axis to use .9-s format --- packages/components/src/vega-specs/spec-distributions.json | 2 +- packages/components/src/vega-specs/spec-line-chart.json | 5 ++++- packages/components/src/vega-specs/spec-percentiles.json | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/components/src/vega-specs/spec-distributions.json b/packages/components/src/vega-specs/spec-distributions.json index 29ca4e1d..cb3db4b8 100644 --- a/packages/components/src/vega-specs/spec-distributions.json +++ b/packages/components/src/vega-specs/spec-distributions.json @@ -23,7 +23,7 @@ "tickOpacity": 0.0, "domainColor": "#fff", "domainOpacity": 0.0, - "format": "~g", + "format": ".9~s", "tickCount": 10 } ], diff --git a/packages/components/src/vega-specs/spec-line-chart.json b/packages/components/src/vega-specs/spec-line-chart.json index 117d9543..6180ad76 100644 --- a/packages/components/src/vega-specs/spec-line-chart.json +++ b/packages/components/src/vega-specs/spec-line-chart.json @@ -20,6 +20,7 @@ "name": "x", "type": "linear", "nice": true, + "zero": false, "domain": { "data": "facet", "field": "x" @@ -31,7 +32,7 @@ "type": "linear", "range": "height", "nice": true, - "zero": true, + "zero": false, "domain": { "data": "facet", "field": "y" @@ -58,6 +59,7 @@ "tickOpacity": 0.0, "domainColor": "#727d93", "domainOpacity": 0.1, + "format": ".9~s", "tickCount": 5 }, { @@ -69,6 +71,7 @@ "tickOpacity": 0.0, "domainColor": "#727d93", "domainOpacity": 0.1, + "format": ".9~s", "tickCount": 5 } ], diff --git a/packages/components/src/vega-specs/spec-percentiles.json b/packages/components/src/vega-specs/spec-percentiles.json index 36e4450c..415cc173 100644 --- a/packages/components/src/vega-specs/spec-percentiles.json +++ b/packages/components/src/vega-specs/spec-percentiles.json @@ -87,10 +87,10 @@ "type": "linear", "range": "height", "nice": true, - "zero": true, + "zero": false, "domain": { "data": "facet", - "field": "p99" + "fields": ["p1", "p99"] } } ], @@ -114,12 +114,14 @@ "tickOpacity": 0.0, "domainColor": "#727d93", "domainOpacity": 0.1, + "format": ".9~s", "tickCount": 5 }, { "orient": "left", "scale": "yscale", "grid": false, + "format": ".9~s", "labelColor": "#727d93", "tickColor": "#fff", "tickOpacity": 0.0, From d3a2f391a770649124ee9d81d89897b85850161b Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 09:24:06 -0400 Subject: [PATCH 256/340] Added map3 to samplesMap --- .../SampleSetDist/SampleSetDist.res | 20 +++++++- .../Reducer_Dispatch_BuiltIn.res | 47 ++++++++++++++++--- .../squiggle-lang/src/rescript/Utility/E.res | 4 ++ 3 files changed, 63 insertions(+), 8 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res index 834008f5..f02c7914 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res @@ -100,7 +100,25 @@ let map2 = (~fn: (float, float) => result, ~t1: t, ~t2 t, Operation.Error.t, > => { - let samples = Belt.Array.zip(get(t1), get(t2))->E.A2.fmap(((a, b)) => fn(a, b)) + let samples = E.A.zip(get(t1), get(t2))->E.A2.fmap(((a, b)) => fn(a, b)) + + // This assertion should never be reached. In order for it to be reached, one + // of the input parameters would need to be a sample set distribution with less + // than 6 samples. Which should be impossible due to the smart constructor. + // I could prove this to the type system (say, creating a {first: float, second: float, ..., fifth: float, rest: array} + // But doing so would take too much time, so I'll leave it as an assertion + E.A.R.firstErrorOrOpen(samples)->E.R2.fmap(x => + E.R.toExnFnString(Error.sampleSetErrorToString, make(x)) + ) +} + +let map3 = ( + ~fn: (float, float, float) => result, + ~t1: t, + ~t2: t, + ~t3: t, +): result => { + let samples = E.A.zip3(get(t1), get(t2), get(t3))->E.A2.fmap(((a, b, c)) => fn(a, b, c)) // This assertion should never be reached. In order for it to be reached, one // of the input parameters would need to be a sample set distribution with less diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res index 141b4a37..60b59905 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res @@ -101,15 +101,33 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce rMappedList->Result.map(mappedList => mappedList->Belt.List.toArray->EvArray) } - let doMapSampleSetDist = (sampleSetDist: SampleSetDist.t, aLambdaValue) => { - let fn = r => - switch Lambda.doLambdaCall(aLambdaValue, list{EvNumber(r)}, environment, reducer) { + module SampleMap = { + type t = SampleSetDist.t + let doLambdaCall = (aLambdaValue, list) => + switch Lambda.doLambdaCall(aLambdaValue, list, environment, reducer) { | Ok(EvNumber(f)) => Ok(f) | _ => Error(Operation.SampleMapNeedsNtoNFunction) } - switch SampleSetDist.samplesMap(~fn, sampleSetDist) { - | Ok(r) => Ok(EvDistribution(SampleSet(r))) - | Error(r) => Error(REDistributionError(SampleSetError(r))) + + let toType = r => + switch r { + | Ok(r) => Ok(EvDistribution(SampleSet(r))) + | Error(r) => Error(REDistributionError(SampleSetError(r))) + } + + let map1 = (sampleSetDist: t, aLambdaValue) => { + let fn = r => doLambdaCall(aLambdaValue, list{EvNumber(r)}) + toType(SampleSetDist.samplesMap(~fn, sampleSetDist)) + } + + let map2 = (t1: t, t2: t, aLambdaValue) => { + let fn = (a, b) => doLambdaCall(aLambdaValue, list{EvNumber(a), EvNumber(b)}) + SampleSetDist.map2(~fn, ~t1, ~t2)->E.R2.errMap(SampleSetDist.Error.fromOperationError)->toType + } + + let map3 = (t1: t, t2: t, t3: t, aLambdaValue) => { + let fn = (a, b, c) => doLambdaCall(aLambdaValue, list{EvNumber(a), EvNumber(b), EvNumber(c)}) + SampleSetDist.map3(~fn, ~t1, ~t2, ~t3)->E.R2.errMap(SampleSetDist.Error.fromOperationError)->toType } } @@ -143,7 +161,22 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce doKeepArray(aValueArray, aLambdaValue) | ("map", [EvArray(aValueArray), EvLambda(aLambdaValue)]) => doMapArray(aValueArray, aLambdaValue) | ("mapSamples", [EvDistribution(SampleSet(dist)), EvLambda(aLambdaValue)]) => - doMapSampleSetDist(dist, aLambdaValue) + SampleMap.map1(dist, aLambdaValue) + | ( + "mapSamples2", + [EvDistribution(SampleSet(dist1)), EvDistribution(SampleSet(dist2)), EvLambda(aLambdaValue)], + ) => + SampleMap.map2(dist1, dist2, aLambdaValue) + | ( + "mapSamples3", + [ + EvDistribution(SampleSet(dist1)), + EvDistribution(SampleSet(dist2)), + EvDistribution(SampleSet(dist3)), + EvLambda(aLambdaValue), + ], + ) => + SampleMap.map3(dist1, dist2, dist3, aLambdaValue) | ("reduce", [EvArray(aValueArray), initialValue, EvLambda(aLambdaValue)]) => doReduceArray(aValueArray, initialValue, aLambdaValue) | ("reduceReverse", [EvArray(aValueArray), initialValue, EvLambda(aLambdaValue)]) => diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 3357f4f4..65547528 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -567,6 +567,10 @@ module A = { let tail = Belt.Array.sliceToEnd(_, 1) let zip = Belt.Array.zip + let zip3 = (a, b, c) => + Belt.Array.zip(a, b) + -> Belt.Array.zip(c) + -> Belt.Array.map((((v1, v2), v3)) => (v1, v2, v3)) // This zips while taking the longest elements of each array. let zipMaxLength = (array1, array2) => { let maxLength = Int.max(length(array1), length(array2)) From 0da95bd21e942131c65a915dc169c47c83bd0815 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 09:40:49 -0400 Subject: [PATCH 257/340] Cleanup of SampleSet map --- .../rescript/Distributions/GenericDist.res | 2 +- .../SampleSetDist/SampleSetDist.res | 45 +++++++------------ .../FunctionRegistry_Helpers.res | 2 +- .../Reducer_Dispatch_BuiltIn.res | 4 +- .../squiggle-lang/src/rescript/Utility/E.res | 4 ++ 5 files changed, 24 insertions(+), 33 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res index d6920a4e..4a541ce1 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist.res @@ -281,7 +281,7 @@ module AlgebraicCombination = { let fn = Operation.Algebraic.toFn(arithmeticOperation) E.R.merge(toSampleSet(t1), toSampleSet(t2)) ->E.R.bind(((t1, t2)) => { - SampleSetDist.map2(~fn, ~t1, ~t2)->E.R2.errMap(x => DistributionTypes.OperationError(x)) + SampleSetDist.map2(~fn, ~t1, ~t2)->E.R2.errMap(x => DistributionTypes.SampleSetError(x)) }) ->E.R2.fmap(r => DistributionTypes.SampleSet(r)) } diff --git a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res index f02c7914..597319b3 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res @@ -20,6 +20,14 @@ module Error = { } let fromOperationError = e => OperationError(e) + + let toString = (err: sampleSetError) => { + switch(err){ + | TooFewSamples => "Too few samples when constructing sample set" + | NonNumericInput(err) => `Found a non-number in input: ${err}` + | OperationError(err) => Operation.Error.toString(err) + } + } } include Error @@ -87,48 +95,27 @@ let sampleN = (t: t, n) => { } } +let _fromSampleResultArray = (samples: array>) => + E.A.R.firstErrorOrOpen(samples)->E.R2.errMap(Error.fromOperationError) |> E.R2.bind(make) + let samplesMap = (~fn: float => result, t: t): result< t, sampleSetError, -> => { - let samples = T.get(t)->E.A2.fmap(fn) - E.A.R.firstErrorOrOpen(samples)->E.R2.errMap(Error.fromOperationError) |> E.R2.bind(make) -} +> => T.get(t)->E.A2.fmap(fn)->_fromSampleResultArray //TODO: Figure out what to do if distributions are different lengths. ``zip`` is kind of inelegant for this. let map2 = (~fn: (float, float) => result, ~t1: t, ~t2: t): result< t, - Operation.Error.t, -> => { - let samples = E.A.zip(get(t1), get(t2))->E.A2.fmap(((a, b)) => fn(a, b)) - - // This assertion should never be reached. In order for it to be reached, one - // of the input parameters would need to be a sample set distribution with less - // than 6 samples. Which should be impossible due to the smart constructor. - // I could prove this to the type system (say, creating a {first: float, second: float, ..., fifth: float, rest: array} - // But doing so would take too much time, so I'll leave it as an assertion - E.A.R.firstErrorOrOpen(samples)->E.R2.fmap(x => - E.R.toExnFnString(Error.sampleSetErrorToString, make(x)) - ) -} + sampleSetError, +> => E.A.zip(get(t1), get(t2))->E.A2.fmap(E.Tuple2.toFnCall(fn))->_fromSampleResultArray let map3 = ( ~fn: (float, float, float) => result, ~t1: t, ~t2: t, ~t3: t, -): result => { - let samples = E.A.zip3(get(t1), get(t2), get(t3))->E.A2.fmap(((a, b, c)) => fn(a, b, c)) - - // This assertion should never be reached. In order for it to be reached, one - // of the input parameters would need to be a sample set distribution with less - // than 6 samples. Which should be impossible due to the smart constructor. - // I could prove this to the type system (say, creating a {first: float, second: float, ..., fifth: float, rest: array} - // But doing so would take too much time, so I'll leave it as an assertion - E.A.R.firstErrorOrOpen(samples)->E.R2.fmap(x => - E.R.toExnFnString(Error.sampleSetErrorToString, make(x)) - ) -} +): result => + E.A.zip3(get(t1), get(t2), get(t3))->E.A2.fmap(E.Tuple3.toFnCall(fn))->_fromSampleResultArray let mean = t => T.get(t)->E.A.Floats.mean let geomean = t => T.get(t)->E.A.Floats.geomean diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index 118a15d2..e9b7f11c 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -75,7 +75,7 @@ module Process = { | Ok((t1, t2)) => switch SampleSetDist.map2(~fn=altFn, ~t1, ~t2) { | Ok(r) => Ok(DistributionTypes.SampleSet(r)) - | Error(r) => Error(Operation.Error.toString(r)) + | Error(r) => Error(SampleSetDist.Error.toString(r)) } | Error(r) => Error(DistributionTypes.Error.toString(r)) } diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res index 60b59905..4d3bc49f 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltIn.res @@ -122,12 +122,12 @@ let callInternal = (call: functionCall, environment, reducer: ExpressionT.reduce let map2 = (t1: t, t2: t, aLambdaValue) => { let fn = (a, b) => doLambdaCall(aLambdaValue, list{EvNumber(a), EvNumber(b)}) - SampleSetDist.map2(~fn, ~t1, ~t2)->E.R2.errMap(SampleSetDist.Error.fromOperationError)->toType + SampleSetDist.map2(~fn, ~t1, ~t2)->toType } let map3 = (t1: t, t2: t, t3: t, aLambdaValue) => { let fn = (a, b, c) => doLambdaCall(aLambdaValue, list{EvNumber(a), EvNumber(b), EvNumber(c)}) - SampleSetDist.map3(~fn, ~t1, ~t2, ~t3)->E.R2.errMap(SampleSetDist.Error.fromOperationError)->toType + SampleSetDist.map3(~fn, ~t1, ~t2, ~t3)->toType } } diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 65547528..c199b299 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -55,6 +55,10 @@ module Tuple2 = { let toFnCall = (fn, (a1, a2)) => fn(a1, a2) } +module Tuple3 = { + let toFnCall = (fn, (a1, a2, a3)) => fn(a1, a2, a3) +} + module O = { let dimap = (sFn, rFn, e) => switch e { From 35663118177f675757fed7dc5a6e5cf14e51e54e Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 09:44:36 -0400 Subject: [PATCH 258/340] Did formatting --- packages/squiggle-lang/.prettierignore | 2 +- .../Distributions/SampleSetDist/SampleSetDist.res | 8 ++++---- packages/squiggle-lang/src/rescript/Utility/E.res | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/squiggle-lang/.prettierignore b/packages/squiggle-lang/.prettierignore index 46ac9925..cc0cf959 100644 --- a/packages/squiggle-lang/.prettierignore +++ b/packages/squiggle-lang/.prettierignore @@ -3,6 +3,6 @@ lib *.bs.js *.gen.tsx .nyc_output/ -coverage/ +_coverage/ .cache/ Reducer_Peggy_GeneratedParser.js diff --git a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res index 597319b3..bfbaa795 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/SampleSetDist/SampleSetDist.res @@ -22,10 +22,10 @@ module Error = { let fromOperationError = e => OperationError(e) let toString = (err: sampleSetError) => { - switch(err){ - | TooFewSamples => "Too few samples when constructing sample set" - | NonNumericInput(err) => `Found a non-number in input: ${err}` - | OperationError(err) => Operation.Error.toString(err) + switch err { + | TooFewSamples => "Too few samples when constructing sample set" + | NonNumericInput(err) => `Found a non-number in input: ${err}` + | OperationError(err) => Operation.Error.toString(err) } } } diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index c199b299..2c45a8b2 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -572,9 +572,7 @@ module A = { let zip = Belt.Array.zip let zip3 = (a, b, c) => - Belt.Array.zip(a, b) - -> Belt.Array.zip(c) - -> Belt.Array.map((((v1, v2), v3)) => (v1, v2, v3)) + Belt.Array.zip(a, b)->Belt.Array.zip(c)->Belt.Array.map((((v1, v2), v3)) => (v1, v2, v3)) // This zips while taking the longest elements of each array. let zipMaxLength = (array1, array2) => { let maxLength = Int.max(length(array1), length(array2)) From 827e032c03e8b3bb65e83ddff8480d802382aae9 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 10:03:20 -0400 Subject: [PATCH 259/340] Ran yarn to appease prettier --- yarn.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 680465a1..f5044f7d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4310,10 +4310,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@17.0.43", "@types/react@^18.0.9": - version "17.0.43" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.43.tgz#4adc142887dd4a2601ce730bc56c3436fdb07a55" - integrity sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A== +"@types/react@*", "@types/react@^18.0.1", "@types/react@^18.0.9": + version "18.0.9" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" + integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -14557,7 +14557,7 @@ react-vega@^7.5.1: prop-types "^15.8.1" vega-embed "^6.5.1" -react@^18.1.0: +react@^18.0.0, react@^18.1.0: version "18.1.0" resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890" integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ== From f49697b64a705600b9c8514a6d51c3531097ac39 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 13:37:37 -0400 Subject: [PATCH 260/340] Simple toContinousPointSet --- .../PointSetDist/PointSetDist.res | 5 ++- .../FunctionRegistry_Helpers.res | 9 ++++++ .../FunctionRegistry_Library.res | 31 ++++++++++++++++++- .../squiggle-lang/src/rescript/Utility/E.res | 1 + .../src/rescript/Utility/XYShape.res | 5 +++ 5 files changed, 47 insertions(+), 4 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res index d21a7383..92398099 100644 --- a/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res +++ b/packages/squiggle-lang/src/rescript/Distributions/PointSetDist/PointSetDist.res @@ -231,9 +231,8 @@ let doN = (n, fn) => { } let sample = (t: t): float => { - let randomItem = Random.float(1.) - let bar = t |> T.Integral.yToX(randomItem) - bar + let randomItem = Random.float(1.0) + t |> T.Integral.yToX(randomItem) } let isFloat = (t: t) => diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index 1b0fa809..5ecaf9dd 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -9,6 +9,7 @@ module Wrappers = { } module Prepare = { + type t = frValue type ts = array type err = string @@ -26,6 +27,14 @@ module Prepare = { | _ => Error(impossibleError) } } + + module Array = { + let openA = (inputs: t): result => + switch inputs { + | FRValueArray(n) => Ok(n) + | _ => Error(impossibleError) + } + } } module ToValueTuple = { diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index 532f534d..79195dc2 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -32,7 +32,36 @@ module Declaration = { let registry = [ Function.make( - ~name="FnMake", + ~name="toContinuousPointSet", + ~definitions=[ + FnDefinition.make( + ~name="toContinuousPointSet", + ~inputs=[FRTypeArray(FRTypeRecord([("x", FRTypeNumeric), ("y", FRTypeNumeric)]))], + ~run=(inputs, _) => { + let array = inputs->E.A.unsafe_get(0)->Prepare.ToValueArray.Array.openA + let xyCoords = + array->E.R.bind(xyCoords => + xyCoords + ->E.A2.fmap(xyCoord => + [xyCoord] + ->Prepare.ToValueArray.Record.twoArgs + ->E.R.bind(Prepare.ToValueTuple.twoNumbers) + ) + ->E.A.R.firstErrorOrOpen + ) + let expressionValue = + xyCoords + ->E.R.bind(r => r->XYShape.T.makeFromZipped->E.R2.errMap(XYShape.Error.toString)) + ->E.R2.fmap(r => ReducerInterface_ExpressionValue.EvDistribution( + PointSet(Continuous(Continuous.make(r))), + )) + expressionValue + }, + ), + ], + ), + Function.make( + ~name="Declaration", ~definitions=[ FnDefinition.make(~name="declareFn", ~inputs=[Declaration.frType], ~run=(inputs, _) => { inputs->E.A.unsafe_get(0)->Declaration.fromExpressionValue diff --git a/packages/squiggle-lang/src/rescript/Utility/E.res b/packages/squiggle-lang/src/rescript/Utility/E.res index 40852eb3..372ad8ab 100644 --- a/packages/squiggle-lang/src/rescript/Utility/E.res +++ b/packages/squiggle-lang/src/rescript/Utility/E.res @@ -571,6 +571,7 @@ module A = { let tail = Belt.Array.sliceToEnd(_, 1) let zip = Belt.Array.zip + let unzip = Belt.Array.unzip let zip3 = (a, b, c) => Belt.Array.zip(a, b)->Belt.Array.zip(c)->Belt.Array.map((((v1, v2), v3)) => (v1, v2, v3)) // This zips while taking the longest elements of each array. diff --git a/packages/squiggle-lang/src/rescript/Utility/XYShape.res b/packages/squiggle-lang/src/rescript/Utility/XYShape.res index b4758dfd..3fbe9f46 100644 --- a/packages/squiggle-lang/src/rescript/Utility/XYShape.res +++ b/packages/squiggle-lang/src/rescript/Utility/XYShape.res @@ -148,6 +148,11 @@ module T = { | None => Ok(attempt) } } + + let makeFromZipped = (values: array<(float, float)>) => { + let (xs, ys) = E.A.unzip(values) + make(~xs, ~ys) + } } module Ts = { From c2b90b70233d1c5defa7553ce3e97930f99ee406 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 14:03:41 -0400 Subject: [PATCH 261/340] ToDiscretePointSet --- .../src/vega-specs/spec-distributions.json | 3 +- .../FunctionRegistry_Helpers.res | 16 ++++++ .../FunctionRegistry_Library.res | 50 +++++++++++-------- 3 files changed, 48 insertions(+), 21 deletions(-) diff --git a/packages/components/src/vega-specs/spec-distributions.json b/packages/components/src/vega-specs/spec-distributions.json index cb3db4b8..b1b8f7fe 100644 --- a/packages/components/src/vega-specs/spec-distributions.json +++ b/packages/components/src/vega-specs/spec-distributions.json @@ -33,6 +33,7 @@ "from": { "data": "con" }, + "interpolate": "linear", "encode": { "update": { "x": { @@ -51,7 +52,7 @@ "value": "#4C78A8" }, "interpolate": { - "value": "monotone" + "value": "linear" }, "fillOpacity": { "value": 1 diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index 5ecaf9dd..ccc02f79 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -64,6 +64,22 @@ module Prepare = { values->ToValueArray.Record.twoArgs->E.R.bind(twoDistOrNumber) } } + + module ToArrayRecordPairs = { + let twoArgs = (input: t): result<(array), err> => { + let array = input->ToValueArray.Array.openA + let pairs = + array->E.R.bind(pairs => + pairs + ->E.A2.fmap(xyCoord => + [xyCoord] + ->ToValueArray.Record.twoArgs + ) + ->E.A.R.firstErrorOrOpen + ) + pairs + } + } } module Process = { diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index 79195dc2..a40d8678 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -30,6 +30,25 @@ module Declaration = { } } +let inputsTodist = (inputs: array, makeDist) => { + let array = inputs->E.A.unsafe_get(0)->Prepare.ToValueArray.Array.openA + let xyCoords = + array->E.R.bind(xyCoords => + xyCoords + ->E.A2.fmap(xyCoord => + [xyCoord]->Prepare.ToValueArray.Record.twoArgs->E.R.bind(Prepare.ToValueTuple.twoNumbers) + ) + ->E.A.R.firstErrorOrOpen + ) + let expressionValue = + xyCoords + ->E.R.bind(r => r->XYShape.T.makeFromZipped->E.R2.errMap(XYShape.Error.toString)) + ->E.R2.fmap(r => ReducerInterface_ExpressionValue.EvDistribution( + PointSet(makeDist(r)), + )) + expressionValue +} + let registry = [ Function.make( ~name="toContinuousPointSet", @@ -37,26 +56,17 @@ let registry = [ FnDefinition.make( ~name="toContinuousPointSet", ~inputs=[FRTypeArray(FRTypeRecord([("x", FRTypeNumeric), ("y", FRTypeNumeric)]))], - ~run=(inputs, _) => { - let array = inputs->E.A.unsafe_get(0)->Prepare.ToValueArray.Array.openA - let xyCoords = - array->E.R.bind(xyCoords => - xyCoords - ->E.A2.fmap(xyCoord => - [xyCoord] - ->Prepare.ToValueArray.Record.twoArgs - ->E.R.bind(Prepare.ToValueTuple.twoNumbers) - ) - ->E.A.R.firstErrorOrOpen - ) - let expressionValue = - xyCoords - ->E.R.bind(r => r->XYShape.T.makeFromZipped->E.R2.errMap(XYShape.Error.toString)) - ->E.R2.fmap(r => ReducerInterface_ExpressionValue.EvDistribution( - PointSet(Continuous(Continuous.make(r))), - )) - expressionValue - }, + ~run=(inputs, _) => inputsTodist(inputs, r => Continuous(Continuous.make(r))), + ), + ], + ), + Function.make( + ~name="toDiscretePointSet", + ~definitions=[ + FnDefinition.make( + ~name="toDiscretePointSet", + ~inputs=[FRTypeArray(FRTypeRecord([("x", FRTypeNumeric), ("y", FRTypeNumeric)]))], + ~run=(inputs, _) => inputsTodist(inputs, r => Discrete(Discrete.make(r))), ), ], ), From ba34c1abf1d41870f990d9ee4f2b7f369f9e042a Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Fri, 27 May 2022 14:09:17 -0400 Subject: [PATCH 262/340] Ran formatter --- .../rescript/FunctionRegistry/FunctionRegistry_Helpers.res | 7 ++----- .../rescript/FunctionRegistry/FunctionRegistry_Library.res | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res index ccc02f79..7a216f2d 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Helpers.res @@ -66,15 +66,12 @@ module Prepare = { } module ToArrayRecordPairs = { - let twoArgs = (input: t): result<(array), err> => { + let twoArgs = (input: t): result, err> => { let array = input->ToValueArray.Array.openA let pairs = array->E.R.bind(pairs => pairs - ->E.A2.fmap(xyCoord => - [xyCoord] - ->ToValueArray.Record.twoArgs - ) + ->E.A2.fmap(xyCoord => [xyCoord]->ToValueArray.Record.twoArgs) ->E.A.R.firstErrorOrOpen ) pairs diff --git a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res index a40d8678..6230f828 100644 --- a/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res +++ b/packages/squiggle-lang/src/rescript/FunctionRegistry/FunctionRegistry_Library.res @@ -43,9 +43,7 @@ let inputsTodist = (inputs: array, makeDist) => { let expressionValue = xyCoords ->E.R.bind(r => r->XYShape.T.makeFromZipped->E.R2.errMap(XYShape.Error.toString)) - ->E.R2.fmap(r => ReducerInterface_ExpressionValue.EvDistribution( - PointSet(makeDist(r)), - )) + ->E.R2.fmap(r => ReducerInterface_ExpressionValue.EvDistribution(PointSet(makeDist(r)))) expressionValue } From ce5f12360adf4534c4eb034b8961daf5291d311c Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Sat, 28 May 2022 15:52:35 +0200 Subject: [PATCH 263/340] fixed #597 --- .../Reducer_Peggy_ToExpression_test.res | 23 +++++++++++++++++++ .../Reducer_Dispatch_BuiltInMacros.res | 10 ++++++-- .../Reducer_ExpressionWithContext.res | 14 ++++++++--- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res index 81bafd97..6b56b1ba 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res @@ -148,6 +148,29 @@ describe("Peggy to Expression", () => { ~v="0", (), ) // nested ternary + describe("ternary bindings", () => { + testToExpression( + // expression binding + "f(a) = a > 5 ? 1 : 0; f(6)", + "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [a] (:$$_block_$$ (:$$_ternary_$$ (:larger :a 5) 1 0)))) (:f 6))", + ~v="1", + (), + ) + testToExpression( + // when true binding + "f(a) = a > 5 ? a : 0; f(6)", + "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [a] (:$$_block_$$ (:$$_ternary_$$ (:larger :a 5) :a 0)))) (:f 6))", + ~v="6", + (), + ) + testToExpression( + // when false binding + "f(a) = a < 5 ? 1 : a; f(6)", + "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [a] (:$$_block_$$ (:$$_ternary_$$ (:smaller :a 5) 1 :a)))) (:f 6))", + ~v="6", + (), + ) + }) }) describe("if then else", () => { diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res index 1fba533f..8bd07157 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros.res @@ -144,8 +144,14 @@ let dispatchMacroCall = ( let rCondition = reduceExpression(blockCondition, bindings, environment) rCondition->Result.flatMap(conditionValue => switch conditionValue { - | ExpressionValue.EvBool(false) => ExpressionWithContext.noContext(ifFalse)->Ok - | ExpressionValue.EvBool(true) => ExpressionWithContext.noContext(ifTrue)->Ok + | ExpressionValue.EvBool(false) => { + let ifFalseBlock = eBlock(list{ifFalse}) + ExpressionWithContext.withContext(ifFalseBlock, bindings)->Ok + } + | ExpressionValue.EvBool(true) => { + let ifTrueBlock = eBlock(list{ifTrue}) + ExpressionWithContext.withContext(ifTrueBlock, bindings)->Ok + } | _ => REExpectedType("Boolean")->Error } ) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_ExpressionWithContext.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_ExpressionWithContext.res index dacd2462..32054091 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_ExpressionWithContext.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_ExpressionWithContext.res @@ -22,11 +22,19 @@ let callReducer = ( bindings: bindings, environment: environment, reducer: reducerFn, -): result => +): result => { switch expressionWithContext { - | ExpressionNoContext(expr) => reducer(expr, bindings, environment) - | ExpressionWithContext(expr, context) => reducer(expr, context, environment) + | ExpressionNoContext( + expr, + ) => // Js.log(`callReducer: bindings ${Bindings.toString(bindings)} expr ${ExpressionT.toString(expr)}`) + reducer(expr, bindings, environment) + | ExpressionWithContext( + expr, + context, + ) => // Js.log(`callReducer: context ${Bindings.toString(context)} expr ${ExpressionT.toString(expr)}`) + reducer(expr, context, environment) } +} let withContext = (expression, context) => ExpressionWithContext(expression, context) let noContext = expression => ExpressionNoContext(expression) From 217a783d0aff1ada9a38bb603e6cceee4c2a4872 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Sat, 28 May 2022 16:02:16 +0200 Subject: [PATCH 264/340] format --- .../Reducer_ExpressionWithContext.res | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_ExpressionWithContext.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_ExpressionWithContext.res index 32054091..372b07ad 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_ExpressionWithContext.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_ExpressionWithContext.res @@ -24,14 +24,11 @@ let callReducer = ( reducer: reducerFn, ): result => { switch expressionWithContext { - | ExpressionNoContext( - expr, - ) => // Js.log(`callReducer: bindings ${Bindings.toString(bindings)} expr ${ExpressionT.toString(expr)}`) + | ExpressionNoContext(expr) => + // Js.log(`callReducer: bindings ${Bindings.toString(bindings)} expr ${ExpressionT.toString(expr)}`) reducer(expr, bindings, environment) - | ExpressionWithContext( - expr, - context, - ) => // Js.log(`callReducer: context ${Bindings.toString(context)} expr ${ExpressionT.toString(expr)}`) + | ExpressionWithContext(expr, context) => + // Js.log(`callReducer: context ${Bindings.toString(context)} expr ${ExpressionT.toString(expr)}`) reducer(expr, context, environment) } } From ac3fa859c076bc7f78f5e52fc741f673f80db1c8 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Sun, 29 May 2022 17:00:16 +0200 Subject: [PATCH 265/340] Replace $$_block__$$ with {} More redable language tests --- .../Reducer_Dispatch_BuiltInMacros_test.res | 6 +- .../Reducer_Peggy_ToExpression_test.res | 100 +++++++++--------- .../Reducer/Reducer_externalBindings_test.res | 2 +- .../Reducer_functionAssignment_test.res | 4 +- .../Reducer/Reducer_functionTricks_test.res | 2 +- .../Reducer/Reducer_ternaryOperator_test.res | 2 +- .../ReducerInterface_Distribution_test.res | 20 ++-- .../Reducer_Expression_T.res | 5 + 8 files changed, 73 insertions(+), 68 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res index f1acfd3a..e5450ec8 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res @@ -91,14 +91,14 @@ describe("block", () => { testMacro( [], eBlock(list{eBlock(list{exampleExpression})}), - "Ok((:$$_bindExpression_$$ (:$$_block_$$ 1)))", + "Ok((:$$_bindExpression_$$ {1}))", ) testMacroEval([], eBlock(list{eBlock(list{exampleExpression})}), "Ok(1)") // Block assigned to a variable testMacro( [], eBlock(list{eLetStatement("z", eBlock(list{eBlock(list{exampleExpressionY})}))}), - "Ok((:$$_bindExpression_$$ (:$_let_$ :z (:$$_block_$$ (:$$_block_$$ :y)))))", + "Ok((:$$_bindExpression_$$ (:$_let_$ :z {{:y}})))", ) testMacroEval( [], @@ -116,7 +116,7 @@ describe("block", () => { eSymbol("y"), }), }), - "Ok((:$$_bindExpression_$$ (:$$_block_$$ (:$_let_$ :y (:add :x 1)) :y)))", + "Ok((:$$_bindExpression_$$ {(:$_let_$ :y (:add :x 1)); :y}))", ) testMacroEval( [("x", EvNumber(1.))], diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res index 6b56b1ba..63ab2064 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res @@ -40,66 +40,66 @@ module MyOnly = { describe("Peggy to Expression", () => { describe("literals operators parenthesis", () => { // Note that there is always an outer block. Otherwise, external bindings are ignrored at the first statement - testToExpression("1", "(:$$_block_$$ 1)", ~v="1", ()) - testToExpression("'hello'", "(:$$_block_$$ 'hello')", ~v="'hello'", ()) - testToExpression("true", "(:$$_block_$$ true)", ~v="true", ()) - testToExpression("1+2", "(:$$_block_$$ (:add 1 2))", ~v="3", ()) - testToExpression("add(1,2)", "(:$$_block_$$ (:add 1 2))", ~v="3", ()) - testToExpression("(1)", "(:$$_block_$$ 1)", ()) - testToExpression("(1+2)", "(:$$_block_$$ (:add 1 2))", ()) + testToExpression("1", "{1}", ~v="1", ()) + testToExpression("'hello'", "{'hello'}", ~v="'hello'", ()) + testToExpression("true", "{true}", ~v="true", ()) + testToExpression("1+2", "{(:add 1 2)}", ~v="3", ()) + testToExpression("add(1,2)", "{(:add 1 2)}", ~v="3", ()) + testToExpression("(1)", "{1}", ()) + testToExpression("(1+2)", "{(:add 1 2)}", ()) }) describe("unary", () => { - testToExpression("-1", "(:$$_block_$$ (:unaryMinus 1))", ~v="-1", ()) - testToExpression("!true", "(:$$_block_$$ (:not true))", ~v="false", ()) - testToExpression("1 + -1", "(:$$_block_$$ (:add 1 (:unaryMinus 1)))", ~v="0", ()) - testToExpression("-a[0]", "(:$$_block_$$ (:unaryMinus (:$_atIndex_$ :a 0)))", ()) + testToExpression("-1", "{(:unaryMinus 1)}", ~v="-1", ()) + testToExpression("!true", "{(:not true)}", ~v="false", ()) + testToExpression("1 + -1", "{(:add 1 (:unaryMinus 1))}", ~v="0", ()) + testToExpression("-a[0]", "{(:unaryMinus (:$_atIndex_$ :a 0))}", ()) }) describe("multi-line", () => { - testToExpression("x=1; 2", "(:$$_block_$$ (:$_let_$ :x (:$$_block_$$ 1)) 2)", ~v="2", ()) + testToExpression("x=1; 2", "{(:$_let_$ :x {1}); 2}", ~v="2", ()) testToExpression( "x=1; y=2", - "(:$$_block_$$ (:$_let_$ :x (:$$_block_$$ 1)) (:$_let_$ :y (:$$_block_$$ 2)))", + "{(:$_let_$ :x {1}); (:$_let_$ :y {2})}", ~v="{x: 1,y: 2}", (), ) }) describe("variables", () => { - testToExpression("x = 1", "(:$$_block_$$ (:$_let_$ :x (:$$_block_$$ 1)))", ~v="{x: 1}", ()) - testToExpression("x", "(:$$_block_$$ :x)", ~v=":x", ()) //TODO: value should return error - testToExpression("x = 1; x", "(:$$_block_$$ (:$_let_$ :x (:$$_block_$$ 1)) :x)", ~v="1", ()) + testToExpression("x = 1", "{(:$_let_$ :x {1})}", ~v="{x: 1}", ()) + testToExpression("x", "{:x}", ~v=":x", ()) //TODO: value should return error + testToExpression("x = 1; x", "{(:$_let_$ :x {1}); :x}", ~v="1", ()) }) describe("functions", () => { testToExpression( "identity(x) = x", - "(:$$_block_$$ (:$_let_$ :identity (:$$_lambda_$$ [x] (:$$_block_$$ :x))))", + "{(:$_let_$ :identity (:$$_lambda_$$ [x] {:x}))}", ~v="{identity: lambda(x=>internal code)}", (), ) // Function definitions become lambda assignments - testToExpression("identity(x)", "(:$$_block_$$ (:identity :x))", ()) // Note value returns error properly + testToExpression("identity(x)", "{(:identity :x)}", ()) // Note value returns error properly testToExpression( "f(x) = x> 2 ? 0 : 1; f(3)", - "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ (:$$_ternary_$$ (:larger :x 2) 0 1)))) (:f 3))", + "{(:$_let_$ :f (:$$_lambda_$$ [x] {(:$$_ternary_$$ (:larger :x 2) 0 1)})); (:f 3)}", ~v="0", (), ) }) describe("arrays", () => { - testToExpression("[]", "(:$$_block_$$ (:$_constructArray_$ ()))", ~v="[]", ()) - testToExpression("[0, 1, 2]", "(:$$_block_$$ (:$_constructArray_$ (0 1 2)))", ~v="[0,1,2]", ()) + testToExpression("[]", "{(:$_constructArray_$ ())}", ~v="[]", ()) + testToExpression("[0, 1, 2]", "{(:$_constructArray_$ (0 1 2))}", ~v="[0,1,2]", ()) testToExpression( "['hello', 'world']", - "(:$$_block_$$ (:$_constructArray_$ ('hello' 'world')))", + "{(:$_constructArray_$ ('hello' 'world'))}", ~v="['hello','world']", (), ) testToExpression( "([0,1,2])[1]", - "(:$$_block_$$ (:$_atIndex_$ (:$_constructArray_$ (0 1 2)) 1))", + "{(:$_atIndex_$ (:$_constructArray_$ (0 1 2)) 1)}", ~v="1", (), ) @@ -108,43 +108,43 @@ describe("Peggy to Expression", () => { describe("records", () => { testToExpression( "{a: 1, b: 2}", - "(:$$_block_$$ (:$_constructRecord_$ (('a' 1) ('b' 2))))", + "{(:$_constructRecord_$ (('a' 1) ('b' 2)))}", ~v="{a: 1,b: 2}", (), ) testToExpression( "{1+0: 1, 2+0: 2}", - "(:$$_block_$$ (:$_constructRecord_$ (((:add 1 0) 1) ((:add 2 0) 2))))", + "{(:$_constructRecord_$ (((:add 1 0) 1) ((:add 2 0) 2)))}", (), ) // key can be any expression - testToExpression("record.property", "(:$$_block_$$ (:$_atIndex_$ :record 'property'))", ()) + testToExpression("record.property", "{(:$_atIndex_$ :record 'property')}", ()) testToExpression( "record={property: 1}; record.property", - "(:$$_block_$$ (:$_let_$ :record (:$$_block_$$ (:$_constructRecord_$ (('property' 1))))) (:$_atIndex_$ :record 'property'))", + "{(:$_let_$ :record {(:$_constructRecord_$ (('property' 1)))}); (:$_atIndex_$ :record 'property')}", ~v="1", (), ) }) describe("comments", () => { - testToExpression("1 # This is a line comment", "(:$$_block_$$ 1)", ~v="1", ()) - testToExpression("1 // This is a line comment", "(:$$_block_$$ 1)", ~v="1", ()) - testToExpression("1 /* This is a multi line comment */", "(:$$_block_$$ 1)", ~v="1", ()) - testToExpression("/* This is a multi line comment */ 1", "(:$$_block_$$ 1)", ~v="1", ()) + testToExpression("1 # This is a line comment", "{1}", ~v="1", ()) + testToExpression("1 // This is a line comment", "{1}", ~v="1", ()) + testToExpression("1 /* This is a multi line comment */", "{1}", ~v="1", ()) + testToExpression("/* This is a multi line comment */ 1", "{1}", ~v="1", ()) }) describe("ternary operator", () => { - testToExpression("true ? 1 : 0", "(:$$_block_$$ (:$$_ternary_$$ true 1 0))", ~v="1", ()) - testToExpression("false ? 1 : 0", "(:$$_block_$$ (:$$_ternary_$$ false 1 0))", ~v="0", ()) + testToExpression("true ? 1 : 0", "{(:$$_ternary_$$ true 1 0)}", ~v="1", ()) + testToExpression("false ? 1 : 0", "{(:$$_ternary_$$ false 1 0)}", ~v="0", ()) testToExpression( "true ? 1 : false ? 2 : 0", - "(:$$_block_$$ (:$$_ternary_$$ true 1 (:$$_ternary_$$ false 2 0)))", + "{(:$$_ternary_$$ true 1 (:$$_ternary_$$ false 2 0))}", ~v="1", (), ) // nested ternary testToExpression( "false ? 1 : false ? 2 : 0", - "(:$$_block_$$ (:$$_ternary_$$ false 1 (:$$_ternary_$$ false 2 0)))", + "{(:$$_ternary_$$ false 1 (:$$_ternary_$$ false 2 0))}", ~v="0", (), ) // nested ternary @@ -152,21 +152,21 @@ describe("Peggy to Expression", () => { testToExpression( // expression binding "f(a) = a > 5 ? 1 : 0; f(6)", - "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [a] (:$$_block_$$ (:$$_ternary_$$ (:larger :a 5) 1 0)))) (:f 6))", + "{(:$_let_$ :f (:$$_lambda_$$ [a] {(:$$_ternary_$$ (:larger :a 5) 1 0)})); (:f 6)}", ~v="1", (), ) testToExpression( // when true binding "f(a) = a > 5 ? a : 0; f(6)", - "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [a] (:$$_block_$$ (:$$_ternary_$$ (:larger :a 5) :a 0)))) (:f 6))", + "{(:$_let_$ :f (:$$_lambda_$$ [a] {(:$$_ternary_$$ (:larger :a 5) :a 0)})); (:f 6)}", ~v="6", (), ) testToExpression( // when false binding "f(a) = a < 5 ? 1 : a; f(6)", - "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [a] (:$$_block_$$ (:$$_ternary_$$ (:smaller :a 5) 1 :a)))) (:f 6))", + "{(:$_let_$ :f (:$$_lambda_$$ [a] {(:$$_ternary_$$ (:smaller :a 5) 1 :a)})); (:f 6)}", ~v="6", (), ) @@ -176,29 +176,29 @@ describe("Peggy to Expression", () => { describe("if then else", () => { testToExpression( "if true then 2 else 3", - "(:$$_block_$$ (:$$_ternary_$$ true (:$$_block_$$ 2) (:$$_block_$$ 3)))", + "{(:$$_ternary_$$ true {2} {3})}", (), ) testToExpression( "if true then {2} else {3}", - "(:$$_block_$$ (:$$_ternary_$$ true (:$$_block_$$ 2) (:$$_block_$$ 3)))", + "{(:$$_ternary_$$ true {2} {3})}", (), ) testToExpression( "if false then {2} else if false then {4} else {5}", - "(:$$_block_$$ (:$$_ternary_$$ false (:$$_block_$$ 2) (:$$_ternary_$$ false (:$$_block_$$ 4) (:$$_block_$$ 5))))", + "{(:$$_ternary_$$ false {2} (:$$_ternary_$$ false {4} {5}))}", (), ) //nested if }) describe("pipe", () => { - testToExpression("1 -> add(2)", "(:$$_block_$$ (:add 1 2))", ~v="3", ()) - testToExpression("-1 -> add(2)", "(:$$_block_$$ (:add (:unaryMinus 1) 2))", ~v="1", ()) // note that unary has higher priority naturally - testToExpression("1 -> add(2) * 3", "(:$$_block_$$ (:multiply (:add 1 2) 3))", ~v="9", ()) + testToExpression("1 -> add(2)", "{(:add 1 2)}", ~v="3", ()) + testToExpression("-1 -> add(2)", "{(:add (:unaryMinus 1) 2)}", ~v="1", ()) // note that unary has higher priority naturally + testToExpression("1 -> add(2) * 3", "{(:multiply (:add 1 2) 3)}", ~v="9", ()) }) describe("elixir pipe", () => { - testToExpression("1 |> add(2)", "(:$$_block_$$ (:add 1 2))", ~v="3", ()) + testToExpression("1 |> add(2)", "{(:add 1 2)}", ~v="3", ()) }) // see testParse for priorities of to and credibleIntervalToDistribution @@ -208,7 +208,7 @@ describe("Peggy to Expression", () => { // Like lambdas they have a local scope. testToExpression( "y=99; x={y=1; y}", - "(:$$_block_$$ (:$_let_$ :y (:$$_block_$$ 99)) (:$_let_$ :x (:$$_block_$$ (:$_let_$ :y (:$$_block_$$ 1)) :y)))", + "{(:$_let_$ :y {99}); (:$_let_$ :x {(:$_let_$ :y {1}); :y})}", ~v="{x: 1,y: 99}", (), ) @@ -217,25 +217,25 @@ describe("Peggy to Expression", () => { describe("lambda", () => { testToExpression( "{|x| x}", - "(:$$_block_$$ (:$$_lambda_$$ [x] (:$$_block_$$ :x)))", + "{(:$$_lambda_$$ [x] {:x})}", ~v="lambda(x=>internal code)", (), ) testToExpression( "f={|x| x}", - "(:$$_block_$$ (:$_let_$ :f (:$$_block_$$ (:$$_lambda_$$ [x] (:$$_block_$$ :x)))))", + "{(:$_let_$ :f {(:$$_lambda_$$ [x] {:x})})}", ~v="{f: lambda(x=>internal code)}", (), ) testToExpression( "f(x)=x", - "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ :x))))", + "{(:$_let_$ :f (:$$_lambda_$$ [x] {:x}))}", ~v="{f: lambda(x=>internal code)}", (), ) // Function definitions are lambda assignments testToExpression( "f(x)=x ? 1 : 0", - "(:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ (:$$_ternary_$$ :x 1 0)))))", + "{(:$_let_$ :f (:$$_lambda_$$ [x] {(:$$_ternary_$$ :x 1 0)}))}", ~v="{f: lambda(x=>internal code)}", (), ) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res index c47879b3..1fcd3fbf 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_externalBindings_test.res @@ -5,7 +5,7 @@ open Reducer_TestHelpers describe("Eval with Bindings", () => { testEvalBindingsToBe("x", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(1)") testEvalBindingsToBe("x+1", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(2)") - testParseToBe("y = x+1; y", "Ok((:$$_block_$$ (:$_let_$ :y (:$$_block_$$ (:add :x 1))) :y))") + testParseToBe("y = x+1; y", "Ok({(:$_let_$ :y {(:add :x 1)}); :y})") testEvalBindingsToBe("y = x+1; y", list{("x", ExpressionValue.EvNumber(1.))}, "Ok(2)") testEvalBindingsToBe("y = x+1", list{("x", ExpressionValue.EvNumber(1.))}, "Ok({x: 1,y: 2})") }) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res index 0f280265..b4c367a0 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res @@ -2,10 +2,10 @@ open Jest open Reducer_TestHelpers describe("Parse function assignment", () => { - testParseToBe("f(x)=x", "Ok((:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ :x)))))") + testParseToBe("f(x)=x", "Ok({(:$_let_$ :f (:$$_lambda_$$ [x] {:x}))})") testParseToBe( "f(x)=2*x", - "Ok((:$$_block_$$ (:$_let_$ :f (:$$_lambda_$$ [x] (:$$_block_$$ (:multiply 2 :x))))))", + "Ok({(:$_let_$ :f (:$$_lambda_$$ [x] {(:multiply 2 :x)}))})", ) //MathJs does not allow blocks in function definitions }) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res index fd7485eb..ca6f0399 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionTricks_test.res @@ -51,7 +51,7 @@ describe("call and bindings", () => { ) testParseToBe( "f=99; g(x)=f; g(2)", - "Ok((:$$_block_$$ (:$_let_$ :f (:$$_block_$$ 99)) (:$_let_$ :g (:$$_lambda_$$ [x] (:$$_block_$$ :f))) (:g 2)))", + "Ok({(:$_let_$ :f {99}); (:$_let_$ :g (:$$_lambda_$$ [x] {:f})); (:g 2)})", ) testEvalToBe("f=99; g(x)=f; g(2)", "Ok(99)") testEvalToBe("f(x)=x; g(x)=f(x); g(2)", "Ok(2)") diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_ternaryOperator_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_ternaryOperator_test.res index 57b44156..25353e89 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_ternaryOperator_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_ternaryOperator_test.res @@ -2,7 +2,7 @@ open Jest open Reducer_TestHelpers describe("Parse ternary operator", () => { - testParseToBe("true ? 'YES' : 'NO'", "Ok((:$$_block_$$ (:$$_ternary_$$ true 'YES' 'NO')))") + testParseToBe("true ? 'YES' : 'NO'", "Ok({(:$$_ternary_$$ true 'YES' 'NO')})") }) describe("Evaluate ternary operator", () => { diff --git a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res index 4e2f9aaa..b8291698 100644 --- a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res +++ b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res @@ -123,13 +123,13 @@ describe("eval on distribution functions", () => { describe("parse on distribution functions", () => { describe("power", () => { - testParse("normal(5,2) ^ normal(5,1)", "Ok((:$$_block_$$ (:pow (:normal 5 2) (:normal 5 1))))") - testParse("3 ^ normal(5,1)", "Ok((:$$_block_$$ (:pow 3 (:normal 5 1))))") - testParse("normal(5,2) ^ 3", "Ok((:$$_block_$$ (:pow (:normal 5 2) 3)))") + testParse("normal(5,2) ^ normal(5,1)", "Ok({(:pow (:normal 5 2) (:normal 5 1))})") + testParse("3 ^ normal(5,1)", "Ok({(:pow 3 (:normal 5 1))})") + testParse("normal(5,2) ^ 3", "Ok({(:pow (:normal 5 2) 3)})") }) describe("subtraction", () => { - testParse("10 - normal(5,1)", "Ok((:$$_block_$$ (:subtract 10 (:normal 5 1))))") - testParse("normal(5,1) - 10", "Ok((:$$_block_$$ (:subtract (:normal 5 1) 10)))") + testParse("10 - normal(5,1)", "Ok({(:subtract 10 (:normal 5 1))})") + testParse("normal(5,1) - 10", "Ok({(:subtract (:normal 5 1) 10)})") }) describe("pointwise arithmetic expressions", () => { testParse(~skip=true, "normal(5,2) .+ normal(5,1)", "Ok((:dotAdd (:normal 5 2) (:normal 5 1)))") @@ -137,23 +137,23 @@ describe("parse on distribution functions", () => { ~skip=true, "normal(5,2) .- normal(5,1)", "Ok((:$$_block_$$ (:dotSubtract (:normal 5 2) (:normal 5 1))))", - // TODO: !!! returns "Ok((:$$_block_$$ (:dotPow (:normal 5 2) (:normal 5 1))))" + // TODO: !!! returns "Ok({(:dotPow (:normal 5 2) (:normal 5 1))})" ) testParse( "normal(5,2) .* normal(5,1)", - "Ok((:$$_block_$$ (:dotMultiply (:normal 5 2) (:normal 5 1))))", + "Ok({(:dotMultiply (:normal 5 2) (:normal 5 1))})", ) testParse( "normal(5,2) ./ normal(5,1)", - "Ok((:$$_block_$$ (:dotDivide (:normal 5 2) (:normal 5 1))))", + "Ok({(:dotDivide (:normal 5 2) (:normal 5 1))})", ) testParse( "normal(5,2) .^ normal(5,1)", - "Ok((:$$_block_$$ (:dotPow (:normal 5 2) (:normal 5 1))))", + "Ok({(:dotPow (:normal 5 2) (:normal 5 1))})", ) }) describe("equality", () => { - testParse("5 == normal(5,2)", "Ok((:$$_block_$$ (:equal 5 (:normal 5 2))))") + testParse("5 == normal(5,2)", "Ok({(:equal 5 (:normal 5 2))})") }) describe("pointwise adding two normals", () => { testParse(~skip=true, "normal(5,2) .+ normal(5,1)", "Ok((:dotAdd (:normal 5 2) (:normal 5 1)))") diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_T.res b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_T.res index 65ba4c96..512e08ea 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_T.res +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Expression/Reducer_Expression_T.res @@ -28,6 +28,11 @@ type reducerFn = ( */ let rec toString = expression => switch expression { + | EList(list{EValue(EvCall("$$_block_$$")), ...statements}) => + `{${Belt.List.map(statements, aValue => toString(aValue)) + ->Extra.List.interperse("; ") + ->Belt.List.toArray + ->Js.String.concatMany("")}}` | EList(aList) => `(${Belt.List.map(aList, aValue => toString(aValue)) ->Extra.List.interperse(" ") From 00d7304b4b409950048a85d671761d6d53145980 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Sun, 29 May 2022 17:56:37 +0200 Subject: [PATCH 266/340] format --- .../Reducer_Dispatch_BuiltInMacros_test.res | 6 +--- .../Reducer_Peggy_ToExpression_test.res | 33 +++---------------- .../Reducer_functionAssignment_test.res | 5 +-- .../ReducerInterface_Distribution_test.res | 15 ++------- 4 files changed, 10 insertions(+), 49 deletions(-) diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res index e5450ec8..4b506a15 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Dispatch/Reducer_Dispatch_BuiltInMacros_test.res @@ -88,11 +88,7 @@ describe("block", () => { ) testMacroEval([], eBlock(list{exampleStatementY, exampleStatementZ}), "Ok({y: 1,z: 1})") // Block inside a block - testMacro( - [], - eBlock(list{eBlock(list{exampleExpression})}), - "Ok((:$$_bindExpression_$$ {1}))", - ) + testMacro([], eBlock(list{eBlock(list{exampleExpression})}), "Ok((:$$_bindExpression_$$ {1}))") testMacroEval([], eBlock(list{eBlock(list{exampleExpression})}), "Ok(1)") // Block assigned to a variable testMacro( diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res index 63ab2064..6091e6fe 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_Peggy/Reducer_Peggy_ToExpression_test.res @@ -58,12 +58,7 @@ describe("Peggy to Expression", () => { describe("multi-line", () => { testToExpression("x=1; 2", "{(:$_let_$ :x {1}); 2}", ~v="2", ()) - testToExpression( - "x=1; y=2", - "{(:$_let_$ :x {1}); (:$_let_$ :y {2})}", - ~v="{x: 1,y: 2}", - (), - ) + testToExpression("x=1; y=2", "{(:$_let_$ :x {1}); (:$_let_$ :y {2})}", ~v="{x: 1,y: 2}", ()) }) describe("variables", () => { @@ -97,12 +92,7 @@ describe("Peggy to Expression", () => { ~v="['hello','world']", (), ) - testToExpression( - "([0,1,2])[1]", - "{(:$_atIndex_$ (:$_constructArray_$ (0 1 2)) 1)}", - ~v="1", - (), - ) + testToExpression("([0,1,2])[1]", "{(:$_atIndex_$ (:$_constructArray_$ (0 1 2)) 1)}", ~v="1", ()) }) describe("records", () => { @@ -174,16 +164,8 @@ describe("Peggy to Expression", () => { }) describe("if then else", () => { - testToExpression( - "if true then 2 else 3", - "{(:$$_ternary_$$ true {2} {3})}", - (), - ) - testToExpression( - "if true then {2} else {3}", - "{(:$$_ternary_$$ true {2} {3})}", - (), - ) + testToExpression("if true then 2 else 3", "{(:$$_ternary_$$ true {2} {3})}", ()) + testToExpression("if true then {2} else {3}", "{(:$$_ternary_$$ true {2} {3})}", ()) testToExpression( "if false then {2} else if false then {4} else {5}", "{(:$$_ternary_$$ false {2} (:$$_ternary_$$ false {4} {5}))}", @@ -215,12 +197,7 @@ describe("Peggy to Expression", () => { }) describe("lambda", () => { - testToExpression( - "{|x| x}", - "{(:$$_lambda_$$ [x] {:x})}", - ~v="lambda(x=>internal code)", - (), - ) + testToExpression("{|x| x}", "{(:$$_lambda_$$ [x] {:x})}", ~v="lambda(x=>internal code)", ()) testToExpression( "f={|x| x}", "{(:$_let_$ :f {(:$$_lambda_$$ [x] {:x})})}", diff --git a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res index b4c367a0..30725cfe 100644 --- a/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res +++ b/packages/squiggle-lang/__tests__/Reducer/Reducer_functionAssignment_test.res @@ -3,10 +3,7 @@ open Reducer_TestHelpers describe("Parse function assignment", () => { testParseToBe("f(x)=x", "Ok({(:$_let_$ :f (:$$_lambda_$$ [x] {:x}))})") - testParseToBe( - "f(x)=2*x", - "Ok({(:$_let_$ :f (:$$_lambda_$$ [x] {(:multiply 2 :x)}))})", - ) + testParseToBe("f(x)=2*x", "Ok({(:$_let_$ :f (:$$_lambda_$$ [x] {(:multiply 2 :x)}))})") //MathJs does not allow blocks in function definitions }) diff --git a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res index b8291698..a2fa37df 100644 --- a/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res +++ b/packages/squiggle-lang/__tests__/ReducerInterface/ReducerInterface_Distribution_test.res @@ -139,18 +139,9 @@ describe("parse on distribution functions", () => { "Ok((:$$_block_$$ (:dotSubtract (:normal 5 2) (:normal 5 1))))", // TODO: !!! returns "Ok({(:dotPow (:normal 5 2) (:normal 5 1))})" ) - testParse( - "normal(5,2) .* normal(5,1)", - "Ok({(:dotMultiply (:normal 5 2) (:normal 5 1))})", - ) - testParse( - "normal(5,2) ./ normal(5,1)", - "Ok({(:dotDivide (:normal 5 2) (:normal 5 1))})", - ) - testParse( - "normal(5,2) .^ normal(5,1)", - "Ok({(:dotPow (:normal 5 2) (:normal 5 1))})", - ) + testParse("normal(5,2) .* normal(5,1)", "Ok({(:dotMultiply (:normal 5 2) (:normal 5 1))})") + testParse("normal(5,2) ./ normal(5,1)", "Ok({(:dotDivide (:normal 5 2) (:normal 5 1))})") + testParse("normal(5,2) .^ normal(5,1)", "Ok({(:dotPow (:normal 5 2) (:normal 5 1))})") }) describe("equality", () => { testParse("5 == normal(5,2)", "Ok({(:equal 5 (:normal 5 2))})") From ed6eb541657a605e332d6495316e7c76f4a31f1d Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Mon, 30 May 2022 11:30:10 +1000 Subject: [PATCH 267/340] Move from styled-components to tailwind --- packages/components/.storybook/preview.js | 1 + packages/components/package.json | 2 +- .../src/components/DistributionChart.tsx | 76 +++++---------- .../components/src/components/ErrorBox.tsx | 12 +-- .../src/components/SquiggleChart.tsx | 42 ++------- .../src/components/SquiggleEditor.tsx | 15 +-- .../src/components/SquigglePlayground.tsx | 93 +++++-------------- .../stories/SquigglePlayground.stories.mdx | 1 - packages/components/src/tailwind.css | 3 + packages/components/tailwind.config.js | 7 ++ yarn.lock | 89 ++---------------- 11 files changed, 78 insertions(+), 263 deletions(-) create mode 100644 packages/components/src/tailwind.css create mode 100644 packages/components/tailwind.config.js diff --git a/packages/components/.storybook/preview.js b/packages/components/.storybook/preview.js index f089c7f9..afd31ccf 100644 --- a/packages/components/.storybook/preview.js +++ b/packages/components/.storybook/preview.js @@ -1,3 +1,4 @@ +import "../src/tailwind.css"; export const parameters = { actions: { argTypesRegex: "^on[A-Z].*" }, controls: { diff --git a/packages/components/package.json b/packages/components/package.json index 3b594bc5..49fd9cda 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -13,7 +13,6 @@ "react-hook-form": "^7.31.2", "react-use": "^17.4.0", "react-vega": "^7.5.1", - "styled-components": "^5.3.5", "vega": "^5.22.1", "vega-embed": "^6.20.6", "vega-lite": "^5.2.0", @@ -42,6 +41,7 @@ "cross-env": "^7.0.3", "react-scripts": "^5.0.1", "style-loader": "^3.3.1", + "tailwindcss": "^3.0.24", "ts-loader": "^9.3.0", "tsconfig-paths-webpack-plugin": "^3.5.2", "typescript": "^4.6.3", diff --git a/packages/components/src/components/DistributionChart.tsx b/packages/components/src/components/DistributionChart.tsx index 27dbf4b8..a6f70fa0 100644 --- a/packages/components/src/components/DistributionChart.tsx +++ b/packages/components/src/components/DistributionChart.tsx @@ -16,7 +16,6 @@ import { linearYScale, expYScale, } from "./DistributionVegaScales"; -import styled from "styled-components"; import { NumberShower } from "./NumberShower"; type DistributionChartProps = { @@ -66,7 +65,7 @@ export const DistributionChart: React.FC = ({ } var result = ( - +
= ({ height={height} actions={false} /> - {showSummary && } +
+ {showSummary && } +
{showControls && (
{logCheckbox}
)} - +
); } else { var result = ( @@ -96,12 +97,6 @@ export const DistributionChart: React.FC = ({ return sized; }; -type ChartContainerProps = { width: string }; - -let ChartContainer = styled.div` - width: ${(props) => props.width}; -`; - function buildVegaSpec(isLogX: boolean, isExpY: boolean): VisualizationSpec { return { ...chartSpecification, @@ -120,10 +115,6 @@ interface CheckBoxProps { tooltip?: string; } -const Label = styled.label<{ disabled: boolean }>` - ${(props) => props.disabled && "color: #999;"} -`; - export const CheckBox = ({ label, onChange, @@ -139,7 +130,7 @@ export const CheckBox = ({ onChange={() => onChange(!value)} disabled={disabled} /> - + ); }; @@ -148,34 +139,6 @@ type SummaryTableProps = { distribution: Distribution; }; -const Table = styled.table` - margin-left: auto; - margin-right: auto; - border-collapse: collapse; - text-align: center; - border-style: hidden; -`; - -const TableHead = styled.thead` - border-bottom: 1px solid rgb(141 149 167); -`; - -const TableHeadCell = styled.th` - border-right: 1px solid rgb(141 149 167); - border-left: 1px solid rgb(141 149 167); - padding: 0.3em; -`; - -const TableBody = styled.tbody``; - -const Row = styled.tr``; - -const Cell = styled.td` - padding: 0.3em; - border-right: 1px solid rgb(141 149 167); - border-left: 1px solid rgb(141 149 167); -`; - const SummaryTable: React.FC = ({ distribution, }: SummaryTableProps) => { @@ -201,10 +164,17 @@ const SummaryTable: React.FC = ({ } }; + let TableHeadCell: React.FC<{}> = ({ children }) => ( + {children} + ); + let Cell: React.FC<{}> = ({ children }) => ( + {children} + ); + return ( - - - +
+ + {"Mean"}{"5%"}{"10%"} @@ -213,10 +183,10 @@ const SummaryTable: React.FC = ({ {"75%"} {"90%"} {"95%"} - - - - + + + + {unwrapResult(mean)}{unwrapResult(p5)}{unwrapResult(p10)} @@ -225,8 +195,8 @@ const SummaryTable: React.FC = ({ {unwrapResult(p75)} {unwrapResult(p90)} {unwrapResult(p95)} - - -
+ + + ); }; diff --git a/packages/components/src/components/ErrorBox.tsx b/packages/components/src/components/ErrorBox.tsx index 58e46218..eb34b9d5 100644 --- a/packages/components/src/components/ErrorBox.tsx +++ b/packages/components/src/components/ErrorBox.tsx @@ -1,20 +1,12 @@ import * as React from "react"; -import styled from "styled-components"; - -const ShowError = styled.div` - border: 1px solid #792e2e; - background: #eee2e2; - padding: 0.4em 0.8em; -`; - export const ErrorBox: React.FC<{ heading: string; children: React.ReactNode; }> = ({ heading = "Error", children }) => { return ( - +

{heading}

{children} - +
); }; diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index f33ccb84..08586dcc 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -1,6 +1,5 @@ import * as React from "react"; import _ from "lodash"; -import styled from "styled-components"; import { run, errorValueToString, @@ -11,7 +10,6 @@ import { defaultImports, defaultBindings, defaultEnvironment, - declarationArg, declaration, } from "@quri/squiggle-lang"; import { NumberShower } from "./NumberShower"; @@ -41,24 +39,6 @@ function getChartSettings(x: declaration): FunctionChartSettings { }; } -const variableBox = { - Component: styled.div` - background: white; - border: 1px solid #eee; - border-radius: 2px; - margin-bottom: 0.4em; - `, - Heading: styled.div` - border-bottom: 1px solid #eee; - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0.1em; - `, - Body: styled.div` - padding: 0.4em 0.8em; - `, -}; - interface VariableBoxProps { heading: string; children: React.ReactNode; @@ -72,20 +52,18 @@ export const VariableBox: React.FC = ({ }: VariableBoxProps) => { if (showTypes) { return ( - - +
+

{heading}

- - {children} - +
+
{children}
+
); } else { return
{children}
; } }; -let RecordKeyHeader = styled.h3``; - export interface SquiggleItemProps { /** The input string for squiggle */ expression: squiggleExpression; @@ -192,7 +170,7 @@ const SquiggleItem: React.FC = ({ {Object.entries(expression.value).map(([key, r]) => (
- {key} +

{key}

= ({ @@ -333,5 +305,5 @@ export const SquiggleChart: React.FC = ({ ); } - return {internal}; + return internal; }; diff --git a/packages/components/src/components/SquiggleEditor.tsx b/packages/components/src/components/SquiggleEditor.tsx index a69f6ce2..d207c375 100644 --- a/packages/components/src/components/SquiggleEditor.tsx +++ b/packages/components/src/components/SquiggleEditor.tsx @@ -2,7 +2,6 @@ import * as React from "react"; import * as ReactDOM from "react-dom"; import { SquiggleChart } from "./SquiggleChart"; import { CodeEditor } from "./CodeEditor"; -import styled from "styled-components"; import type { squiggleExpression, environment, @@ -44,12 +43,6 @@ export interface SquiggleEditorProps { showSummary?: boolean; } -const Input = styled.div` - border: 1px solid #ddd; - padding: 0.3em 0.3em; - margin-bottom: 1em; -`; - export let SquiggleEditor: React.FC = ({ initialSquiggleString = "", width, @@ -72,7 +65,7 @@ export let SquiggleEditor: React.FC = ({ }; return (
- +
= ({ showGutter={false} height={20} /> - +
= ({ return (
- +
= ({ showGutter={false} height={20} /> - +
{error !== null ? {error} : <>}
); diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index 921a3282..cf02c96b 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -4,80 +4,35 @@ import ReactDOM from "react-dom"; import { SquiggleChart } from "./SquiggleChart"; import CodeEditor from "./CodeEditor"; import JsonEditor from "./JsonEditor"; -import styled from "styled-components"; import { useForm, useWatch } from "react-hook-form"; import * as yup from "yup"; import { yupResolver } from "@hookform/resolvers/yup"; import { defaultBindings, environment } from "@quri/squiggle-lang"; -interface FieldFloatProps { - label: string; - className?: string; - value: number; - onChange: (value: number) => void; +interface ShowBoxProps { + height: number; + children: React.ReactNode; } -const Input = styled.input``; - -const FormItem = (props: { label: string; children: ReactElement }) => ( -
- - {props.children} +const ShowBox: React.FC = ({ height, children }) => ( +
+ {children}
); -function FieldFloat(Props: FieldFloatProps) { - let [contents, setContents] = useState(Props.value + ""); - return ( - - { - setContents(e.target.value); - let result = parseFloat(contents); - if (_.isFinite(result)) { - Props.onChange(result); - } - }} - /> - - ); -} - -interface ShowBoxProps { - height: number; -} - -const ShowBox = styled.div` - border: 1px solid #eee; - border-radius: 2px; - height: ${(props) => props.height}; -`; - interface TitleProps { readonly maxHeight: number; + children: React.ReactNode; } -const Display = styled.div` - background: #f6f6f6; - border-left: 1px solid #eee; - height: 100vh; - padding: 3px; - overflow-y: auto; - max-height: ${(props) => props.maxHeight}px; -`; - -interface RowProps { - readonly leftPercentage: number; -} - -const Row = styled.div` - display: grid; - grid-template-columns: ${(p) => p.leftPercentage}% ${(p) => - 100 - p.leftPercentage}%; -`; -const Col = styled.div``; +const Display: React.FC = ({ maxHeight, children }) => ( +
+ {children} +
+); interface PlaygroundProps { /** The initial squiggle string to put in the playground */ @@ -158,11 +113,7 @@ let SquigglePlayground: FC = ({ stop: diagramStop, count: diagramCount, }; - const { - register, - formState: { errors }, - control, - } = useForm({ + const { register, control } = useForm({ resolver: yupResolver(schema), defaultValues: { sampleCount: 1000, @@ -194,8 +145,8 @@ let SquigglePlayground: FC = ({ return ( - - +
+
{vars.showSettingsPage ? ( <> @@ -247,8 +198,8 @@ let SquigglePlayground: FC = ({ height={height - 3} /> )} - - +
+
= ({ showSummary={vars.showSummary} /> - - +
+
); }; diff --git a/packages/components/src/stories/SquigglePlayground.stories.mdx b/packages/components/src/stories/SquigglePlayground.stories.mdx index 67bd0367..5e869633 100644 --- a/packages/components/src/stories/SquigglePlayground.stories.mdx +++ b/packages/components/src/stories/SquigglePlayground.stories.mdx @@ -1,6 +1,5 @@ import SquigglePlayground from "../components/SquigglePlayground"; import { Canvas, Meta, Story, Props } from "@storybook/addon-docs"; -import styled from "styled-components"; diff --git a/packages/components/src/tailwind.css b/packages/components/src/tailwind.css new file mode 100644 index 00000000..b5c61c95 --- /dev/null +++ b/packages/components/src/tailwind.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/packages/components/tailwind.config.js b/packages/components/tailwind.config.js new file mode 100644 index 00000000..22a8ca63 --- /dev/null +++ b/packages/components/tailwind.config.js @@ -0,0 +1,7 @@ +module.exports = { + content: ["./src/**/*.{html,tsx,ts,js,jsx}"], + theme: { + extend: {}, + }, + plugins: [], +}; diff --git a/yarn.lock b/yarn.lock index f5044f7d..25217d51 100644 --- a/yarn.lock +++ b/yarn.lock @@ -220,7 +220,7 @@ "@jridgewell/gen-mapping" "^0.1.0" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.16.0", "@babel/helper-annotate-as-pure@^7.16.7": +"@babel/helper-annotate-as-pure@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw== @@ -330,7 +330,7 @@ dependencies: "@babel/types" "^7.17.0" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.16.7": +"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== @@ -1261,7 +1261,7 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.10", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2": +"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.10", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.7.2": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.10.tgz#1ee1a5ac39f4eac844e6cf855b35520e5eb6f8b5" integrity sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw== @@ -1784,28 +1784,6 @@ url-loader "^4.1.1" webpack "^5.72.0" -"@emotion/is-prop-valid@^1.1.0": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95" - integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ== - dependencies: - "@emotion/memoize" "^0.7.4" - -"@emotion/memoize@^0.7.4": - version "0.7.5" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" - integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== - -"@emotion/stylis@^0.8.4": - version "0.8.5" - resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" - integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== - -"@emotion/unitless@^0.7.4": - version "0.7.5" - resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" - integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== - "@eslint/eslintrc@^1.2.3": version "1.2.3" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz#fcaa2bcef39e13d6e9e7f6271f4cc7cae1174886" @@ -5595,22 +5573,6 @@ babel-plugin-react-docgen@^4.1.0, babel-plugin-react-docgen@^4.2.1: lodash "^4.17.15" react-docgen "^5.0.0" -"babel-plugin-styled-components@>= 1.12.0": - version "2.0.7" - resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.7.tgz#c81ef34b713f9da2b7d3f5550df0d1e19e798086" - integrity sha512-i7YhvPgVqRKfoQ66toiZ06jPNA3p6ierpfUuEWxNF+fV27Uv5gxBkf8KZLHUCc1nFA9j6+80pYoIpqCeyW3/bA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-module-imports" "^7.16.0" - babel-plugin-syntax-jsx "^6.18.0" - lodash "^4.17.11" - picomatch "^2.3.0" - -babel-plugin-syntax-jsx@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= - babel-plugin-transform-es2015-modules-commonjs@^6.26.2: version "6.26.2" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" @@ -6234,11 +6196,6 @@ camelcase@^6.2.0, camelcase@^6.2.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -camelize@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" - integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= - caniuse-api@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" @@ -7042,11 +6999,6 @@ css-blank-pseudo@^3.0.3: dependencies: postcss-selector-parser "^6.0.9" -css-color-keywords@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" - integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU= - css-declaration-sorter@^6.2.2: version "6.2.2" resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz#bfd2f6f50002d6a3ae779a87d3a0c5d5b10e0f02" @@ -7169,15 +7121,6 @@ css-select@~1.2.0: domutils "1.5.1" nth-check "~1.0.1" -css-to-react-native@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756" - integrity sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ== - dependencies: - camelize "^1.0.0" - css-color-keywords "^1.0.0" - postcss-value-parser "^4.0.2" - css-tree@1.0.0-alpha.37: version "1.0.0-alpha.37" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" @@ -9713,7 +9656,7 @@ hmac-drbg@^1.0.1: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0: +hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -11723,7 +11666,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.11, 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.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== @@ -13829,7 +13772,7 @@ postcss-unique-selectors@^5.1.1: dependencies: postcss-selector-parser "^6.0.5" -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: +postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== @@ -16176,22 +16119,6 @@ style-to-object@0.3.0, style-to-object@^0.3.0: dependencies: inline-style-parser "0.1.1" -styled-components@^5.3.5: - version "5.3.5" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.5.tgz#a750a398d01f1ca73af16a241dec3da6deae5ec4" - integrity sha512-ndETJ9RKaaL6q41B69WudeqLzOpY1A/ET/glXkNZ2T7dPjPqpPCXXQjDFYZWwNnE5co0wX+gTCqx9mfxTmSIPg== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@babel/traverse" "^7.4.5" - "@emotion/is-prop-valid" "^1.1.0" - "@emotion/stylis" "^0.8.4" - "@emotion/unitless" "^0.7.4" - babel-plugin-styled-components ">= 1.12.0" - css-to-react-native "^3.0.0" - hoist-non-react-statics "^3.0.0" - shallowequal "^1.1.0" - supports-color "^5.5.0" - stylehacks@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520" @@ -16210,7 +16137,7 @@ supports-color@^2.0.0: resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= -supports-color@^5.3.0, supports-color@^5.5.0: +supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -16301,7 +16228,7 @@ synchronous-promise@^2.0.15: resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.15.tgz#07ca1822b9de0001f5ff73595f3d08c4f720eb8e" integrity sha512-k8uzYIkIVwmT+TcglpdN50pS2y1BDcUnBPK9iJeGu0Pl1lOI8pD6wtzgw91Pjpe+RxtTncw32tLxs/R0yNL2Mg== -tailwindcss@^3.0.2: +tailwindcss@^3.0.2, tailwindcss@^3.0.24: version "3.0.24" resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.24.tgz#22e31e801a44a78a1d9a81ecc52e13b69d85704d" integrity sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig== From 7f54bdce30beef04edbfdf0fcd1a86ebb022121e Mon Sep 17 00:00:00 2001 From: Sam Nolan Date: Mon, 30 May 2022 13:23:12 +1000 Subject: [PATCH 268/340] Fix typescript errors about children --- packages/components/src/components/DistributionChart.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/components/src/components/DistributionChart.tsx b/packages/components/src/components/DistributionChart.tsx index a6f70fa0..12a4cf1e 100644 --- a/packages/components/src/components/DistributionChart.tsx +++ b/packages/components/src/components/DistributionChart.tsx @@ -164,10 +164,10 @@ const SummaryTable: React.FC = ({ } }; - let TableHeadCell: React.FC<{}> = ({ children }) => ( - {children} - ); - let Cell: React.FC<{}> = ({ children }) => ( + let TableHeadCell: React.FC<{ children: React.ReactNode }> = ({ + children, + }) => {children}; + let Cell: React.FC<{ children: React.ReactNode }> = ({ children }) => ( {children} ); From afbc0199aa820a4c5df6b19961c136ecf890d136 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Mon, 30 May 2022 06:40:03 -0700 Subject: [PATCH 269/340] Added tailwind/form --- packages/components/package.json | 1 + packages/components/src/tailwind.css | 1 + packages/components/tailwind.config.js | 4 +++- yarn.lock | 22 +++++++++++++++++----- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 49fd9cda..aa62c4a3 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -6,6 +6,7 @@ "@hookform/resolvers": "^2.8.10", "@quri/squiggle-lang": "^0.2.8", "@react-hook/size": "^2.1.2", + "@tailwindcss/forms": "^0.5.2", "lodash": "^4.17.21", "react": "^18.1.0", "react-ace": "^10.1.0", diff --git a/packages/components/src/tailwind.css b/packages/components/src/tailwind.css index b5c61c95..18a5f5af 100644 --- a/packages/components/src/tailwind.css +++ b/packages/components/src/tailwind.css @@ -1,3 +1,4 @@ @tailwind base; @tailwind components; @tailwind utilities; +@tailwind forms; diff --git a/packages/components/tailwind.config.js b/packages/components/tailwind.config.js index 22a8ca63..89944004 100644 --- a/packages/components/tailwind.config.js +++ b/packages/components/tailwind.config.js @@ -3,5 +3,7 @@ module.exports = { theme: { extend: {}, }, - plugins: [], + plugins: [ + require('@tailwindcss/forms'), + ], }; diff --git a/yarn.lock b/yarn.lock index 25217d51..282fcbaf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3845,6 +3845,13 @@ dependencies: defer-to-connect "^1.0.1" +"@tailwindcss/forms@^0.5.2": + version "0.5.2" + resolved "https://registry.yarnpkg.com/@tailwindcss/forms/-/forms-0.5.2.tgz#4ef45f9916dcb37838cbe7fecdcc4ba7a7c2ab59" + integrity sha512-pSrFeJB6Bg1Mrg9CdQW3+hqZXAKsBrSG9MAfFLKy1pVA4Mb4W7C0k7mEhlmS2Dfo/otxrQOET7NJiJ9RrS563w== + dependencies: + mini-svg-data-uri "^1.2.3" + "@testing-library/dom@^8.5.0": version "8.13.0" resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.13.0.tgz#bc00bdd64c7d8b40841e27a70211399ad3af46f5" @@ -4288,10 +4295,10 @@ dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^18.0.1", "@types/react@^18.0.9": - version "18.0.9" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.9.tgz#d6712a38bd6cd83469603e7359511126f122e878" - integrity sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw== +"@types/react@*", "@types/react@17.0.43", "@types/react@^18.0.9": + version "17.0.43" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.43.tgz#4adc142887dd4a2601ce730bc56c3436fdb07a55" + integrity sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -12070,6 +12077,11 @@ mini-css-extract-plugin@^2.4.5, mini-css-extract-plugin@^2.6.0: dependencies: schema-utils "^4.0.0" +mini-svg-data-uri@^1.2.3: + version "1.4.4" + resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939" + integrity sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg== + minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -14500,7 +14512,7 @@ react-vega@^7.5.1: prop-types "^15.8.1" vega-embed "^6.5.1" -react@^18.0.0, react@^18.1.0: +react@^18.1.0: version "18.1.0" resolved "https://registry.yarnpkg.com/react/-/react-18.1.0.tgz#6f8620382decb17fdc5cc223a115e2adbf104890" integrity sha512-4oL8ivCz5ZEPyclFQXaNksK3adutVS8l2xzZU0cqEFrE9Sb7fC0EFK5uEk74wIreL1DERyjvsU915j1pcT2uEQ== From fdb8a2ff70dba64f8766ea40fefef1a1be489665 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 14:44:38 +0000 Subject: [PATCH 270/340] :arrow_up: Bump @types/node from 17.0.35 to 17.0.36 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.35 to 17.0.36. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 49fd9cda..785ebbc2 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -33,7 +33,7 @@ "@testing-library/user-event": "^14.2.0", "@types/jest": "^27.5.0", "@types/lodash": "^4.14.182", - "@types/node": "^17.0.35", + "@types/node": "^17.0.36", "@types/react": "^18.0.9", "@types/react-dom": "^18.0.4", "@types/styled-components": "^5.1.24", diff --git a/yarn.lock b/yarn.lock index 25217d51..6637cb3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4183,10 +4183,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@^17.0.35", "@types/node@^17.0.5": - version "17.0.35" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a" - integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg== +"@types/node@*", "@types/node@^17.0.36", "@types/node@^17.0.5": + version "17.0.36" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.36.tgz#c0d5f2fe76b47b63e0e0efc3d2049a9970d68794" + integrity sha512-V3orv+ggDsWVHP99K3JlwtH20R7J4IhI1Kksgc+64q5VxgfRkQG8Ws3MFm/FZOKDYGy9feGFlZ70/HpCNe9QaA== "@types/node@^14.0.10 || ^16.0.0", "@types/node@^14.14.20 || ^16.0.0": version "16.11.36" From 2e0873e533a01a994c4f5cd45dda7e9a2bdc5575 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 14:45:34 +0000 Subject: [PATCH 271/340] :arrow_up: Bump @testing-library/react from 13.2.0 to 13.3.0 Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 13.2.0 to 13.3.0. - [Release notes](https://github.com/testing-library/react-testing-library/releases) - [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/react-testing-library/compare/v13.2.0...v13.3.0) --- updated-dependencies: - dependency-name: "@testing-library/react" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 49fd9cda..8008d573 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -29,7 +29,7 @@ "@storybook/preset-create-react-app": "^4.1.1", "@storybook/react": "^6.5.4", "@testing-library/jest-dom": "^5.16.4", - "@testing-library/react": "^13.2.0", + "@testing-library/react": "^13.3.0", "@testing-library/user-event": "^14.2.0", "@types/jest": "^27.5.0", "@types/lodash": "^4.14.182", diff --git a/yarn.lock b/yarn.lock index 25217d51..45a367be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1238,14 +1238,7 @@ core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" - integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.15.4": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.18.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4" integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug== @@ -3874,10 +3867,10 @@ lodash "^4.17.15" redent "^3.0.0" -"@testing-library/react@^13.2.0": - version "13.2.0" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.2.0.tgz#2db00bc94d71c4e90e5c25582e90a650ae2925bf" - integrity sha512-Bprbz/SZVONCJy5f7hcihNCv313IJXdYiv0nSJklIs1SQCIHHNlnGNkosSXnGZTmesyGIcBGNppYhXcc11pb7g== +"@testing-library/react@^13.3.0": + version "13.3.0" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-13.3.0.tgz#bf298bfbc5589326bbcc8052b211f3bb097a97c5" + integrity sha512-DB79aA426+deFgGSjnf5grczDPiL4taK3hFaa+M5q7q20Kcve9eQottOG5kZ74KEr55v0tU2CQormSSDK87zYQ== dependencies: "@babel/runtime" "^7.12.5" "@testing-library/dom" "^8.5.0" From 8d9791d04f842f790ed6e986f21807da92984ece Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 14:46:42 +0000 Subject: [PATCH 272/340] :arrow_up: Bump @storybook/addon-actions from 6.5.4 to 6.5.6 Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 6.5.4 to 6.5.6. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/addons/actions) --- updated-dependencies: - dependency-name: "@storybook/addon-actions" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 124 ++++++++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 2 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 49fd9cda..524f4ef7 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -20,7 +20,7 @@ }, "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.17.12", - "@storybook/addon-actions": "^6.5.3", + "@storybook/addon-actions": "^6.5.6", "@storybook/addon-essentials": "^6.5.4", "@storybook/addon-links": "^6.5.4", "@storybook/builder-webpack5": "^6.5.4", diff --git a/yarn.lock b/yarn.lock index 25217d51..44f23299 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2718,7 +2718,7 @@ "@stdlib/types" "^0.0.x" debug "^2.6.9" -"@storybook/addon-actions@6.5.4", "@storybook/addon-actions@^6.5.3": +"@storybook/addon-actions@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.4.tgz#8ec4863982c805a3a39a19848aea3d65d80d491f" integrity sha512-O70+brZOW78LBjbKsppXy37NQj4r3b2LQh3zUkIE1n37nb0bYhewr39UlT1/VhfDD4QA6PsBOqp0Mum8/V0GgQ== @@ -2743,6 +2743,31 @@ util-deprecate "^1.0.2" uuid-browser "^3.1.0" +"@storybook/addon-actions@^6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.6.tgz#0e980a0a6d8d47db8031108ffa1fd51cc627a466" + integrity sha512-AGtzpWOU/B0FxcqFDM7E/KSHQyr6tMbVts77JlAKCIbwqEncD1LIQoz9CyMdbr1jynkep0Ck0JjcDdmp7CXVoQ== + dependencies: + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/theming" "6.5.6" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + polished "^4.2.2" + prop-types "^15.7.2" + react-inspector "^5.1.0" + regenerator-runtime "^0.13.7" + telejson "^6.0.8" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + uuid-browser "^3.1.0" + "@storybook/addon-backgrounds@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.5.4.tgz#97df5c73f350965bd5f2521e0882581df9f86315" @@ -2930,6 +2955,23 @@ global "^4.4.0" regenerator-runtime "^0.13.7" +"@storybook/addons@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.5.6.tgz#ed7ab72ac3a4e2d74e2ba4d10b4a0721d66cd1cd" + integrity sha512-Ktv7Pk4iq+8+6yifXu3bOiC1ii9VXD93mmha7XcrdW+wl8jti9Ll5jLKEN0lAhd+Qupz4R0g9+znpRXk5n0pBg== + dependencies: + "@storybook/api" "6.5.6" + "@storybook/channels" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/router" "6.5.6" + "@storybook/theming" "6.5.6" + "@types/webpack-env" "^1.16.0" + core-js "^3.8.2" + global "^4.4.0" + regenerator-runtime "^0.13.7" + "@storybook/api@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.4.tgz#faa06cde4990fd3b2be551ff869fc44a80e66e53" @@ -2953,6 +2995,29 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/api@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.6.tgz#7f7c7bc561b3888033eb7074a8c9ecce9f07cb54" + integrity sha512-GHhjb6mji+R+FWytx7MIOKqca49ZXjvnIPpyp5zXAtgdk2Yn2j8C0MRPO1ovh4nHKWVvx6larmhskRxfUjk06g== + dependencies: + "@storybook/channels" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/router" "6.5.6" + "@storybook/semver" "^7.3.2" + "@storybook/theming" "6.5.6" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + regenerator-runtime "^0.13.7" + store2 "^2.12.0" + telejson "^6.0.8" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/builder-webpack4@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.4.tgz#c58708c18a657ab326026469e5f06aef462c074e" @@ -3083,6 +3148,15 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/channels@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.6.tgz#a373127f0dd841dabfc31607e5cdac6245444b6c" + integrity sha512-rS0Dk9fSiMBsPvkiMo9CuvDCoXbGmYKiX/juS3F4u+sedhH+XtH4jFf49lJWoNVAE6eJPFyXATU4p1mm8Z85kQ== + dependencies: + core-js "^3.8.2" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/client-api@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.4.tgz#e79418ffb21857deb98f5b7fd88dfe23ef12cfe7" @@ -3117,6 +3191,14 @@ core-js "^3.8.2" global "^4.4.0" +"@storybook/client-logger@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.6.tgz#6ce56c687dcd7772247ffa3915b44737a62f729c" + integrity sha512-hJzhn5EO0S4fUAZkKzBGNACJfupV9n+7TSIaU4mpVP+/ImS9uPdorAAtyqp5HC6R6vA67POoSgX0+qPgZnWvaw== + dependencies: + core-js "^3.8.2" + global "^4.4.0" + "@storybook/components@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.4.tgz#8afdbba252ab957ba53318b34cb2593da964747b" @@ -3132,6 +3214,21 @@ regenerator-runtime "^0.13.7" util-deprecate "^1.0.2" +"@storybook/components@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.6.tgz#83f03967bdd1c509e5d18111b924a8cb0789718a" + integrity sha512-Qh40wMkqWD3ZbGqxqa0pi5JFWazIbcZWbqUakH9zARgLk+LBrpJvPuu7GmQrDUtJTA33H4tD/4ujt6AibnaQwQ== + dependencies: + "@storybook/client-logger" "6.5.6" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/theming" "6.5.6" + "@types/react-syntax-highlighter" "11.0.5" + core-js "^3.8.2" + qs "^6.10.0" + react-syntax-highlighter "^15.4.5" + regenerator-runtime "^0.13.7" + util-deprecate "^1.0.2" + "@storybook/core-client@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.4.tgz#ab5eaa68c78c3e8816ea240afeea0887e2f68708" @@ -3221,6 +3318,13 @@ dependencies: core-js "^3.8.2" +"@storybook/core-events@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.6.tgz#b4e9150216810621ba00d8d1eb3f9414493d6e61" + integrity sha512-bzktgM1i0QPrayH1ANbKb7nYpehSpi5QHWps2vVQbvtpI/pGlTtpde1e87vfAt74Bvsvd3/9IpQkQKteDODAkA== + dependencies: + core-js "^3.8.2" + "@storybook/core-server@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.4.tgz#0e213ac52748fac1325b5734e7b64c23f982bd2f" @@ -3531,6 +3635,15 @@ core-js "^3.8.2" regenerator-runtime "^0.13.7" +"@storybook/router@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.5.6.tgz#83b442635c5a32a0eb0b4cd3f2da8b7cbecc32e7" + integrity sha512-SL9X/+bkJxafH5V9r65liMgs+EvGddMCQ/4JP/p3GIu6+2G3pW613Ww5sqCBCB1R4zoYcsMT7F1q/D5NWByVHg== + dependencies: + "@storybook/client-logger" "6.5.6" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + "@storybook/semver@^7.3.2": version "7.3.2" resolved "https://registry.yarnpkg.com/@storybook/semver/-/semver-7.3.2.tgz#f3b9c44a1c9a0b933c04e66d0048fcf2fa10dac0" @@ -3603,6 +3716,15 @@ core-js "^3.8.2" regenerator-runtime "^0.13.7" +"@storybook/theming@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.5.6.tgz#519e1675a7ff5c780f5a41b05b4b679c37b62fe8" + integrity sha512-JEKl9gdVD2Ef9xSwRtaq6EpjJD5xe7X2OP/4e61ucrp/rSOk7SOpYUZYQh6PhYLGhnGbgQkedVVc9CUhK8bs6Q== + dependencies: + "@storybook/client-logger" "6.5.6" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + "@storybook/ui@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.4.tgz#eb70602e78b871e6d762b43889b2dc7537a91331" From 486573e140c03635d7f987f34922b5b01845d58a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 14:47:54 +0000 Subject: [PATCH 273/340] :arrow_up: Bump @storybook/node-logger from 6.5.4 to 6.5.6 Bumps [@storybook/node-logger](https://github.com/storybookjs/storybook/tree/HEAD/lib/node-logger) from 6.5.4 to 6.5.6. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/lib/node-logger) --- updated-dependencies: - dependency-name: "@storybook/node-logger" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 49fd9cda..b8e3d400 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -25,7 +25,7 @@ "@storybook/addon-links": "^6.5.4", "@storybook/builder-webpack5": "^6.5.4", "@storybook/manager-webpack5": "^6.5.4", - "@storybook/node-logger": "^6.5.4", + "@storybook/node-logger": "^6.5.6", "@storybook/preset-create-react-app": "^4.1.1", "@storybook/react": "^6.5.4", "@testing-library/jest-dom": "^5.16.4", diff --git a/yarn.lock b/yarn.lock index 25217d51..e81f787d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3416,7 +3416,7 @@ prettier ">=2.2.1 <=2.3.0" ts-dedent "^2.0.0" -"@storybook/node-logger@6.5.4", "@storybook/node-logger@^6.5.4": +"@storybook/node-logger@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.4.tgz#1887abd364fd401ac7b76b313f92f12005a28c6f" integrity sha512-2rK9oTBhvRm4VOr1ywIWXfWEXVbuV7wGdZu4hpSDlkhnBBFCyYBJH9asEJVoB4Qk77HPMCqkw2IHpstVjkASXQ== @@ -3427,6 +3427,17 @@ npmlog "^5.0.1" pretty-hrtime "^1.0.3" +"@storybook/node-logger@^6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.6.tgz#24422886f894978b10c2e23feb6bf0657f5e514f" + integrity sha512-bT0R0skDWW9iJS8AIG9zfSF8XzTffdc8hRlpXUF9+VQKds+8H9FyoV4tl8ySCuNNunt8Ic9GvW3Fakq49FUcgw== + dependencies: + "@types/npmlog" "^4.1.2" + chalk "^4.1.0" + core-js "^3.8.2" + npmlog "^5.0.1" + pretty-hrtime "^1.0.3" + "@storybook/postinstall@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.4.tgz#01f7792f1a777cb1dee30e07f02314080cabd232" From 65abbece9e73413836b9f34fc11d49396da100ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:00:14 +0000 Subject: [PATCH 274/340] :arrow_up: Bump peggy from 1.2.0 to 2.0.0 Bumps [peggy](https://github.com/peggyjs/peggy) from 1.2.0 to 2.0.0. - [Release notes](https://github.com/peggyjs/peggy/releases) - [Changelog](https://github.com/peggyjs/peggy/blob/main/CHANGELOG.md) - [Commits](https://github.com/peggyjs/peggy/compare/v1.2.0...v2.0.0) --- updated-dependencies: - dependency-name: peggy dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- packages/squiggle-lang/package.json | 2 +- yarn.lock | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index d92c18d9..5a5172f6 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -56,7 +56,7 @@ "lodash": "^4.17.21", "moduleserve": "^0.9.1", "nyc": "^15.1.0", - "peggy": "^1.2.0", + "peggy": "^2.0.0", "reanalyze": "^2.19.0", "rescript-fast-check": "^1.1.1", "ts-jest": "^27.1.4", diff --git a/yarn.lock b/yarn.lock index 25217d51..b92c9d1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6648,6 +6648,11 @@ commander@^8.0.0, commander@^8.3.0: resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@^9.2.0: + version "9.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.3.0.tgz#f619114a5a2d2054e0d9ff1b31d5ccf89255e26b" + integrity sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw== + common-path-prefix@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" @@ -13070,10 +13075,13 @@ pdfast@^0.2.0: resolved "https://registry.yarnpkg.com/pdfast/-/pdfast-0.2.0.tgz#8cbc556e1bf2522177787c0de2e0d4373ba885c9" integrity sha1-jLxVbhvyUiF3eHwN4uDUNzuohck= -peggy@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/peggy/-/peggy-1.2.0.tgz#657ba45900cbef1dc9f52356704bdbb193c2021c" - integrity sha512-PQ+NKpAobImfMprYQtc4Egmyi29bidRGEX0kKjCU5uuW09s0Cthwqhfy7mLkwcB4VcgacE5L/ZjruD/kOPCUUw== +peggy@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/peggy/-/peggy-2.0.0.tgz#878f3c25719bc6d44a84c04069cfab8cfd043215" + integrity sha512-bvK2jdxHWpxb+0DxD6ibq+iNppJl3UtMSdRwyOvVYc3O3lFM/0oyqcF1Ggwwb2/JS9hrKsPnR0Eheys0J+ykEA== + dependencies: + commander "^9.2.0" + source-map-generator "0.8.0" performance-now@^2.1.0: version "2.1.0" @@ -15609,6 +15617,11 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +source-map-generator@0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/source-map-generator/-/source-map-generator-0.8.0.tgz#10d5ca0651e2c9302ea338739cbd4408849c5d00" + integrity sha512-psgxdGMwl5MZM9S3FWee4EgsEaIjahYV5AzGnwUvPhWeITz/j6rKpysQHlQ4USdxvINlb8lKfWGIXwfkrgtqkA== + source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" From 282243fbe202c504d56a0cd4e573b657979cc599 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:01:11 +0000 Subject: [PATCH 275/340] :arrow_up: Bump @storybook/manager-webpack5 from 6.5.4 to 6.5.6 Bumps [@storybook/manager-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.5.4 to 6.5.6. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/lib/core) --- updated-dependencies: - dependency-name: "@storybook/manager-webpack5" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 215 +++++++++++++++++++++++++++++-- 2 files changed, 205 insertions(+), 12 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index df77cb68..c165b733 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -24,7 +24,7 @@ "@storybook/addon-essentials": "^6.5.4", "@storybook/addon-links": "^6.5.4", "@storybook/builder-webpack5": "^6.5.4", - "@storybook/manager-webpack5": "^6.5.4", + "@storybook/manager-webpack5": "^6.5.6", "@storybook/node-logger": "^6.5.6", "@storybook/preset-create-react-app": "^4.1.1", "@storybook/react": "^6.5.4", diff --git a/yarn.lock b/yarn.lock index 65c9b371..14913a05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3121,6 +3121,19 @@ qs "^6.10.0" telejson "^6.0.8" +"@storybook/channel-postmessage@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.5.6.tgz#3cfaef29c9ff62321152924de478058fdfd9d812" + integrity sha512-kyYO84hItSE1SaEI1xpMYqJOM3MJ2Y2WHx1Hxu5prq2T2cIgUGURyNf3+5G0BLTf2XGNEN/7YYv9rHmQ9GUz8g== + dependencies: + "@storybook/channels" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core-events" "6.5.6" + core-js "^3.8.2" + global "^4.4.0" + qs "^6.10.0" + telejson "^6.0.8" + "@storybook/channel-websocket@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.4.tgz#659dac59649240ce9d9e74a84bcc28c9f359f62e" @@ -3132,6 +3145,17 @@ global "^4.4.0" telejson "^6.0.8" +"@storybook/channel-websocket@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.6.tgz#9d31ef139f6d86b29278452e9977a47fd3cc9706" + integrity sha512-d09LfP4zVYCCeuCBn+R41jINUBzhRt78tKk5e1wEsMklV5p+l8Zoi3oJD/UQ/EgtMcnC1dKi3WfAPyx3U/wdgg== + dependencies: + "@storybook/channels" "6.5.6" + "@storybook/client-logger" "6.5.6" + core-js "^3.8.2" + global "^4.4.0" + telejson "^6.0.8" + "@storybook/channels@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.4.tgz#a3fdc20d45cf4aa74b5310e5e4eb111e353a408a" @@ -3176,6 +3200,32 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/client-api@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.6.tgz#935026e682d41f8f9cd122dccd8a9ae3ebc3b613" + integrity sha512-+PV3eZ0Hr15volHE/ds6pxsoitsHkUuwGMVLUGvX5JuepDlhWOkQzCxPw2BuABJl6x40/w/Pj2DIyTrg37ZThg== + dependencies: + "@storybook/addons" "6.5.6" + "@storybook/channel-postmessage" "6.5.6" + "@storybook/channels" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.6" + "@types/qs" "^6.9.5" + "@types/webpack-env" "^1.16.0" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + store2 "^2.12.0" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/client-logger@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.4.tgz#57348015276e0453675968f6ca31d908ceb498ae" @@ -3248,6 +3298,32 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" +"@storybook/core-client@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.6.tgz#d09d144745c6d8a24dd002ae60ffa9b0c500ae54" + integrity sha512-Xmjt95GYYVRp7ra49Y955BLH/FYlOmuLC4aFTGurjmCay7zUqvExxFk9AUKOkyBb1/S/8iQCG59D0ES6YWoMRw== + dependencies: + "@storybook/addons" "6.5.6" + "@storybook/channel-postmessage" "6.5.6" + "@storybook/channel-websocket" "6.5.6" + "@storybook/client-api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/preview-web" "6.5.6" + "@storybook/store" "6.5.6" + "@storybook/ui" "6.5.6" + airbnb-js-shims "^2.2.1" + ansi-to-html "^0.6.11" + core-js "^3.8.2" + global "^4.4.0" + lodash "^4.17.21" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + ts-dedent "^2.0.0" + unfetch "^4.2.0" + util-deprecate "^1.0.2" + "@storybook/core-common@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.4.tgz#e77f48a2c93b5eb656a3ad6dd0c01903ba7e57f3" @@ -3304,6 +3380,62 @@ util-deprecate "^1.0.2" webpack "4" +"@storybook/core-common@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.6.tgz#12c717f2fb9cad77b38e122fb89c15566130798a" + integrity sha512-+k+D9CzyFHNAy59jt2sfKnb/KU/nXO1hvBVaJAhdocjrDMvHtwYuXWWQrWYX3/VGp9wCa9TC0JG1kz+DWSYXaQ== + dependencies: + "@babel/core" "^7.12.10" + "@babel/plugin-proposal-class-properties" "^7.12.1" + "@babel/plugin-proposal-decorators" "^7.12.12" + "@babel/plugin-proposal-export-default-from" "^7.12.1" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" + "@babel/plugin-proposal-object-rest-spread" "^7.12.1" + "@babel/plugin-proposal-optional-chaining" "^7.12.7" + "@babel/plugin-proposal-private-methods" "^7.12.1" + "@babel/plugin-proposal-private-property-in-object" "^7.12.1" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-transform-arrow-functions" "^7.12.1" + "@babel/plugin-transform-block-scoping" "^7.12.12" + "@babel/plugin-transform-classes" "^7.12.1" + "@babel/plugin-transform-destructuring" "^7.12.1" + "@babel/plugin-transform-for-of" "^7.12.1" + "@babel/plugin-transform-parameters" "^7.12.1" + "@babel/plugin-transform-shorthand-properties" "^7.12.1" + "@babel/plugin-transform-spread" "^7.12.1" + "@babel/preset-env" "^7.12.11" + "@babel/preset-react" "^7.12.10" + "@babel/preset-typescript" "^7.12.7" + "@babel/register" "^7.12.1" + "@storybook/node-logger" "6.5.6" + "@storybook/semver" "^7.3.2" + "@types/node" "^14.0.10 || ^16.0.0" + "@types/pretty-hrtime" "^1.0.0" + babel-loader "^8.0.0" + babel-plugin-macros "^3.0.1" + babel-plugin-polyfill-corejs3 "^0.1.0" + chalk "^4.1.0" + core-js "^3.8.2" + express "^4.17.1" + file-system-cache "^1.0.5" + find-up "^5.0.0" + fork-ts-checker-webpack-plugin "^6.0.4" + fs-extra "^9.0.1" + glob "^7.1.6" + handlebars "^4.7.7" + interpret "^2.2.0" + json5 "^2.1.3" + lazy-universal-dotenv "^3.0.1" + picomatch "^2.3.0" + pkg-dir "^5.0.0" + pretty-hrtime "^1.0.3" + resolve-from "^5.0.0" + slash "^3.0.0" + telejson "^6.0.8" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + webpack "4" + "@storybook/core-events@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.4.tgz#0c68ee42ac5afcc8ee7b56cd057d9a90d244067c" @@ -3458,20 +3590,20 @@ webpack-dev-middleware "^3.7.3" webpack-virtual-modules "^0.2.2" -"@storybook/manager-webpack5@^6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/manager-webpack5/-/manager-webpack5-6.5.4.tgz#54793278225e17418318a34a830234e249de3db8" - integrity sha512-UwGnwkHV5CFuHmrsQnjQ0IQj6uXZFopCB7e96HU0YwOBiBA9ABlbJpUrxC/N7vO+OhTNtH6lcwHx0eJbbnnuxw== +"@storybook/manager-webpack5@^6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/manager-webpack5/-/manager-webpack5-6.5.6.tgz#7357d97f91e60810ea866f099aa1b82b5afc0f73" + integrity sha512-U5OIMs1PNjZZRjOvV2Bo05+1dzvV30o4Lw5sgeyH9Qr08p79nHT4iFSaVF2W01zGja6XlneqFB9hBqBHoocJWQ== dependencies: "@babel/core" "^7.12.10" "@babel/plugin-transform-template-literals" "^7.12.1" "@babel/preset-react" "^7.12.10" - "@storybook/addons" "6.5.4" - "@storybook/core-client" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/node-logger" "6.5.4" - "@storybook/theming" "6.5.4" - "@storybook/ui" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/core-client" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/node-logger" "6.5.6" + "@storybook/theming" "6.5.6" + "@storybook/ui" "6.5.6" "@types/node" "^14.0.10 || ^16.0.0" babel-loader "^8.0.0" case-sensitive-paths-webpack-plugin "^2.3.0" @@ -3524,7 +3656,7 @@ npmlog "^5.0.1" pretty-hrtime "^1.0.3" -"@storybook/node-logger@^6.5.6": +"@storybook/node-logger@6.5.6", "@storybook/node-logger@^6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.6.tgz#24422886f894978b10c2e23feb6bf0657f5e514f" integrity sha512-bT0R0skDWW9iJS8AIG9zfSF8XzTffdc8hRlpXUF9+VQKds+8H9FyoV4tl8ySCuNNunt8Ic9GvW3Fakq49FUcgw== @@ -3576,6 +3708,28 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" +"@storybook/preview-web@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.5.6.tgz#d4cf4a90a27819aa3315b48b21df6a515bb49b7a" + integrity sha512-fjWfe1ZqtMMS3UFiL6XDYVR0T5QVhXIp/Ax19tuW2VJ/NL/zl4+c9v9lx5jSY5iD5tKwYYRrbH8VS2Pm/CNAzA== + dependencies: + "@storybook/addons" "6.5.6" + "@storybook/channel-postmessage" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.6" + ansi-to-html "^0.6.11" + core-js "^3.8.2" + global "^4.4.0" + lodash "^4.17.21" + qs "^6.10.0" + regenerator-runtime "^0.13.7" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + unfetch "^4.2.0" + util-deprecate "^1.0.2" + "@storybook/react-docgen-typescript-plugin@1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0", "@storybook/react-docgen-typescript-plugin@canary": version "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0" resolved "https://registry.yarnpkg.com/@storybook/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0.tgz#3103532ff494fb7dc3cf835f10740ecf6a26c0f9" @@ -3693,6 +3847,27 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" +"@storybook/store@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.5.6.tgz#0250d92f10d9590f4df2f7e6e11a07103055c350" + integrity sha512-ftU40jN5IV26Mj4QjqgsooWFYXDNtcwByH9JrbIlZv7L8HySqVHqeOMrk2Bbt2EkM3urhc5yd0Bbr8EuKlbZVQ== + dependencies: + "@storybook/addons" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + core-js "^3.8.2" + fast-deep-equal "^3.1.3" + global "^4.4.0" + lodash "^4.17.21" + memoizerific "^1.11.3" + regenerator-runtime "^0.13.7" + slash "^3.0.0" + stable "^0.1.8" + synchronous-promise "^2.0.15" + ts-dedent "^2.0.0" + util-deprecate "^1.0.2" + "@storybook/telemetry@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.4.tgz#810209e928449c2eab7e3bdf7dd6dbe0de8327b0" @@ -3747,6 +3922,24 @@ regenerator-runtime "^0.13.7" resolve-from "^5.0.0" +"@storybook/ui@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.6.tgz#3b312728c11d1bdba9cac41d18d91b6806496028" + integrity sha512-EU/YGczcA/v7jHlXIJ7CytK+FH2X9tlsjQbcQW8niPkwtk/gvG7vTfNhanbDlWMKnDLuFWhyHJ33nrW2mIyqkw== + dependencies: + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/channels" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/router" "6.5.6" + "@storybook/semver" "^7.3.2" + "@storybook/theming" "6.5.6" + core-js "^3.8.2" + regenerator-runtime "^0.13.7" + resolve-from "^5.0.0" + "@surma/rollup-plugin-off-main-thread@^2.2.3": version "2.2.3" resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053" From d181b5c13314dc08cf257b7215a0a3c9f2eca61c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:08:51 +0000 Subject: [PATCH 276/340] :arrow_up: Bump @storybook/addon-essentials from 6.5.4 to 6.5.6 Bumps [@storybook/addon-essentials](https://github.com/storybookjs/storybook/tree/HEAD/addons/essentials) from 6.5.4 to 6.5.6. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/addons/essentials) --- updated-dependencies: - dependency-name: "@storybook/addon-essentials" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 261 ++++++++++++++++--------------- 2 files changed, 134 insertions(+), 129 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index c165b733..1bdb1766 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -21,7 +21,7 @@ "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.17.12", "@storybook/addon-actions": "^6.5.6", - "@storybook/addon-essentials": "^6.5.4", + "@storybook/addon-essentials": "^6.5.6", "@storybook/addon-links": "^6.5.4", "@storybook/builder-webpack5": "^6.5.4", "@storybook/manager-webpack5": "^6.5.6", diff --git a/yarn.lock b/yarn.lock index 14913a05..7e1acdc8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2711,32 +2711,7 @@ "@stdlib/types" "^0.0.x" debug "^2.6.9" -"@storybook/addon-actions@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.4.tgz#8ec4863982c805a3a39a19848aea3d65d80d491f" - integrity sha512-O70+brZOW78LBjbKsppXy37NQj4r3b2LQh3zUkIE1n37nb0bYhewr39UlT1/VhfDD4QA6PsBOqp0Mum8/V0GgQ== - dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/theming" "6.5.4" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - polished "^4.2.2" - prop-types "^15.7.2" - react-inspector "^5.1.0" - regenerator-runtime "^0.13.7" - telejson "^6.0.8" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - uuid-browser "^3.1.0" - -"@storybook/addon-actions@^6.5.6": +"@storybook/addon-actions@6.5.6", "@storybook/addon-actions@^6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.6.tgz#0e980a0a6d8d47db8031108ffa1fd51cc627a466" integrity sha512-AGtzpWOU/B0FxcqFDM7E/KSHQyr6tMbVts77JlAKCIbwqEncD1LIQoz9CyMdbr1jynkep0Ck0JjcDdmp7CXVoQ== @@ -2761,18 +2736,18 @@ util-deprecate "^1.0.2" uuid-browser "^3.1.0" -"@storybook/addon-backgrounds@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.5.4.tgz#97df5c73f350965bd5f2521e0882581df9f86315" - integrity sha512-lajT9N7VpBQRPHJF1iAGUIxJNuMwqZcMjijVAMoWX4gOdnGvjK7MpwoYbD2xAPXYrugJUGiYRG608d4PgPZT4w== +"@storybook/addon-backgrounds@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.5.6.tgz#3763acdff1f2260286e165cf35e87d8097245496" + integrity sha512-D2khx57WBvQ2Ta/UMCZa8KQwAzVunk/oKmTJd6vau+1bm88wEx3a2seI9tZtC6nVHgHaBYgoH8os+7XpmlYlVQ== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/theming" "6.5.4" + "@storybook/theming" "6.5.6" core-js "^3.8.2" global "^4.4.0" memoizerific "^1.11.3" @@ -2780,47 +2755,47 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/addon-controls@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.5.4.tgz#d0cc2781bc0122eb16e59940b32c645775d0c8da" - integrity sha512-+2s++u1yXGs94BoxMVOOa4Ld0u6ylV5KdS9cWigyQz/OP3ZeoXDx6kCaJfYhEe/7Ccn59g11XjG4W8pjHMdb4A== +"@storybook/addon-controls@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.5.6.tgz#bca1e33dd1edb059b6d6b1e1616c60ecdc9eb294" + integrity sha512-pJz2ltdL8d9/2wX1XOMdXeGwMNoBX5hIXkNfBCvBfOCmeVEXOczPOZARvwx4QTqmMSu1KikhFIGT64wwoETmBg== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-common" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-common" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/node-logger" "6.5.4" - "@storybook/store" "6.5.4" - "@storybook/theming" "6.5.4" + "@storybook/node-logger" "6.5.6" + "@storybook/store" "6.5.6" + "@storybook/theming" "6.5.6" core-js "^3.8.2" lodash "^4.17.21" ts-dedent "^2.0.0" -"@storybook/addon-docs@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.5.4.tgz#6b22711b50dec7ab370923b6d37aae12476d0b2a" - integrity sha512-Sqx8XJN760rbFGlNXywKG1QtG24X6gHgWXMEdfA1yy6FbH8vXu8p9VVm6KV3tHcb7o+ihSK7pObKtSXNdumD/A== +"@storybook/addon-docs@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.5.6.tgz#39ea88cf5feebc82cc7faf9c0a10f9f3cba420bb" + integrity sha512-18MOB4Cvr10ibRlA58Y2MqaC0EM9NG758iSjweThaU4kZtSBSDn8R2qBLDGQPwEFkww+4+oAFXxR5/J0qO2xEw== dependencies: "@babel/plugin-transform-react-jsx" "^7.12.12" "@babel/preset-env" "^7.12.11" "@jest/transform" "^26.6.2" "@mdx-js/react" "^1.6.22" - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/docs-tools" "6.5.4" - "@storybook/mdx1-csf" canary - "@storybook/node-logger" "6.5.4" - "@storybook/postinstall" "6.5.4" - "@storybook/preview-web" "6.5.4" - "@storybook/source-loader" "6.5.4" - "@storybook/store" "6.5.4" - "@storybook/theming" "6.5.4" + "@storybook/docs-tools" "6.5.6" + "@storybook/mdx1-csf" "^0.0.1" + "@storybook/node-logger" "6.5.6" + "@storybook/postinstall" "6.5.6" + "@storybook/preview-web" "6.5.6" + "@storybook/source-loader" "6.5.6" + "@storybook/store" "6.5.6" + "@storybook/theming" "6.5.6" babel-loader "^8.0.0" core-js "^3.8.2" fast-deep-equal "^3.1.3" @@ -2832,23 +2807,23 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/addon-essentials@^6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.5.4.tgz#578f1f222027a556d7e23b799956750163fd83be" - integrity sha512-/ayPl274Tdrfz0YG0oSovkrXJNbstFm/Zoz7KO4wNMFgxTYes3kk+ruwkFIZegunBB8yR77cSzWHKqS9pFD8tA== +"@storybook/addon-essentials@^6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.5.6.tgz#502e6152b729696d8de8c792fb44aae76fae934e" + integrity sha512-n+kDN/AI6NDJNJjofYXjGBh618Yg17DuRppFdXROnocwndKufuImF+/tRaQ0YLwXmnULpAiFSGbja6F0pc7fOw== dependencies: - "@storybook/addon-actions" "6.5.4" - "@storybook/addon-backgrounds" "6.5.4" - "@storybook/addon-controls" "6.5.4" - "@storybook/addon-docs" "6.5.4" - "@storybook/addon-measure" "6.5.4" - "@storybook/addon-outline" "6.5.4" - "@storybook/addon-toolbars" "6.5.4" - "@storybook/addon-viewport" "6.5.4" - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/node-logger" "6.5.4" + "@storybook/addon-actions" "6.5.6" + "@storybook/addon-backgrounds" "6.5.6" + "@storybook/addon-controls" "6.5.6" + "@storybook/addon-docs" "6.5.6" + "@storybook/addon-measure" "6.5.6" + "@storybook/addon-outline" "6.5.6" + "@storybook/addon-toolbars" "6.5.6" + "@storybook/addon-viewport" "6.5.6" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/node-logger" "6.5.6" core-js "^3.8.2" regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" @@ -2871,60 +2846,60 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-measure@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-6.5.4.tgz#af3dc98804e39411dd545eb2bff7b722b7ab6dbc" - integrity sha512-yucb2WnQMUyPo0cnbKKeIMp4pb18bU2zE8AFLm1GcQYJ56IfYD5EJbfpP7o3KpcMRRrZFjITggqhdU8DtncZkQ== +"@storybook/addon-measure@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-6.5.6.tgz#843de6286861fed1761544adecf3c49d2982136c" + integrity sha512-V+KKoCTMVakExVmNiSu/1AHVsOgxUt62wo/Xm2fJvtRz+y/5LFFCLnENcN7/8qDTya8vgaHY7FR69zHvGiR4SA== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" global "^4.4.0" -"@storybook/addon-outline@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-6.5.4.tgz#a400a288b26ce793c4fd1b01dd54efde5b754b77" - integrity sha512-Qj9KfPTllcT0CxHqfIvKUbTxwu2ujIq/YfguFBecSQCTGwYTyTmLHzS1vwFHyEoVPgILLnQfsBLdLs57TaGl+A== +"@storybook/addon-outline@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-6.5.6.tgz#8fedfc7b86faf3dc552b7ca12972909fd022ee5b" + integrity sha512-/Bgo+yQSDwriAZ7pnO0kzaiyMg77bBgieEhrPpjb+AMlWIBU2j9rZYVdmi0egYy075Hle3E/hLwjG4FT4QIo5A== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" global "^4.4.0" regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-toolbars@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.5.4.tgz#f99348cbefe905251a1a76bf3fdac6b604666929" - integrity sha512-cK80/EjDJ+Hr7/lqsEqasyZGHx5+j9pVQRWWhTEDzURcAsxh4HFSw9VSOnDk+EAgHrlvjm+PX2xeaHfT9ezo6Q== +"@storybook/addon-toolbars@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.5.6.tgz#f4f311aaf918e1922d21e9c6f15b06e2cb7ac66c" + integrity sha512-9FvnuvLj8QdtSeY7QEuqJieNckwhIkSdmovaFzeToRzJso3eAmqoo6I6pp444QVVnMzrCl5As+2uAxhgaDLEXg== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/theming" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/theming" "6.5.6" core-js "^3.8.2" regenerator-runtime "^0.13.7" -"@storybook/addon-viewport@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.5.4.tgz#4bf17ccdbe59801404c8ff856cbfa1fe543026d9" - integrity sha512-K0DrUTwiGY9IeTVUgwgl0boEYzn7QbYz34N7C5CMEUFWIBNehc7FJu/Rc+d2ltNz1w3jtnQPAFpt0FQ8ZYvVGg== +"@storybook/addon-viewport@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.5.6.tgz#bc6456b1d2f586da104fdc6b91a2d0355530e730" + integrity sha512-zjBjMLfeqflHW7W7iFL5EvxtGbUg+4j+yHjONnKKpZteUjrX4fsBBMOL56mQsC0bAJEQCb3w2SFFskYBa4CzIw== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/theming" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/theming" "6.5.6" core-js "^3.8.2" global "^4.4.0" memoizerific "^1.11.3" @@ -3549,6 +3524,19 @@ lodash "^4.17.21" regenerator-runtime "^0.13.7" +"@storybook/docs-tools@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.6.tgz#cf27e06ce25c55327048662f833628d2e329a140" + integrity sha512-QwOFWVzce4m5fQaC39rSUBVzNplpcSfGyIN3rBBen4wHllj43y7i30A69jSW24M15CKdcJmfDaLwN00s7y3ZHQ== + dependencies: + "@babel/core" "^7.12.10" + "@storybook/csf" "0.0.2--canary.4566f4d.1" + "@storybook/store" "6.5.6" + core-js "^3.8.2" + doctrine "^3.0.0" + lodash "^4.17.21" + regenerator-runtime "^0.13.7" + "@storybook/manager-webpack4@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.4.tgz#1dfd152e7af7b57ba0c1d5162ec360b71e088f61" @@ -3628,6 +3616,23 @@ webpack-dev-middleware "^4.1.0" webpack-virtual-modules "^0.4.1" +"@storybook/mdx1-csf@^0.0.1": + version "0.0.1" + resolved "https://registry.yarnpkg.com/@storybook/mdx1-csf/-/mdx1-csf-0.0.1.tgz#d4184e3f6486fade9f7a6bfaf934d9bc07718d5b" + integrity sha512-4biZIWWzoWlCarMZmTpqcJNgo/RBesYZwGFbQeXiGYsswuvfWARZnW9RE9aUEMZ4XPn7B1N3EKkWcdcWe/K2tg== + dependencies: + "@babel/generator" "^7.12.11" + "@babel/parser" "^7.12.11" + "@babel/preset-env" "^7.12.11" + "@babel/types" "^7.12.11" + "@mdx-js/mdx" "^1.6.22" + "@types/lodash" "^4.14.167" + js-string-escape "^1.0.1" + loader-utils "^2.0.0" + lodash "^4.17.21" + prettier ">=2.2.1 <=2.3.0" + ts-dedent "^2.0.0" + "@storybook/mdx1-csf@canary": version "0.0.1-canary.1.867dcd5.0" resolved "https://registry.yarnpkg.com/@storybook/mdx1-csf/-/mdx1-csf-0.0.1-canary.1.867dcd5.0.tgz#e8739a7451a557292977d83bfb7475986a8013b6" @@ -3667,10 +3672,10 @@ npmlog "^5.0.1" pretty-hrtime "^1.0.3" -"@storybook/postinstall@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.4.tgz#01f7792f1a777cb1dee30e07f02314080cabd232" - integrity sha512-euiZOwz5KmtL3wcSxzxLTkGkxLCroZTVaNt/NopRBa0F8erJfT9MiQPVw/xFkS9QwEViaR+Zq4KmStxB41zycQ== +"@storybook/postinstall@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.6.tgz#df0bab91b0d1f576a9d4d63842ad56238e26c9d6" + integrity sha512-MPrlmVOXbfAiSaGzG1jgUM4l2zXOI9h3pvrh+0dQLJYP3tjO+5RNmJKMjH8c1PkTcAeoHkp1gUYZ0KKy2imRRQ== dependencies: core-js "^3.8.2" @@ -3810,13 +3815,13 @@ core-js "^3.6.5" find-up "^4.1.0" -"@storybook/source-loader@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.5.4.tgz#401bbfa4624c1c719a961394690f8621f93e0c3b" - integrity sha512-NfNktWLNvsGVyf3IjCke/4HftPcIHD251J7QOuPjq3lD9OTLZgL4blqscUmd2RrGZRUEH+KSfCIV9jTSeqS1wQ== +"@storybook/source-loader@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.5.6.tgz#e20c6a827c2021bbbab05d0bb2c1e6fb66e133a9" + integrity sha512-KsV9DU3JucYjWHq55f1bOu52mprgSpTIRUnvK2BojQdjY+kqN2ow0pP/I9FZzNpEKKsGFWdnREfYM5dYHZyvLw== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/client-logger" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/client-logger" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" estraverse "^5.2.0" From af14667263e60474f24c44ea57d7426cbd8af236 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:20:59 +0000 Subject: [PATCH 277/340] :arrow_up: Bump @storybook/react from 6.5.4 to 6.5.6 Bumps [@storybook/react](https://github.com/storybookjs/storybook/tree/HEAD/app/react) from 6.5.4 to 6.5.6. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/app/react) --- updated-dependencies: - dependency-name: "@storybook/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 235 ++++++++++--------------------- 2 files changed, 76 insertions(+), 161 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 1bdb1766..5befca77 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -27,7 +27,7 @@ "@storybook/manager-webpack5": "^6.5.6", "@storybook/node-logger": "^6.5.6", "@storybook/preset-create-react-app": "^4.1.1", - "@storybook/react": "^6.5.4", + "@storybook/react": "^6.5.6", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.3.0", "@testing-library/user-event": "^14.2.0", diff --git a/yarn.lock b/yarn.lock index f50184c8..fe1e63a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2986,28 +2986,28 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/builder-webpack4@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.4.tgz#c58708c18a657ab326026469e5f06aef462c074e" - integrity sha512-9AaSix850yOG7deAG8PDrAVNiDcTBm422Fjo9+OkONVN8tYIObW72U9kjwSrVL2HRMwu6Ikx939z1FBgA80NSw== +"@storybook/builder-webpack4@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.6.tgz#49eb7272402ff185ae12ffc679aef4677c48537d" + integrity sha512-/nACQ5SoddCs1geGUKXrrXiYDvYdTVXWXc0L6mXawjYANBeWIkAKFlhRpoXGN/KiFuuExO2+UgNCKlUyD0a51Q== dependencies: "@babel/core" "^7.12.10" - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/channel-postmessage" "6.5.4" - "@storybook/channels" "6.5.4" - "@storybook/client-api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/node-logger" "6.5.4" - "@storybook/preview-web" "6.5.4" - "@storybook/router" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/channel-postmessage" "6.5.6" + "@storybook/channels" "6.5.6" + "@storybook/client-api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/node-logger" "6.5.6" + "@storybook/preview-web" "6.5.6" + "@storybook/router" "6.5.6" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.4" - "@storybook/theming" "6.5.4" - "@storybook/ui" "6.5.4" + "@storybook/store" "6.5.6" + "@storybook/theming" "6.5.6" + "@storybook/ui" "6.5.6" "@types/node" "^14.0.10 || ^16.0.0" "@types/webpack" "^4.41.26" autoprefixer "^9.8.6" @@ -3109,17 +3109,6 @@ qs "^6.10.0" telejson "^6.0.8" -"@storybook/channel-websocket@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.4.tgz#659dac59649240ce9d9e74a84bcc28c9f359f62e" - integrity sha512-BQtN7ZVoeUUIDtQdsnVCOzKIfpODAIW4IQ8cEuYeHiQDuGWW0+4MuVP5fzfHVugXRoQEF+OBxP8YcVVgeakyQg== - dependencies: - "@storybook/channels" "6.5.4" - "@storybook/client-logger" "6.5.4" - core-js "^3.8.2" - global "^4.4.0" - telejson "^6.0.8" - "@storybook/channel-websocket@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.6.tgz#9d31ef139f6d86b29278452e9977a47fd3cc9706" @@ -3247,32 +3236,6 @@ regenerator-runtime "^0.13.7" util-deprecate "^1.0.2" -"@storybook/core-client@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.4.tgz#ab5eaa68c78c3e8816ea240afeea0887e2f68708" - integrity sha512-0rlQ5reKuCeFwqXdicPSLX/0ISAoEpVQgmBEosGt+1knRUfzS/IdLaBO+ZEwh+ajldFo3k9JfZOfxBOFqPMhsg== - dependencies: - "@storybook/addons" "6.5.4" - "@storybook/channel-postmessage" "6.5.4" - "@storybook/channel-websocket" "6.5.4" - "@storybook/client-api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/preview-web" "6.5.4" - "@storybook/store" "6.5.4" - "@storybook/ui" "6.5.4" - airbnb-js-shims "^2.2.1" - ansi-to-html "^0.6.11" - core-js "^3.8.2" - global "^4.4.0" - lodash "^4.17.21" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - ts-dedent "^2.0.0" - unfetch "^4.2.0" - util-deprecate "^1.0.2" - "@storybook/core-client@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.6.tgz#d09d144745c6d8a24dd002ae60ffa9b0c500ae54" @@ -3425,23 +3388,23 @@ dependencies: core-js "^3.8.2" -"@storybook/core-server@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.4.tgz#0e213ac52748fac1325b5734e7b64c23f982bd2f" - integrity sha512-Fmapj0xHHNQ3FUFXiHR/Zex9hBWnxKYMANxmNslAHbD3BEpf8xPYcjtptVvr0hJyHtnygtwqPbR0CUBbCG0KKQ== +"@storybook/core-server@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.6.tgz#4fe464847297117089900d5f9cc9acc08d638723" + integrity sha512-65kwbSXsKPl/0BKjGr9RTihv6jYGGIG/prfLscZPtm3u4/Z8ZxCX94rznztxcUatjLlUfKJ8iimizhUOIa0FJA== dependencies: "@discoveryjs/json-ext" "^0.5.3" - "@storybook/builder-webpack4" "6.5.4" - "@storybook/core-client" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/builder-webpack4" "6.5.6" + "@storybook/core-client" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/csf-tools" "6.5.4" - "@storybook/manager-webpack4" "6.5.4" - "@storybook/node-logger" "6.5.4" + "@storybook/csf-tools" "6.5.6" + "@storybook/manager-webpack4" "6.5.6" + "@storybook/node-logger" "6.5.6" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.4" - "@storybook/telemetry" "6.5.4" + "@storybook/store" "6.5.6" + "@storybook/telemetry" "6.5.6" "@types/node" "^14.0.10 || ^16.0.0" "@types/node-fetch" "^2.5.7" "@types/pretty-hrtime" "^1.0.0" @@ -3459,7 +3422,7 @@ fs-extra "^9.0.1" global "^4.4.0" globby "^11.0.2" - ip "^1.1.5" + ip "^2.0.0" lodash "^4.17.21" node-fetch "^2.6.7" open "^8.4.0" @@ -3476,18 +3439,18 @@ ws "^8.2.3" x-default-browser "^0.4.0" -"@storybook/core@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.5.4.tgz#b6fcd148aea97f695ad491ee77664c28f1ff9396" - integrity sha512-de43+5FgQnLWTJw51h4qpaDVy1aHFte2eE2wi5rC3VHICxqQJJQqtzDrAtZ9NoKhztS5tZHA6pk60fh1TtPk8g== +"@storybook/core@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.5.6.tgz#bc1792154ea010500950f0d43c78ae554ea4f9ec" + integrity sha512-DS6Q8SrEXBDoDS2K865NoWggSXEg8L9p+jx8sILLkLrr2QXJT0x6YIFSwEh6rGwkahxDV5ikON/rW39Wlxzk1w== dependencies: - "@storybook/core-client" "6.5.4" - "@storybook/core-server" "6.5.4" + "@storybook/core-client" "6.5.6" + "@storybook/core-server" "6.5.6" -"@storybook/csf-tools@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.5.4.tgz#01b4ab41482d6950781d2a3fa369445d818a1e92" - integrity sha512-mCAO8Ddig5PzXiI4HxiWhdLmPPpaovzVxqdh7g31k3fhpnRkQrKwftNGTW/ArFDdisMjB1+gm+ZOVACZg0pO4w== +"@storybook/csf-tools@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.5.6.tgz#147ced43313ee217c41b00d5fe32a80cb29b03bd" + integrity sha512-Gfah+5mEUoVG7v+E23svRjKAh546KCPIcwAvGU3m26j3hNbpvKq8edKDr+CCMfehG8VEGSZWfZPsgX04c/ItcA== dependencies: "@babel/core" "^7.12.10" "@babel/generator" "^7.12.11" @@ -3497,7 +3460,7 @@ "@babel/traverse" "^7.12.11" "@babel/types" "^7.12.11" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/mdx1-csf" canary + "@storybook/mdx1-csf" "^0.0.1" core-js "^3.8.2" fs-extra "^9.0.1" global "^4.4.0" @@ -3511,19 +3474,6 @@ dependencies: lodash "^4.17.15" -"@storybook/docs-tools@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.4.tgz#efe25c732f2061293e3cb84853e82a925e332804" - integrity sha512-XiCiCKwalbPrhcD9jhMM9IMOdOplUPNnwhW//VmHvWJ2j+JNiQVX42vfecl4hKy8wx63S/AzaGKw2yuavUAiHQ== - dependencies: - "@babel/core" "^7.12.10" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/store" "6.5.4" - core-js "^3.8.2" - doctrine "^3.0.0" - lodash "^4.17.21" - regenerator-runtime "^0.13.7" - "@storybook/docs-tools@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.6.tgz#cf27e06ce25c55327048662f833628d2e329a140" @@ -3537,20 +3487,20 @@ lodash "^4.17.21" regenerator-runtime "^0.13.7" -"@storybook/manager-webpack4@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.4.tgz#1dfd152e7af7b57ba0c1d5162ec360b71e088f61" - integrity sha512-JgFAlnnsOV6+L0ShDApwbDDdzoEAwuy01+TLUVdl60rlpbcBaasBMkZYAy1iwKZ59gCT51GocGMGDXBVeUJq9g== +"@storybook/manager-webpack4@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.6.tgz#3a356ee52cb972533a98e4da426bc6cc3b8abaf3" + integrity sha512-GaUT1bNmGebq8Ci52M07XF0Zn9Ak7L8ZaKn8rdBJ4VSPhg0vEAeo7trD3aur3+h/3gLQmK64LhiNSOfvZfQDAw== dependencies: "@babel/core" "^7.12.10" "@babel/plugin-transform-template-literals" "^7.12.1" "@babel/preset-react" "^7.12.10" - "@storybook/addons" "6.5.4" - "@storybook/core-client" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/node-logger" "6.5.4" - "@storybook/theming" "6.5.4" - "@storybook/ui" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/core-client" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/node-logger" "6.5.6" + "@storybook/theming" "6.5.6" + "@storybook/ui" "6.5.6" "@types/node" "^14.0.10 || ^16.0.0" "@types/webpack" "^4.41.26" babel-loader "^8.0.0" @@ -3633,23 +3583,6 @@ prettier ">=2.2.1 <=2.3.0" ts-dedent "^2.0.0" -"@storybook/mdx1-csf@canary": - version "0.0.1-canary.1.867dcd5.0" - resolved "https://registry.yarnpkg.com/@storybook/mdx1-csf/-/mdx1-csf-0.0.1-canary.1.867dcd5.0.tgz#e8739a7451a557292977d83bfb7475986a8013b6" - integrity sha512-VnlE825M9SpjyJCPLCXbo+RbvqllsqXqRDCouzHKSpCE3Q79KR7MMURBsJo/vrTG1zeNG68Z4TZrLAu6IoyYaA== - dependencies: - "@babel/generator" "^7.12.11" - "@babel/parser" "^7.12.11" - "@babel/preset-env" "^7.12.11" - "@babel/types" "^7.12.11" - "@mdx-js/mdx" "^1.6.22" - "@types/lodash" "^4.14.167" - js-string-escape "^1.0.1" - loader-utils "^2.0.0" - lodash "^4.17.21" - prettier ">=2.2.1 <=2.3.0" - ts-dedent "^2.0.0" - "@storybook/node-logger@6.5.4": version "6.5.4" resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.4.tgz#1887abd364fd401ac7b76b313f92f12005a28c6f" @@ -3748,24 +3681,24 @@ react-docgen-typescript "^2.1.1" tslib "^2.0.0" -"@storybook/react@^6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.5.4.tgz#54d947c79ed60aef8ae160332d5bce2e4281f40f" - integrity sha512-tZdoUc0TJ2HrE4iIHwNWjW/yJSM8+9uBE4U4rWmKjjqRk7jC0KGLxjPPgjGsJFx7iSdAurQlaZUW7cvcPuhz1w== +"@storybook/react@^6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.5.6.tgz#9b7ddc678790a8af100c26b8d47c332bc6f4fc84" + integrity sha512-lU2ggvZe9PbKWK4cbwHI6eDT7tlRAqdx489kLrfKhGTUVE8zhc/uosVEMpxbxS/zf1YYnXumr2DH1Uw2S3JeqA== dependencies: "@babel/preset-flow" "^7.12.1" "@babel/preset-react" "^7.12.10" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.3" - "@storybook/addons" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core" "6.5.4" - "@storybook/core-common" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core" "6.5.6" + "@storybook/core-common" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/docs-tools" "6.5.4" - "@storybook/node-logger" "6.5.4" + "@storybook/docs-tools" "6.5.6" + "@storybook/node-logger" "6.5.6" "@storybook/react-docgen-typescript-plugin" "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.4" + "@storybook/store" "6.5.6" "@types/estree" "^0.0.51" "@types/node" "^14.14.20 || ^16.0.0" "@types/webpack-env" "^1.16.0" @@ -3873,13 +3806,13 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/telemetry@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.4.tgz#810209e928449c2eab7e3bdf7dd6dbe0de8327b0" - integrity sha512-BKQajMd80mXHp/sE54I1JiusgvfZrnRqBbZW93slGNG3JyWpJLGOBH/KCp4iyu6Htbqssi+nvrxneUCT+wA6eQ== +"@storybook/telemetry@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.6.tgz#a7da1fa0019b307ceac24e65ff1e14ee0f36a8a5" + integrity sha512-l0vbStCgVA9u0ITvowZ1LNxmf32vAAdnPqSmB9DdA3ZO2wCpttW9rPyg1O4OV8c5uq7QJZ7mrKZ04p9SLo8wrw== dependencies: - "@storybook/client-logger" "6.5.4" - "@storybook/core-common" "6.5.4" + "@storybook/client-logger" "6.5.6" + "@storybook/core-common" "6.5.6" chalk "^4.1.0" core-js "^3.8.2" detect-package-manager "^2.0.1" @@ -3909,24 +3842,6 @@ core-js "^3.8.2" regenerator-runtime "^0.13.7" -"@storybook/ui@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.4.tgz#eb70602e78b871e6d762b43889b2dc7537a91331" - integrity sha512-+kMgNMcW7xma/H/O4LFzdxjX6GPfEEvOkm3HQDz0dJW7z/wtQVTgZKCA8gAVl+eNcNyRGzYRKOrOU0AzFfU7lw== - dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/channels" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/router" "6.5.4" - "@storybook/semver" "^7.3.2" - "@storybook/theming" "6.5.4" - core-js "^3.8.2" - regenerator-runtime "^0.13.7" - resolve-from "^5.0.0" - "@storybook/ui@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.6.tgz#3b312728c11d1bdba9cac41d18d91b6806496028" @@ -10413,10 +10328,10 @@ invariant@^2.2.2, invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -ip@^1.1.5: - version "1.1.7" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.7.tgz#4f6195d7bdb30435aac35301e7b993c6c8218c0d" - integrity sha512-SLm2ERgmBGag79RfrIknk+40ZOJCgUBpCQTl3WE2YER21VR0W3Vt/OAXXaYLSU0AIcBqWnytoTwk2ZcTbxH0xg== +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== ipaddr.js@1.9.1: version "1.9.1" From 8db8c1957be50d0fa6132c7b71faf9d40e834140 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:22:04 +0000 Subject: [PATCH 278/340] :arrow_up: Bump @storybook/addon-links from 6.5.4 to 6.5.6 Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 6.5.4 to 6.5.6. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/addons/links) --- updated-dependencies: - dependency-name: "@storybook/addon-links" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 1bdb1766..44602396 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -22,7 +22,7 @@ "@babel/plugin-proposal-private-property-in-object": "^7.17.12", "@storybook/addon-actions": "^6.5.6", "@storybook/addon-essentials": "^6.5.6", - "@storybook/addon-links": "^6.5.4", + "@storybook/addon-links": "^6.5.6", "@storybook/builder-webpack5": "^6.5.4", "@storybook/manager-webpack5": "^6.5.6", "@storybook/node-logger": "^6.5.6", diff --git a/yarn.lock b/yarn.lock index f50184c8..ec46283e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2828,16 +2828,16 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-links@^6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.4.tgz#51e2944ba2ba45d70b6debacbc0f5d8ad664f62b" - integrity sha512-mJcg4Gpo7P6TFdyWpE2DQcMwSjfotPST3y713Ircgc+sYOouIPRdrxGpdvhLWWncsC5wK/z2xZyYtBWPNiKN/g== +"@storybook/addon-links@^6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.6.tgz#1074d239c3c9c8b7168d20c9cc20b8918e4993a6" + integrity sha512-a4+9HLc6+M9qv5Fvezoc8AJYze8HDfHlsEFvCY1AtQiyVEmxFRNBdAp6w+/teNzihXWY78EKRcGM0jjyt+9mWg== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/router" "6.5.4" + "@storybook/router" "6.5.6" "@types/qs" "^6.9.5" core-js "^3.8.2" global "^4.4.0" From 38ce0ba08d4879dc287cf59460055807501ac05f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:26:47 +0000 Subject: [PATCH 279/340] :arrow_up: Bump reanalyze from 2.19.0 to 2.22.0 Bumps [reanalyze](https://github.com/cristianoc/reanalyze) from 2.19.0 to 2.22.0. - [Release notes](https://github.com/cristianoc/reanalyze/releases) - [Changelog](https://github.com/rescript-association/reanalyze/blob/master/Changes.md) - [Commits](https://github.com/cristianoc/reanalyze/compare/v2.19.0...v2.22.0) --- updated-dependencies: - dependency-name: reanalyze dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/squiggle-lang/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 5a5172f6..9568818f 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -57,7 +57,7 @@ "moduleserve": "^0.9.1", "nyc": "^15.1.0", "peggy": "^2.0.0", - "reanalyze": "^2.19.0", + "reanalyze": "^2.22.0", "rescript-fast-check": "^1.1.1", "ts-jest": "^27.1.4", "ts-loader": "^9.3.0", diff --git a/yarn.lock b/yarn.lock index f50184c8..cac0afb4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14918,10 +14918,10 @@ reading-time@^1.5.0: resolved "https://registry.yarnpkg.com/reading-time/-/reading-time-1.5.0.tgz#d2a7f1b6057cb2e169beaf87113cc3411b5bc5bb" integrity sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg== -reanalyze@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/reanalyze/-/reanalyze-2.19.0.tgz#b34b16bd7249a07dc931bb3cc58410247bb36a03" - integrity sha512-ycVr19BH6b2J70BmG6nUIzrFWiBNLUCmip6D2NEPLpnJimF6wagE+BIksI6vcTCovqWjgNMKhFCbZKwm+5/8VQ== +reanalyze@^2.22.0: + version "2.22.0" + resolved "https://registry.yarnpkg.com/reanalyze/-/reanalyze-2.22.0.tgz#068cfb354b6e9aa95ceb8dbb04329a67b4a90494" + integrity sha512-VNwTXBsyuUbCkmcb2GkYYjQxv3NQW4CombkNd+n5E+YWNqF5LLFi1N5bETR09C2hbuOE1fM6RTJKgbijZX7jyA== rechoir@^0.6.2: version "0.6.2" From 19663e47a6180502a0f50d8ce0ded3cf39a7c6bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:30:31 +0000 Subject: [PATCH 280/340] :arrow_up: Bump @docusaurus/preset-classic Bumps [@docusaurus/preset-classic](https://github.com/facebook/docusaurus/tree/HEAD/packages/docusaurus-preset-classic) from 2.0.0-beta.20 to 2.0.0-beta.21. - [Release notes](https://github.com/facebook/docusaurus/releases) - [Changelog](https://github.com/facebook/docusaurus/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/docusaurus/commits/v2.0.0-beta.21/packages/docusaurus-preset-classic) --- updated-dependencies: - dependency-name: "@docusaurus/preset-classic" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/website/package.json | 2 +- yarn.lock | 1976 +++++++++++++++++++++++++-------- 2 files changed, 1519 insertions(+), 459 deletions(-) diff --git a/packages/website/package.json b/packages/website/package.json index e07feb6f..158c1ff9 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@docusaurus/core": "2.0.0-beta.20", - "@docusaurus/preset-classic": "2.0.0-beta.20", + "@docusaurus/preset-classic": "2.0.0-beta.21", "@quri/squiggle-components": "^0.2.20", "clsx": "^1.1.1", "prism-react-renderer": "^1.3.3", diff --git a/yarn.lock b/yarn.lock index 14913a05..64b2d7f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,24 +2,17 @@ # yarn lockfile v1 -"@algolia/autocomplete-core@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.5.2.tgz#ec0178e07b44fd74a057728ac157291b26cecf37" - integrity sha512-DY0bhyczFSS1b/CqJlTE/nQRtnTAHl6IemIkBy0nEWnhDzRDdtdx4p5Uuk3vwAFxwEEgi1WqKwgSSMx6DpNL4A== +"@algolia/autocomplete-core@1.6.3": + version "1.6.3" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.6.3.tgz#76832fffb6405ac2c87bac5a040b8a31a1cdef80" + integrity sha512-dqQqRt01fX3YuVFrkceHsoCnzX0bLhrrg8itJI1NM68KjrPYQPYsE+kY8EZTCM4y8VDnhqJErR73xe/ZsV+qAA== dependencies: - "@algolia/autocomplete-shared" "1.5.2" + "@algolia/autocomplete-shared" "1.6.3" -"@algolia/autocomplete-preset-algolia@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.5.2.tgz#36c5638cc6dba6ea46a86e5a0314637ca40a77ca" - integrity sha512-3MRYnYQFJyovANzSX2CToS6/5cfVjbLLqFsZTKcvF3abhQzxbqwwaMBlJtt620uBUOeMzhdfasKhCc40+RHiZw== - dependencies: - "@algolia/autocomplete-shared" "1.5.2" - -"@algolia/autocomplete-shared@1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.5.2.tgz#e157f9ad624ab8fd940ff28bd2094cdf199cdd79" - integrity sha512-ylQAYv5H0YKMfHgVWX0j0NmL8XBcAeeeVQUmppnnMtzDbDnca6CzhKj3Q8eF9cHCgcdTDdb5K+3aKyGWA0obug== +"@algolia/autocomplete-shared@1.6.3": + version "1.6.3" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.6.3.tgz#52085ce89a755977841ed0a463aa31ce8f1dea97" + integrity sha512-UV46bnkTztyADFaETfzFC5ryIdGVb2zpAoYgu0tfcuYWjhg1KbLXveFffZIrGVoboqmAk1b+jMrl6iCja1i3lg== "@algolia/cache-browser-local-storage@4.13.0": version "4.13.0" @@ -28,11 +21,23 @@ dependencies: "@algolia/cache-common" "4.13.0" +"@algolia/cache-browser-local-storage@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.13.1.tgz#ffacb9230119f77de1a6f163b83680be999110e4" + integrity sha512-UAUVG2PEfwd/FfudsZtYnidJ9eSCpS+LW9cQiesePQLz41NAcddKxBak6eP2GErqyFagSlnVXe/w2E9h2m2ttg== + dependencies: + "@algolia/cache-common" "4.13.1" + "@algolia/cache-common@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.13.0.tgz#27b83fd3939d08d72261b36a07eeafc4cb4d2113" integrity sha512-f9mdZjskCui/dA/fA/5a+6hZ7xnHaaZI5tM/Rw9X8rRB39SUlF/+o3P47onZ33n/AwkpSbi5QOyhs16wHd55kA== +"@algolia/cache-common@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.13.1.tgz#c933fdec9f73b4f7c69d5751edc92eee4a63d76b" + integrity sha512-7Vaf6IM4L0Jkl3sYXbwK+2beQOgVJ0mKFbz/4qSxKd1iy2Sp77uTAazcX+Dlexekg1fqGUOSO7HS4Sx47ZJmjA== + "@algolia/cache-in-memory@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.13.0.tgz#10801a74550cbabb64b59ff08c56bce9c278ff2d" @@ -40,6 +45,13 @@ dependencies: "@algolia/cache-common" "4.13.0" +"@algolia/cache-in-memory@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.13.1.tgz#c19baa67b4597e1a93e987350613ab3b88768832" + integrity sha512-pZzybCDGApfA/nutsFK1P0Sbsq6fYJU3DwIvyKg4pURerlJM4qZbB9bfLRef0FkzfQu7W11E4cVLCIOWmyZeuQ== + dependencies: + "@algolia/cache-common" "4.13.1" + "@algolia/client-account@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.13.0.tgz#f8646dd40d1e9e3353e10abbd5d6c293ea92a8e2" @@ -49,6 +61,15 @@ "@algolia/client-search" "4.13.0" "@algolia/transporter" "4.13.0" +"@algolia/client-account@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.13.1.tgz#fea591943665477a23922ab31863ad0732e26c66" + integrity sha512-TFLiZ1KqMiir3FNHU+h3b0MArmyaHG+eT8Iojio6TdpeFcAQ1Aiy+2gb3SZk3+pgRJa/BxGmDkRUwE5E/lv3QQ== + dependencies: + "@algolia/client-common" "4.13.1" + "@algolia/client-search" "4.13.1" + "@algolia/transporter" "4.13.1" + "@algolia/client-analytics@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.13.0.tgz#a00bd02df45d71becb9dd4c5c993d805f2e1786d" @@ -59,6 +80,16 @@ "@algolia/requester-common" "4.13.0" "@algolia/transporter" "4.13.0" +"@algolia/client-analytics@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.13.1.tgz#5275956b2d0d16997148f2085f1701b6c39ecc32" + integrity sha512-iOS1JBqh7xaL5x00M5zyluZ9+9Uy9GqtYHv/2SMuzNW1qP7/0doz1lbcsP3S7KBbZANJTFHUOfuqyRLPk91iFA== + dependencies: + "@algolia/client-common" "4.13.1" + "@algolia/client-search" "4.13.1" + "@algolia/requester-common" "4.13.1" + "@algolia/transporter" "4.13.1" + "@algolia/client-common@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.13.0.tgz#8bc373d164dbdcce38b4586912bbe162492bcb86" @@ -67,6 +98,14 @@ "@algolia/requester-common" "4.13.0" "@algolia/transporter" "4.13.0" +"@algolia/client-common@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.13.1.tgz#3bf9e3586f20ef85bbb56ccca390f7dbe57c8f4f" + integrity sha512-LcDoUE0Zz3YwfXJL6lJ2OMY2soClbjrrAKB6auYVMNJcoKZZ2cbhQoFR24AYoxnGUYBER/8B+9sTBj5bj/Gqbg== + dependencies: + "@algolia/requester-common" "4.13.1" + "@algolia/transporter" "4.13.1" + "@algolia/client-personalization@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.13.0.tgz#10fb7af356422551f11a67222b39c52306f1512c" @@ -76,6 +115,15 @@ "@algolia/requester-common" "4.13.0" "@algolia/transporter" "4.13.0" +"@algolia/client-personalization@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.13.1.tgz#438a1f58576ef19c4ad4addb8417bdacfe2fce2e" + integrity sha512-1CqrOW1ypVrB4Lssh02hP//YxluoIYXAQCpg03L+/RiXJlCs+uIqlzC0ctpQPmxSlTK6h07kr50JQoYH/TIM9w== + dependencies: + "@algolia/client-common" "4.13.1" + "@algolia/requester-common" "4.13.1" + "@algolia/transporter" "4.13.1" + "@algolia/client-search@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.13.0.tgz#2d8ff8e755c4a37ec89968f3f9b358eed005c7f0" @@ -85,6 +133,15 @@ "@algolia/requester-common" "4.13.0" "@algolia/transporter" "4.13.0" +"@algolia/client-search@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.13.1.tgz#5501deed01e23c33d4aaa9f9eb96a849f0fce313" + integrity sha512-YQKYA83MNRz3FgTNM+4eRYbSmHi0WWpo019s5SeYcL3HUan/i5R09VO9dk3evELDFJYciiydSjbsmhBzbpPP2A== + dependencies: + "@algolia/client-common" "4.13.1" + "@algolia/requester-common" "4.13.1" + "@algolia/transporter" "4.13.1" + "@algolia/events@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@algolia/events/-/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950" @@ -95,6 +152,11 @@ resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.13.0.tgz#be2606e71aae618a1ff1ea9a1b5f5a74284b35a8" integrity sha512-8yqXk7rMtmQJ9wZiHOt/6d4/JDEg5VCk83gJ39I+X/pwUPzIsbKy9QiK4uJ3aJELKyoIiDT1hpYVt+5ia+94IA== +"@algolia/logger-common@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.13.1.tgz#4221378e701e3f1eacaa051bcd4ba1f25ddfaf4d" + integrity sha512-L6slbL/OyZaAXNtS/1A8SAbOJeEXD5JcZeDCPYDqSTYScfHu+2ePRTDMgUTY4gQ7HsYZ39N1LujOd8WBTmM2Aw== + "@algolia/logger-console@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.13.0.tgz#f28028a760e3d9191e28a10b12925e48f6c9afde" @@ -102,6 +164,13 @@ dependencies: "@algolia/logger-common" "4.13.0" +"@algolia/logger-console@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.13.1.tgz#423d358e4992dd4bceab0d9a4e99d1fd68107043" + integrity sha512-7jQOTftfeeLlnb3YqF8bNgA2GZht7rdKkJ31OCeSH2/61haO0tWPoNRjZq9XLlgMQZH276pPo0NdiArcYPHjCA== + dependencies: + "@algolia/logger-common" "4.13.1" + "@algolia/requester-browser-xhr@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.13.0.tgz#e2483f4e8d7f09e27cd0daf6c77711d15c5a919f" @@ -109,11 +178,23 @@ dependencies: "@algolia/requester-common" "4.13.0" +"@algolia/requester-browser-xhr@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.13.1.tgz#f8ea79233cf6f0392feaf31e35a6b40d68c5bc9e" + integrity sha512-oa0CKr1iH6Nc7CmU6RE7TnXMjHnlyp7S80pP/LvZVABeJHX3p/BcSCKovNYWWltgTxUg0U1o+2uuy8BpMKljwA== + dependencies: + "@algolia/requester-common" "4.13.1" + "@algolia/requester-common@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.13.0.tgz#47fb3464cfb26b55ba43676d13f295d812830596" integrity sha512-BRTDj53ecK+gn7ugukDWOOcBRul59C4NblCHqj4Zm5msd5UnHFjd/sGX+RLOEoFMhetILAnmg6wMrRrQVac9vw== +"@algolia/requester-common@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.13.1.tgz#daea143d15ab6ed3909c4c45877f1b6c36a16179" + integrity sha512-eGVf0ID84apfFEuXsaoSgIxbU3oFsIbz4XiotU3VS8qGCJAaLVUC5BUJEkiFENZIhon7hIB4d0RI13HY4RSA+w== + "@algolia/requester-node-http@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.13.0.tgz#7d981bbd31492f51dd11820a665f9d8906793c37" @@ -121,6 +202,13 @@ dependencies: "@algolia/requester-common" "4.13.0" +"@algolia/requester-node-http@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.13.1.tgz#32c63d4c009f22d97e396406de7af9b66fb8e89d" + integrity sha512-7C0skwtLdCz5heKTVe/vjvrqgL/eJxmiEjHqXdtypcE5GCQCYI15cb+wC4ytYioZDMiuDGeVYmCYImPoEgUGPw== + dependencies: + "@algolia/requester-common" "4.13.1" + "@algolia/transporter@4.13.0": version "4.13.0" resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.13.0.tgz#f6379e5329efa2127da68c914d1141f5f21dbd07" @@ -130,6 +218,15 @@ "@algolia/logger-common" "4.13.0" "@algolia/requester-common" "4.13.0" +"@algolia/transporter@4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.13.1.tgz#509e03e9145102843d5be4a031c521f692d4e8d6" + integrity sha512-pICnNQN7TtrcYJqqPEXByV8rJ8ZRU2hCiIKLTLRyNpghtQG3VAFk6fVtdzlNfdUGZcehSKGarPIZEHlQXnKjgw== + dependencies: + "@algolia/cache-common" "4.13.1" + "@algolia/logger-common" "4.13.1" + "@algolia/requester-common" "4.13.1" + "@ampproject/remapping@^2.1.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" @@ -202,6 +299,27 @@ json5 "^2.2.1" semver "^6.3.0" +"@babel/core@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876" + integrity sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ== + dependencies: + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.18.2" + "@babel/helper-compilation-targets" "^7.18.2" + "@babel/helper-module-transforms" "^7.18.0" + "@babel/helpers" "^7.18.2" + "@babel/parser" "^7.18.0" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.18.2" + "@babel/types" "^7.18.2" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.1" + semver "^6.3.0" + "@babel/eslint-parser@^7.16.3": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6" @@ -220,6 +338,15 @@ "@jridgewell/gen-mapping" "^0.1.0" jsesc "^2.5.1" +"@babel/generator@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d" + integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw== + dependencies: + "@babel/types" "^7.18.2" + "@jridgewell/gen-mapping" "^0.3.0" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" @@ -245,6 +372,16 @@ browserslist "^4.20.2" semver "^6.3.0" +"@babel/helper-compilation-targets@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz#67a85a10cbd5fc7f1457fec2e7f45441dc6c754b" + integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ== + dependencies: + "@babel/compat-data" "^7.17.10" + "@babel/helper-validator-option" "^7.16.7" + browserslist "^4.20.2" + semver "^6.3.0" + "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.12.tgz#d4f8393fc4838cbff6b7c199af5229aee16d07cf" @@ -258,6 +395,19 @@ "@babel/helper-replace-supers" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" +"@babel/helper-create-class-features-plugin@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz#fac430912606331cb075ea8d82f9a4c145a4da19" + integrity sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.17.9" + "@babel/helper-member-expression-to-functions" "^7.17.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-create-regexp-features-plugin@^7.16.7", "@babel/helper-create-regexp-features-plugin@^7.17.0": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" @@ -266,6 +416,14 @@ "@babel/helper-annotate-as-pure" "^7.16.7" regexpu-core "^5.0.1" +"@babel/helper-create-regexp-features-plugin@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz#bb37ca467f9694bbe55b884ae7a5cc1e0084e4fd" + integrity sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.7" + regexpu-core "^5.0.1" + "@babel/helper-define-polyfill-provider@^0.1.5": version "0.1.5" resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e" @@ -301,6 +459,11 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-environment-visitor@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd" + integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ== + "@babel/helper-explode-assignable-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" @@ -351,6 +514,20 @@ "@babel/traverse" "^7.17.3" "@babel/types" "^7.17.0" +"@babel/helper-module-transforms@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd" + integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA== + dependencies: + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-simple-access" "^7.17.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.18.0" + "@babel/types" "^7.18.0" + "@babel/helper-optimise-call-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" @@ -388,6 +565,17 @@ "@babel/traverse" "^7.16.7" "@babel/types" "^7.16.7" +"@babel/helper-replace-supers@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz#41fdfcc9abaf900e18ba6e5931816d9062a7b2e0" + integrity sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q== + dependencies: + "@babel/helper-environment-visitor" "^7.18.2" + "@babel/helper-member-expression-to-functions" "^7.17.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/traverse" "^7.18.2" + "@babel/types" "^7.18.2" + "@babel/helper-simple-access@^7.17.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" @@ -395,6 +583,13 @@ dependencies: "@babel/types" "^7.17.0" +"@babel/helper-simple-access@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9" + integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ== + dependencies: + "@babel/types" "^7.18.2" + "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" @@ -438,6 +633,15 @@ "@babel/traverse" "^7.17.9" "@babel/types" "^7.17.0" +"@babel/helpers@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384" + integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg== + dependencies: + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.18.2" + "@babel/types" "^7.18.2" + "@babel/highlight@^7.16.7": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3" @@ -452,6 +656,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.10.tgz#873b16db82a8909e0fbd7f115772f4b739f6ce78" integrity sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ== +"@babel/parser@^7.18.0", "@babel/parser@^7.18.3": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef" + integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" @@ -459,6 +668,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e" + integrity sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" @@ -468,6 +684,15 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-proposal-optional-chaining" "^7.16.7" +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz#0d498ec8f0374b1e2eb54b9cb2c4c78714c77753" + integrity sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/plugin-proposal-optional-chaining" "^7.17.12" + "@babel/plugin-proposal-async-generator-functions@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" @@ -477,6 +702,15 @@ "@babel/helper-remap-async-to-generator" "^7.16.8" "@babel/plugin-syntax-async-generators" "^7.8.4" +"@babel/plugin-proposal-async-generator-functions@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz#094a417e31ce7e692d84bab06c8e2a607cbeef03" + integrity sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-remap-async-to-generator" "^7.16.8" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" @@ -485,6 +719,14 @@ "@babel/helper-create-class-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-proposal-class-properties@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz#84f65c0cc247d46f40a6da99aadd6438315d80a4" + integrity sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.17.12" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-proposal-class-static-block@^7.17.6": version "7.17.6" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c" @@ -494,6 +736,15 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" +"@babel/plugin-proposal-class-static-block@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz#7d02253156e3c3793bdb9f2faac3a1c05f0ba710" + integrity sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-proposal-decorators@^7.12.12", "@babel/plugin-proposal-decorators@^7.16.4": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz#67a1653be9c77ce5b6c318aa90c8287b87831619" @@ -530,6 +781,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" +"@babel/plugin-proposal-export-namespace-from@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz#b22864ccd662db9606edb2287ea5fd1709f05378" + integrity sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-proposal-json-strings@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" @@ -538,6 +797,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-json-strings" "^7.8.3" +"@babel/plugin-proposal-json-strings@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz#f4642951792437233216d8c1af370bb0fbff4664" + integrity sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-proposal-logical-assignment-operators@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" @@ -546,6 +813,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" +"@babel/plugin-proposal-logical-assignment-operators@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz#c64a1bcb2b0a6d0ed2ff674fd120f90ee4b88a23" + integrity sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" @@ -554,6 +829,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" +"@babel/plugin-proposal-nullish-coalescing-operator@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz#1e93079bbc2cbc756f6db6a1925157c4a92b94be" + integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-proposal-numeric-separator@^7.16.0", "@babel/plugin-proposal-numeric-separator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" @@ -582,6 +865,17 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.16.7" +"@babel/plugin-proposal-object-rest-spread@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz#79f2390c892ba2a68ec112eb0d895cfbd11155e8" + integrity sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw== + dependencies: + "@babel/compat-data" "^7.17.10" + "@babel/helper-compilation-targets" "^7.17.10" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.17.12" + "@babel/plugin-proposal-optional-catch-binding@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" @@ -599,6 +893,15 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" +"@babel/plugin-proposal-optional-chaining@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz#f96949e9bacace3a9066323a5cf90cfb9de67174" + integrity sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-proposal-private-methods@^7.12.1", "@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.16.11": version "7.16.11" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" @@ -607,6 +910,14 @@ "@babel/helper-create-class-features-plugin" "^7.16.10" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-proposal-private-methods@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz#c2ca3a80beb7539289938da005ad525a038a819c" + integrity sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.17.12" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-proposal-private-property-in-object@^7.12.1", "@babel/plugin-proposal-private-property-in-object@^7.16.7", "@babel/plugin-proposal-private-property-in-object@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d" @@ -625,6 +936,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-proposal-unicode-property-regex@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz#3dbd7a67bd7f94c8238b394da112d86aaf32ad4d" + integrity sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.17.12" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" @@ -688,6 +1007,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-syntax-import-assertions@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz#58096a92b11b2e4e54b24c6a0cc0e5e607abcedd" + integrity sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" @@ -716,6 +1042,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-syntax-jsx@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz#834035b45061983a491f60096f61a2e7c5674a47" + integrity sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" @@ -779,6 +1112,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-syntax-typescript@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz#b54fc3be6de734a56b87508f99d6428b5b605a7b" + integrity sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" @@ -786,6 +1126,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-arrow-functions@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz#dddd783b473b1b1537ef46423e3944ff24898c45" + integrity sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-async-to-generator@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" @@ -795,6 +1142,15 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-remap-async-to-generator" "^7.16.8" +"@babel/plugin-transform-async-to-generator@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz#dbe5511e6b01eee1496c944e35cdfe3f58050832" + integrity sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ== + dependencies: + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-remap-async-to-generator" "^7.16.8" + "@babel/plugin-transform-block-scoped-functions@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" @@ -809,6 +1165,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-block-scoping@^7.17.12": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz#7988627b3e9186a13e4d7735dc9c34a056613fb9" + integrity sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" @@ -823,6 +1186,20 @@ "@babel/helper-split-export-declaration" "^7.16.7" globals "^11.1.0" +"@babel/plugin-transform-classes@^7.17.12": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz#51310b812a090b846c784e47087fa6457baef814" + integrity sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.18.2" + "@babel/helper-function-name" "^7.17.9" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-replace-supers" "^7.18.2" + "@babel/helper-split-export-declaration" "^7.16.7" + globals "^11.1.0" + "@babel/plugin-transform-computed-properties@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" @@ -830,6 +1207,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-computed-properties@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz#bca616a83679698f3258e892ed422546e531387f" + integrity sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.17.7": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1" @@ -837,6 +1221,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-destructuring@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz#dc4f92587e291b4daa78aa20cc2d7a63aa11e858" + integrity sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" @@ -852,6 +1243,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-duplicate-keys@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz#a09aa709a3310013f8e48e0e23bc7ace0f21477c" + integrity sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-exponentiation-operator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" @@ -875,6 +1273,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-for-of@^7.18.1": + version "7.18.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz#ed14b657e162b72afbbb2b4cdad277bf2bb32036" + integrity sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-function-name@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" @@ -891,6 +1296,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-literals@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz#97131fbc6bbb261487105b4b3edbf9ebf9c830ae" + integrity sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-member-expression-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" @@ -907,6 +1319,15 @@ "@babel/helper-plugin-utils" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" +"@babel/plugin-transform-modules-amd@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz#7ef1002e67e36da3155edc8bf1ac9398064c02ed" + integrity sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA== + dependencies: + "@babel/helper-module-transforms" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" + babel-plugin-dynamic-import-node "^2.3.3" + "@babel/plugin-transform-modules-commonjs@^7.17.9": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6" @@ -917,6 +1338,16 @@ "@babel/helper-simple-access" "^7.17.7" babel-plugin-dynamic-import-node "^2.3.3" +"@babel/plugin-transform-modules-commonjs@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz#1aa8efa2e2a6e818b6a7f2235fceaf09bdb31e9e" + integrity sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ== + dependencies: + "@babel/helper-module-transforms" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-simple-access" "^7.18.2" + babel-plugin-dynamic-import-node "^2.3.3" + "@babel/plugin-transform-modules-systemjs@^7.17.8": version "7.17.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859" @@ -928,6 +1359,17 @@ "@babel/helper-validator-identifier" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" +"@babel/plugin-transform-modules-systemjs@^7.18.0": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz#3d6fd9868c735cce8f38d6ae3a407fb7e61e6d46" + integrity sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg== + dependencies: + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-module-transforms" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-validator-identifier" "^7.16.7" + babel-plugin-dynamic-import-node "^2.3.3" + "@babel/plugin-transform-modules-umd@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" @@ -936,6 +1378,14 @@ "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-modules-umd@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz#56aac64a2c2a1922341129a4597d1fd5c3ff020f" + integrity sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA== + dependencies: + "@babel/helper-module-transforms" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-named-capturing-groups-regex@^7.17.10": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.10.tgz#715dbcfafdb54ce8bccd3d12e8917296a4ba66a4" @@ -943,6 +1393,14 @@ dependencies: "@babel/helper-create-regexp-features-plugin" "^7.17.0" +"@babel/plugin-transform-named-capturing-groups-regex@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz#9c4a5a5966e0434d515f2675c227fd8cc8606931" + integrity sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.17.12" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-new-target@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" @@ -950,6 +1408,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-new-target@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz#10842cd605a620944e81ea6060e9e65c265742e3" + integrity sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-object-super@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" @@ -965,6 +1430,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-parameters@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz#eb467cd9586ff5ff115a9880d6fdbd4a846b7766" + integrity sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-property-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" @@ -1004,6 +1476,17 @@ "@babel/plugin-syntax-jsx" "^7.16.7" "@babel/types" "^7.17.0" +"@babel/plugin-transform-react-jsx@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz#2aa20022709cd6a3f40b45d60603d5f269586dba" + integrity sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-jsx" "^7.17.12" + "@babel/types" "^7.17.12" + "@babel/plugin-transform-react-pure-annotations@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67" @@ -1019,6 +1502,14 @@ dependencies: regenerator-transform "^0.15.0" +"@babel/plugin-transform-regenerator@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz#44274d655eb3f1af3f3a574ba819d3f48caf99d5" + integrity sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + regenerator-transform "^0.15.0" + "@babel/plugin-transform-reserved-words@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" @@ -1026,6 +1517,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-reserved-words@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz#7dbd349f3cdffba751e817cf40ca1386732f652f" + integrity sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-runtime@^7.16.4", "@babel/plugin-transform-runtime@^7.17.10": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.10.tgz#b89d821c55d61b5e3d3c3d1d636d8d5a81040ae1" @@ -1038,6 +1536,18 @@ babel-plugin-polyfill-regenerator "^0.3.0" semver "^6.3.0" +"@babel/plugin-transform-runtime@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.2.tgz#04637de1e45ae8847ff14b9beead09c33d34374d" + integrity sha512-mr1ufuRMfS52ttq+1G1PD8OJNqgcTFjq3hwn8SZ5n1x1pBhi0E36rYMdTK0TsKtApJ4lDEdfXJwtGobQMHSMPg== + dependencies: + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.17.12" + babel-plugin-polyfill-corejs2 "^0.3.0" + babel-plugin-polyfill-corejs3 "^0.5.0" + babel-plugin-polyfill-regenerator "^0.3.0" + semver "^6.3.0" + "@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" @@ -1053,6 +1563,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" +"@babel/plugin-transform-spread@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz#c112cad3064299f03ea32afed1d659223935d1f5" + integrity sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/plugin-transform-sticky-regex@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" @@ -1067,6 +1585,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-template-literals@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz#31ed6915721864847c48b656281d0098ea1add28" + integrity sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-typeof-symbol@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" @@ -1074,6 +1599,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-typeof-symbol@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz#0f12f57ac35e98b35b4ed34829948d42bd0e6889" + integrity sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-typescript@^7.16.7": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0" @@ -1083,6 +1615,15 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-typescript" "^7.16.7" +"@babel/plugin-transform-typescript@^7.17.12": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz#587eaf6a39edb8c06215e550dc939faeadd750bf" + integrity sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-typescript" "^7.17.12" + "@babel/plugin-transform-unicode-escapes@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" @@ -1178,6 +1719,87 @@ core-js-compat "^3.22.1" semver "^6.3.0" +"@babel/preset-env@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.2.tgz#f47d3000a098617926e674c945d95a28cb90977a" + integrity sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q== + dependencies: + "@babel/compat-data" "^7.17.10" + "@babel/helper-compilation-targets" "^7.18.2" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.17.12" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.17.12" + "@babel/plugin-proposal-async-generator-functions" "^7.17.12" + "@babel/plugin-proposal-class-properties" "^7.17.12" + "@babel/plugin-proposal-class-static-block" "^7.18.0" + "@babel/plugin-proposal-dynamic-import" "^7.16.7" + "@babel/plugin-proposal-export-namespace-from" "^7.17.12" + "@babel/plugin-proposal-json-strings" "^7.17.12" + "@babel/plugin-proposal-logical-assignment-operators" "^7.17.12" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.17.12" + "@babel/plugin-proposal-numeric-separator" "^7.16.7" + "@babel/plugin-proposal-object-rest-spread" "^7.18.0" + "@babel/plugin-proposal-optional-catch-binding" "^7.16.7" + "@babel/plugin-proposal-optional-chaining" "^7.17.12" + "@babel/plugin-proposal-private-methods" "^7.17.12" + "@babel/plugin-proposal-private-property-in-object" "^7.17.12" + "@babel/plugin-proposal-unicode-property-regex" "^7.17.12" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.14.5" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-syntax-import-assertions" "^7.17.12" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-syntax-top-level-await" "^7.14.5" + "@babel/plugin-transform-arrow-functions" "^7.17.12" + "@babel/plugin-transform-async-to-generator" "^7.17.12" + "@babel/plugin-transform-block-scoped-functions" "^7.16.7" + "@babel/plugin-transform-block-scoping" "^7.17.12" + "@babel/plugin-transform-classes" "^7.17.12" + "@babel/plugin-transform-computed-properties" "^7.17.12" + "@babel/plugin-transform-destructuring" "^7.18.0" + "@babel/plugin-transform-dotall-regex" "^7.16.7" + "@babel/plugin-transform-duplicate-keys" "^7.17.12" + "@babel/plugin-transform-exponentiation-operator" "^7.16.7" + "@babel/plugin-transform-for-of" "^7.18.1" + "@babel/plugin-transform-function-name" "^7.16.7" + "@babel/plugin-transform-literals" "^7.17.12" + "@babel/plugin-transform-member-expression-literals" "^7.16.7" + "@babel/plugin-transform-modules-amd" "^7.18.0" + "@babel/plugin-transform-modules-commonjs" "^7.18.2" + "@babel/plugin-transform-modules-systemjs" "^7.18.0" + "@babel/plugin-transform-modules-umd" "^7.18.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.17.12" + "@babel/plugin-transform-new-target" "^7.17.12" + "@babel/plugin-transform-object-super" "^7.16.7" + "@babel/plugin-transform-parameters" "^7.17.12" + "@babel/plugin-transform-property-literals" "^7.16.7" + "@babel/plugin-transform-regenerator" "^7.18.0" + "@babel/plugin-transform-reserved-words" "^7.17.12" + "@babel/plugin-transform-shorthand-properties" "^7.16.7" + "@babel/plugin-transform-spread" "^7.17.12" + "@babel/plugin-transform-sticky-regex" "^7.16.7" + "@babel/plugin-transform-template-literals" "^7.18.2" + "@babel/plugin-transform-typeof-symbol" "^7.17.12" + "@babel/plugin-transform-unicode-escapes" "^7.16.7" + "@babel/plugin-transform-unicode-regex" "^7.16.7" + "@babel/preset-modules" "^0.1.5" + "@babel/types" "^7.18.2" + babel-plugin-polyfill-corejs2 "^0.3.0" + babel-plugin-polyfill-corejs3 "^0.5.0" + babel-plugin-polyfill-regenerator "^0.3.0" + core-js-compat "^3.22.1" + semver "^6.3.0" + "@babel/preset-flow@^7.12.1": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.16.7.tgz#7fd831323ab25eeba6e4b77a589f680e30581cbd" @@ -1210,6 +1832,18 @@ "@babel/plugin-transform-react-jsx-development" "^7.16.7" "@babel/plugin-transform-react-pure-annotations" "^7.16.7" +"@babel/preset-react@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.17.12.tgz#62adbd2d1870c0de3893095757ed5b00b492ab3d" + integrity sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-transform-react-display-name" "^7.16.7" + "@babel/plugin-transform-react-jsx" "^7.17.12" + "@babel/plugin-transform-react-jsx-development" "^7.16.7" + "@babel/plugin-transform-react-pure-annotations" "^7.16.7" + "@babel/preset-typescript@^7.12.7", "@babel/preset-typescript@^7.15.0", "@babel/preset-typescript@^7.16.0", "@babel/preset-typescript@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9" @@ -1219,6 +1853,15 @@ "@babel/helper-validator-option" "^7.16.7" "@babel/plugin-transform-typescript" "^7.16.7" +"@babel/preset-typescript@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz#40269e0a0084d56fc5731b6c40febe1c9a4a3e8c" + integrity sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-transform-typescript" "^7.17.12" + "@babel/register@^7.12.1": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.17.7.tgz#5eef3e0f4afc07e25e847720e7b987ae33f08d0b" @@ -1238,7 +1881,15 @@ core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime-corejs3@^7.18.3": + version "7.18.3" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.18.3.tgz#52f0241a31e0ec61a6187530af6227c2846bd60c" + integrity sha512-l4ddFwrc9rnR+EJsHsh+TJ4A35YqQz/UqcjtlX2ov53hlJYG5CxtQmNZxyajwDVmCxwy++rtvGU5HazCK4W41Q== + dependencies: + core-js-pure "^3.20.2" + regenerator-runtime "^0.13.4" + +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.17.9", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.18.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4" integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug== @@ -1270,6 +1921,22 @@ debug "^4.1.0" globals "^11.1.0" +"@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz#b77a52604b5cc836a9e1e08dca01cba67a12d2e8" + integrity sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA== + dependencies: + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.18.2" + "@babel/helper-environment-visitor" "^7.18.2" + "@babel/helper-function-name" "^7.17.9" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/parser" "^7.18.0" + "@babel/types" "^7.18.2" + debug "^4.1.0" + globals "^11.1.0" + "@babel/types@^7.0.0", "@babel/types@^7.12.11", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.10", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.10.tgz#d35d7b4467e439fcf06d195f8100e0fea7fc82c4" @@ -1278,6 +1945,14 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" +"@babel/types@^7.17.12", "@babel/types@^7.18.0", "@babel/types@^7.18.2": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354" + integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw== + dependencies: + "@babel/helper-validator-identifier" "^7.16.7" + to-fast-properties "^2.0.0" + "@base2/pretty-print-object@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz#371ba8be66d556812dc7fb169ebc3c08378f69d4" @@ -1389,19 +2064,18 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@docsearch/css@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.0.0.tgz#fe57b474802ffd706d3246eab25d52fac8aa3698" - integrity sha512-1kkV7tkAsiuEd0shunYRByKJe3xQDG2q7wYg24SOw1nV9/2lwEd4WrUYRJC/ukGTl2/kHeFxsaUvtiOy0y6fFA== +"@docsearch/css@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.1.0.tgz#6781cad43fc2e034d012ee44beddf8f93ba21f19" + integrity sha512-bh5IskwkkodbvC0FzSg1AxMykfDl95hebEKwxNoq4e5QaGzOXSBgW8+jnMFZ7JU4sTBiB04vZWoUSzNrPboLZA== -"@docsearch/react@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.0.0.tgz#d02ebdc67573412185a6a4df13bc254c7c0da491" - integrity sha512-yhMacqS6TVQYoBh/o603zszIb5Bl8MIXuOc6Vy617I74pirisDzzcNh0NEaYQt50fVVR3khUbeEhUEWEWipESg== +"@docsearch/react@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.1.0.tgz#da943a64c01ee82b04e53b691806469272f943f7" + integrity sha512-bjB6ExnZzf++5B7Tfoi6UXgNwoUnNOfZ1NyvnvPhWgCMy5V/biAtLL4o7owmZSYdAKeFSvZ5Lxm0is4su/dBWg== dependencies: - "@algolia/autocomplete-core" "1.5.2" - "@algolia/autocomplete-preset-algolia" "1.5.2" - "@docsearch/css" "3.0.0" + "@algolia/autocomplete-core" "1.6.3" + "@docsearch/css" "3.1.0" algoliasearch "^4.0.0" "@docusaurus/core@2.0.0-beta.20": @@ -1481,6 +2155,84 @@ webpack-merge "^5.8.0" webpackbar "^5.0.2" +"@docusaurus/core@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.21.tgz#50897317b22dbd94b1bf91bb30c2a0fddd15a806" + integrity sha512-qysDMVp1M5UozK3u/qOxsEZsHF7jeBvJDS+5ItMPYmNKvMbNKeYZGA0g6S7F9hRDwjIlEbvo7BaX0UMDcmTAWA== + dependencies: + "@babel/core" "^7.18.2" + "@babel/generator" "^7.18.2" + "@babel/plugin-syntax-dynamic-import" "^7.8.3" + "@babel/plugin-transform-runtime" "^7.18.2" + "@babel/preset-env" "^7.18.2" + "@babel/preset-react" "^7.17.12" + "@babel/preset-typescript" "^7.17.12" + "@babel/runtime" "^7.18.3" + "@babel/runtime-corejs3" "^7.18.3" + "@babel/traverse" "^7.18.2" + "@docusaurus/cssnano-preset" "2.0.0-beta.21" + "@docusaurus/logger" "2.0.0-beta.21" + "@docusaurus/mdx-loader" "2.0.0-beta.21" + "@docusaurus/react-loadable" "5.5.2" + "@docusaurus/utils" "2.0.0-beta.21" + "@docusaurus/utils-common" "2.0.0-beta.21" + "@docusaurus/utils-validation" "2.0.0-beta.21" + "@slorber/static-site-generator-webpack-plugin" "^4.0.4" + "@svgr/webpack" "^6.2.1" + autoprefixer "^10.4.7" + babel-loader "^8.2.5" + babel-plugin-dynamic-import-node "^2.3.3" + boxen "^6.2.1" + chalk "^4.1.2" + chokidar "^3.5.3" + clean-css "^5.3.0" + cli-table3 "^0.6.2" + combine-promises "^1.1.0" + commander "^5.1.0" + copy-webpack-plugin "^11.0.0" + core-js "^3.22.7" + css-loader "^6.7.1" + css-minimizer-webpack-plugin "^4.0.0" + cssnano "^5.1.9" + del "^6.1.1" + detect-port "^1.3.0" + escape-html "^1.0.3" + eta "^1.12.3" + file-loader "^6.2.0" + fs-extra "^10.1.0" + html-minifier-terser "^6.1.0" + html-tags "^3.2.0" + html-webpack-plugin "^5.5.0" + import-fresh "^3.3.0" + leven "^3.1.0" + lodash "^4.17.21" + mini-css-extract-plugin "^2.6.0" + postcss "^8.4.14" + postcss-loader "^7.0.0" + prompts "^2.4.2" + react-dev-utils "^12.0.1" + react-helmet-async "^1.3.0" + react-loadable "npm:@docusaurus/react-loadable@5.5.2" + react-loadable-ssr-addon-v5-slorber "^1.0.1" + react-router "^5.3.3" + react-router-config "^5.1.1" + react-router-dom "^5.3.3" + remark-admonitions "^1.2.1" + rtl-detect "^1.0.4" + semver "^7.3.7" + serve-handler "^6.1.3" + shelljs "^0.8.5" + terser-webpack-plugin "^5.3.1" + tslib "^2.4.0" + update-notifier "^5.1.0" + url-loader "^4.1.1" + wait-on "^6.0.1" + webpack "^5.72.1" + webpack-bundle-analyzer "^4.5.0" + webpack-dev-server "^4.9.0" + webpack-merge "^5.8.0" + webpackbar "^5.0.2" + "@docusaurus/cssnano-preset@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.20.tgz#c47722e347fd044f2372e924199eabf61733232f" @@ -1490,6 +2242,16 @@ postcss "^8.4.13" postcss-sort-media-queries "^4.2.1" +"@docusaurus/cssnano-preset@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.21.tgz#38113877a5857c3f9d493522085d20909dcec474" + integrity sha512-fhTZrg1vc6zYYZIIMXpe1TnEVGEjqscBo0s1uomSwKjjtMgu7wkzc1KKJYY7BndsSA+fVVkZ+OmL/kAsmK7xxw== + dependencies: + cssnano-preset-advanced "^5.3.5" + postcss "^8.4.14" + postcss-sort-media-queries "^4.2.1" + tslib "^2.4.0" + "@docusaurus/logger@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.20.tgz#bb49e8516e48082ab96bca11569a18541476d5a6" @@ -1498,6 +2260,14 @@ chalk "^4.1.2" tslib "^2.4.0" +"@docusaurus/logger@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.21.tgz#f6ab4133917965349ae03fd9111a940b24d4fd12" + integrity sha512-HTFp8FsSMrAj7Uxl5p72U+P7rjYU/LRRBazEoJbs9RaqoKEdtZuhv8MYPOCh46K9TekaoquRYqag2o23Qt4ggA== + dependencies: + chalk "^4.1.2" + tslib "^2.4.0" + "@docusaurus/mdx-loader@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.20.tgz#7016e8ce7e4a11c9ea458e2236d3c93af71f393f" @@ -1520,29 +2290,51 @@ url-loader "^4.1.1" webpack "^5.72.0" -"@docusaurus/module-type-aliases@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.0.0-beta.20.tgz#669605a64b04226c391e0284c44743e137eb2595" - integrity sha512-lUIXLwQEOyYwcb3iCNibPUL6O9ijvYF5xQwehGeVraTEBts/Ch8ZwELFk+XbaGHKh52PiVxuWL2CP4Gdjy5QKw== +"@docusaurus/mdx-loader@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.21.tgz#52af341e21f22be882d2155a7349bea10f5d77a3" + integrity sha512-AI+4obJnpOaBOAYV6df2ux5Y1YJCBS+MhXFf0yhED12sVLJi2vffZgdamYd/d/FwvWDw6QLs/VD2jebd7P50yQ== dependencies: - "@docusaurus/types" "2.0.0-beta.20" + "@babel/parser" "^7.18.3" + "@babel/traverse" "^7.18.2" + "@docusaurus/logger" "2.0.0-beta.21" + "@docusaurus/utils" "2.0.0-beta.21" + "@mdx-js/mdx" "^1.6.22" + escape-html "^1.0.3" + file-loader "^6.2.0" + fs-extra "^10.1.0" + image-size "^1.0.1" + mdast-util-to-string "^2.0.0" + remark-emoji "^2.2.0" + stringify-object "^3.3.0" + tslib "^2.4.0" + unist-util-visit "^2.0.3" + url-loader "^4.1.1" + webpack "^5.72.1" + +"@docusaurus/module-type-aliases@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.0.0-beta.21.tgz#345f1c1a99407775d1d3ffc1a90c2df93d50a9b8" + integrity sha512-gRkWICgQZiqSJgrwRKWjXm5gAB+9IcfYdUbCG0PRPP/G8sNs9zBIOY4uT4Z5ox2CWFEm44U3RTTxj7BiLVMBXw== + dependencies: + "@docusaurus/types" "2.0.0-beta.21" "@types/react" "*" "@types/react-router-config" "*" "@types/react-router-dom" "*" react-helmet-async "*" -"@docusaurus/plugin-content-blog@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.20.tgz#7c0d413ac8df9a422a0b3ddd90b77ec491bbda15" - integrity sha512-6aby36Gmny5h2oo/eEZ2iwVsIlBWbRnNNeqT0BYnJO5aj53iCU/ctFPpJVYcw0l2l8+8ITS70FyePIWEsaZ0jA== +"@docusaurus/plugin-content-blog@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.21.tgz#86211deeea901ddcd77ca387778e121e93ee8d01" + integrity sha512-IP21yJViP3oBmgsWBU5LhrG1MZXV4mYCQSoCAboimESmy1Z11RCNP2tXaqizE3iTmXOwZZL+SNBk06ajKCEzWg== dependencies: - "@docusaurus/core" "2.0.0-beta.20" - "@docusaurus/logger" "2.0.0-beta.20" - "@docusaurus/mdx-loader" "2.0.0-beta.20" - "@docusaurus/utils" "2.0.0-beta.20" - "@docusaurus/utils-common" "2.0.0-beta.20" - "@docusaurus/utils-validation" "2.0.0-beta.20" - cheerio "^1.0.0-rc.10" + "@docusaurus/core" "2.0.0-beta.21" + "@docusaurus/logger" "2.0.0-beta.21" + "@docusaurus/mdx-loader" "2.0.0-beta.21" + "@docusaurus/utils" "2.0.0-beta.21" + "@docusaurus/utils-common" "2.0.0-beta.21" + "@docusaurus/utils-validation" "2.0.0-beta.21" + cheerio "^1.0.0-rc.11" feed "^4.2.2" fs-extra "^10.1.0" lodash "^4.17.21" @@ -1551,18 +2343,18 @@ tslib "^2.4.0" unist-util-visit "^2.0.3" utility-types "^3.10.0" - webpack "^5.72.0" + webpack "^5.72.1" -"@docusaurus/plugin-content-docs@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.20.tgz#2a53b9fc355f45bf7c6917f19be7bfa0698b8b9e" - integrity sha512-XOgwUqXtr/DStpB3azdN6wgkKtQkOXOx1XetORzhHnjihrSMn6daxg+spmcJh1ki/mpT3n7yBbKJxVNo+VB38Q== +"@docusaurus/plugin-content-docs@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.21.tgz#b3171fa9aed99e367b6eb7111187bd0e3dcf2949" + integrity sha512-aa4vrzJy4xRy81wNskyhE3wzRf3AgcESZ1nfKh8xgHUkT7fDTZ1UWlg50Jb3LBCQFFyQG2XQB9N6llskI/KUnw== dependencies: - "@docusaurus/core" "2.0.0-beta.20" - "@docusaurus/logger" "2.0.0-beta.20" - "@docusaurus/mdx-loader" "2.0.0-beta.20" - "@docusaurus/utils" "2.0.0-beta.20" - "@docusaurus/utils-validation" "2.0.0-beta.20" + "@docusaurus/core" "2.0.0-beta.21" + "@docusaurus/logger" "2.0.0-beta.21" + "@docusaurus/mdx-loader" "2.0.0-beta.21" + "@docusaurus/utils" "2.0.0-beta.21" + "@docusaurus/utils-validation" "2.0.0-beta.21" combine-promises "^1.1.0" fs-extra "^10.1.0" import-fresh "^3.3.0" @@ -1571,80 +2363,81 @@ remark-admonitions "^1.2.1" tslib "^2.4.0" utility-types "^3.10.0" - webpack "^5.72.0" + webpack "^5.72.1" -"@docusaurus/plugin-content-pages@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.20.tgz#6a76c7fa049983d2d94d8c4d738802acf01611fe" - integrity sha512-ubY6DG4F0skFKjfNGCbfO34Qf+MZy6C05OtpIYsoA2YU8ADx0nRH7qPgdEkwR3ma860DbY612rleRT13ogSlhg== +"@docusaurus/plugin-content-pages@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.21.tgz#df6b4c5c4cde8a0ea491a30002e84941ca7bf0cf" + integrity sha512-DmXOXjqNI+7X5hISzCvt54QIK6XBugu2MOxjxzuqI7q92Lk/EVdraEj5mthlH8IaEH/VlpWYJ1O9TzLqX5vH2g== dependencies: - "@docusaurus/core" "2.0.0-beta.20" - "@docusaurus/mdx-loader" "2.0.0-beta.20" - "@docusaurus/utils" "2.0.0-beta.20" - "@docusaurus/utils-validation" "2.0.0-beta.20" + "@docusaurus/core" "2.0.0-beta.21" + "@docusaurus/mdx-loader" "2.0.0-beta.21" + "@docusaurus/utils" "2.0.0-beta.21" + "@docusaurus/utils-validation" "2.0.0-beta.21" fs-extra "^10.1.0" remark-admonitions "^1.2.1" tslib "^2.4.0" - webpack "^5.72.0" + webpack "^5.72.1" -"@docusaurus/plugin-debug@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.20.tgz#7c026e81c45fd4f00801a785c928b9e8727a99de" - integrity sha512-acGZmpncPA1XDczpV1ji1ajBCRBY/H2lXN8alSjOB1vh0c/2Qz+KKD05p17lsUbhIyvsnZBa/BaOwtek91Lu7Q== +"@docusaurus/plugin-debug@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.21.tgz#dfa212fd90fe2f54439aacdc8c143e8ce96b0d27" + integrity sha512-P54J4q4ecsyWW0Jy4zbimSIHna999AfbxpXGmF1IjyHrjoA3PtuakV1Ai51XrGEAaIq9q6qMQkEhbUd3CffGAw== dependencies: - "@docusaurus/core" "2.0.0-beta.20" - "@docusaurus/utils" "2.0.0-beta.20" + "@docusaurus/core" "2.0.0-beta.21" + "@docusaurus/utils" "2.0.0-beta.21" fs-extra "^10.1.0" react-json-view "^1.21.3" tslib "^2.4.0" -"@docusaurus/plugin-google-analytics@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.20.tgz#c1bdbc1239f987f9716fa30c2fd86962c190a765" - integrity sha512-4C5nY25j0R1lntFmpSEalhL7jYA7tWvk0VZObiIxGilLagT/f9gWPQtIjNBe4yzdQvkhiaXpa8xcMcJUAKRJyw== +"@docusaurus/plugin-google-analytics@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.21.tgz#5475c58fb23603badf41d84298569f6c46b4e6b2" + integrity sha512-+5MS0PeGaJRgPuNZlbd/WMdQSpOACaxEz7A81HAxm6kE+tIASTW3l8jgj1eWFy/PGPzaLnQrEjxI1McAfnYmQw== dependencies: - "@docusaurus/core" "2.0.0-beta.20" - "@docusaurus/utils-validation" "2.0.0-beta.20" + "@docusaurus/core" "2.0.0-beta.21" + "@docusaurus/utils-validation" "2.0.0-beta.21" tslib "^2.4.0" -"@docusaurus/plugin-google-gtag@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.20.tgz#7284bcfad9cb4e5d63605e95f6da73ca8ac8f053" - integrity sha512-EMZdiMTNg4NwE60xwjbetcqMDqAOazMTwQAQ4OuNAclv7oh8+VPCvqRF8s8AxCoI2Uqc7vh8yzNUuM307Ne9JA== +"@docusaurus/plugin-google-gtag@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.21.tgz#a4a101089994a7103c1cc7cddb15170427b185d6" + integrity sha512-4zxKZOnf0rfh6myXLG7a6YZfQcxYDMBsWqANEjCX77H5gPdK+GHZuDrxK6sjFvRBv4liYCrNjo7HJ4DpPoT0zA== dependencies: - "@docusaurus/core" "2.0.0-beta.20" - "@docusaurus/utils-validation" "2.0.0-beta.20" + "@docusaurus/core" "2.0.0-beta.21" + "@docusaurus/utils-validation" "2.0.0-beta.21" tslib "^2.4.0" -"@docusaurus/plugin-sitemap@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.20.tgz#08eada1260cafb273abea33c9c890ab667c7cbd3" - integrity sha512-Rf5a2vOBWjbe7PJJEBDeLZzDA7lsDi+16bqzKN8OKSXlcZLhxjmIpL5NrjANNbpGpL5vbl9z+iqvjbQmZ3QSmA== +"@docusaurus/plugin-sitemap@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.21.tgz#8bfa695eada2ec95c9376a884641237ffca5dd3d" + integrity sha512-/ynWbcXZXcYZ6sT2X6vAJbnfqcPxwdGEybd0rcRZi4gBHq6adMofYI25AqELmnbBDxt0If+vlAeUHFRG5ueP7Q== dependencies: - "@docusaurus/core" "2.0.0-beta.20" - "@docusaurus/utils" "2.0.0-beta.20" - "@docusaurus/utils-common" "2.0.0-beta.20" - "@docusaurus/utils-validation" "2.0.0-beta.20" + "@docusaurus/core" "2.0.0-beta.21" + "@docusaurus/logger" "2.0.0-beta.21" + "@docusaurus/utils" "2.0.0-beta.21" + "@docusaurus/utils-common" "2.0.0-beta.21" + "@docusaurus/utils-validation" "2.0.0-beta.21" fs-extra "^10.1.0" sitemap "^7.1.1" tslib "^2.4.0" -"@docusaurus/preset-classic@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.20.tgz#19566be713ce0297834cd999392ea3605bc6f574" - integrity sha512-artUDjiYFIlGd2fxk0iqqcJ5xSCrgormOAoind1c0pn8TRXY1WSCQWYI6p4X24jjhSCzLv0s6Z9PMDyxZdivhg== +"@docusaurus/preset-classic@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.21.tgz#1362d8650ebed22633db411caaba80075f7c86ce" + integrity sha512-KvBnIUu7y69pNTJ9UhX6SdNlK6prR//J3L4rhN897tb8xx04xHHILlPXko2Il+C3Xzgh3OCgyvkoz9K6YlFTDw== dependencies: - "@docusaurus/core" "2.0.0-beta.20" - "@docusaurus/plugin-content-blog" "2.0.0-beta.20" - "@docusaurus/plugin-content-docs" "2.0.0-beta.20" - "@docusaurus/plugin-content-pages" "2.0.0-beta.20" - "@docusaurus/plugin-debug" "2.0.0-beta.20" - "@docusaurus/plugin-google-analytics" "2.0.0-beta.20" - "@docusaurus/plugin-google-gtag" "2.0.0-beta.20" - "@docusaurus/plugin-sitemap" "2.0.0-beta.20" - "@docusaurus/theme-classic" "2.0.0-beta.20" - "@docusaurus/theme-common" "2.0.0-beta.20" - "@docusaurus/theme-search-algolia" "2.0.0-beta.20" + "@docusaurus/core" "2.0.0-beta.21" + "@docusaurus/plugin-content-blog" "2.0.0-beta.21" + "@docusaurus/plugin-content-docs" "2.0.0-beta.21" + "@docusaurus/plugin-content-pages" "2.0.0-beta.21" + "@docusaurus/plugin-debug" "2.0.0-beta.21" + "@docusaurus/plugin-google-analytics" "2.0.0-beta.21" + "@docusaurus/plugin-google-gtag" "2.0.0-beta.21" + "@docusaurus/plugin-sitemap" "2.0.0-beta.21" + "@docusaurus/theme-classic" "2.0.0-beta.21" + "@docusaurus/theme-common" "2.0.0-beta.21" + "@docusaurus/theme-search-algolia" "2.0.0-beta.21" "@docusaurus/react-loadable@5.5.2", "react-loadable@npm:@docusaurus/react-loadable@5.5.2": version "5.5.2" @@ -1654,61 +2447,62 @@ "@types/react" "*" prop-types "^15.6.2" -"@docusaurus/theme-classic@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.20.tgz#c4c7712c2b35c5654433228729f92ec73e6c598e" - integrity sha512-rs4U68x8Xk6rPsZC/7eaPxCKqzXX1S45FICKmq/IZuaDaQyQIijCvv2ssxYnUyVZUNayZfJK7ZtNu+A0kzYgSQ== +"@docusaurus/theme-classic@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.21.tgz#6df5b9ea2d389dafb6f59badeabb3eda060b5017" + integrity sha512-Ge0WNdTefD0VDQfaIMRRWa8tWMG9+8/OlBRd5MK88/TZfqdBq7b/gnCSaalQlvZwwkj6notkKhHx72+MKwWUJA== dependencies: - "@docusaurus/core" "2.0.0-beta.20" - "@docusaurus/plugin-content-blog" "2.0.0-beta.20" - "@docusaurus/plugin-content-docs" "2.0.0-beta.20" - "@docusaurus/plugin-content-pages" "2.0.0-beta.20" - "@docusaurus/theme-common" "2.0.0-beta.20" - "@docusaurus/theme-translations" "2.0.0-beta.20" - "@docusaurus/utils" "2.0.0-beta.20" - "@docusaurus/utils-common" "2.0.0-beta.20" - "@docusaurus/utils-validation" "2.0.0-beta.20" + "@docusaurus/core" "2.0.0-beta.21" + "@docusaurus/plugin-content-blog" "2.0.0-beta.21" + "@docusaurus/plugin-content-docs" "2.0.0-beta.21" + "@docusaurus/plugin-content-pages" "2.0.0-beta.21" + "@docusaurus/theme-common" "2.0.0-beta.21" + "@docusaurus/theme-translations" "2.0.0-beta.21" + "@docusaurus/utils" "2.0.0-beta.21" + "@docusaurus/utils-common" "2.0.0-beta.21" + "@docusaurus/utils-validation" "2.0.0-beta.21" "@mdx-js/react" "^1.6.22" clsx "^1.1.1" copy-text-to-clipboard "^3.0.1" infima "0.2.0-alpha.39" lodash "^4.17.21" nprogress "^0.2.0" - postcss "^8.4.13" - prism-react-renderer "^1.3.1" + postcss "^8.4.14" + prism-react-renderer "^1.3.3" prismjs "^1.28.0" - react-router-dom "^5.2.0" + react-router-dom "^5.3.3" rtlcss "^3.5.0" + tslib "^2.4.0" -"@docusaurus/theme-common@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.0.0-beta.20.tgz#4ec7d77ecd2ade9dad33b8689e3cd51b07e594b0" - integrity sha512-lmdGB3/GQM5z0GH0iHGRXUco4Wfqc6sR5eRKuW4j0sx3+UFVvtbVTTIGt0Cie4Dh6omnFxjPbNDlPDgWr/agVQ== +"@docusaurus/theme-common@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.0.0-beta.21.tgz#508478251982d01655ef505ccb2420db38623db8" + integrity sha512-fTKoTLRfjuFG6c3iwnVjIIOensxWMgdBKLfyE5iih3Lq7tQgkE7NyTGG9BKLrnTJ7cAD2UXdXM9xbB7tBf1qzg== dependencies: - "@docusaurus/module-type-aliases" "2.0.0-beta.20" - "@docusaurus/plugin-content-blog" "2.0.0-beta.20" - "@docusaurus/plugin-content-docs" "2.0.0-beta.20" - "@docusaurus/plugin-content-pages" "2.0.0-beta.20" + "@docusaurus/module-type-aliases" "2.0.0-beta.21" + "@docusaurus/plugin-content-blog" "2.0.0-beta.21" + "@docusaurus/plugin-content-docs" "2.0.0-beta.21" + "@docusaurus/plugin-content-pages" "2.0.0-beta.21" clsx "^1.1.1" parse-numeric-range "^1.3.0" - prism-react-renderer "^1.3.1" + prism-react-renderer "^1.3.3" tslib "^2.4.0" utility-types "^3.10.0" -"@docusaurus/theme-search-algolia@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.20.tgz#14f2ea376a87d7cfa4840d8c917d1ec62d3a07f7" - integrity sha512-9XAyiXXHgyhDmKXg9RUtnC4WBkYAZUqKT9Ntuk0OaOb4mBwiYUGL74tyP0LLL6T+oa9uEdXiUMlIL1onU8xhvA== +"@docusaurus/theme-search-algolia@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.21.tgz#2891f11372e2542e4e1426c3100b72c2d30d4d68" + integrity sha512-T1jKT8MVSSfnztSqeebUOpWHPoHKtwDXtKYE0xC99JWoZ+mMfv8AFhVSoSddn54jLJjV36mxg841eHQIySMCpQ== dependencies: - "@docsearch/react" "^3.0.0" - "@docusaurus/core" "2.0.0-beta.20" - "@docusaurus/logger" "2.0.0-beta.20" - "@docusaurus/plugin-content-docs" "2.0.0-beta.20" - "@docusaurus/theme-common" "2.0.0-beta.20" - "@docusaurus/theme-translations" "2.0.0-beta.20" - "@docusaurus/utils" "2.0.0-beta.20" - "@docusaurus/utils-validation" "2.0.0-beta.20" - algoliasearch "^4.13.0" + "@docsearch/react" "^3.1.0" + "@docusaurus/core" "2.0.0-beta.21" + "@docusaurus/logger" "2.0.0-beta.21" + "@docusaurus/plugin-content-docs" "2.0.0-beta.21" + "@docusaurus/theme-common" "2.0.0-beta.21" + "@docusaurus/theme-translations" "2.0.0-beta.21" + "@docusaurus/utils" "2.0.0-beta.21" + "@docusaurus/utils-validation" "2.0.0-beta.21" + algoliasearch "^4.13.1" algoliasearch-helper "^3.8.2" clsx "^1.1.1" eta "^1.12.3" @@ -1717,25 +2511,25 @@ tslib "^2.4.0" utility-types "^3.10.0" -"@docusaurus/theme-translations@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.0.0-beta.20.tgz#dcc7efb43ff110c19736764c287f6c5128a5dbba" - integrity sha512-O7J/4dHcg7Yr+r3ylgtqmtMEz6d5ScpUxBg8nsNTWOCRoGEXNZVmXSd5l6v72KCyxPZpllPrgjmqkL+I19qWiw== +"@docusaurus/theme-translations@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.0.0-beta.21.tgz#5da60ffc58de256b96316c5e0fe2733c1e83f22c" + integrity sha512-dLVT9OIIBs6MpzMb1bAy+C0DPJK3e3DNctG+ES0EP45gzEqQxzs4IsghpT+QDaOsuhNnAlosgJpFWX3rqxF9xA== dependencies: fs-extra "^10.1.0" tslib "^2.4.0" -"@docusaurus/types@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-2.0.0-beta.20.tgz#069d40cc225141d5c9a85605a1c61a460814bf5d" - integrity sha512-d4ZIpcrzGsUUcZJL3iz8/iSaewobPPiYfn2Lmmv7GTT5ZPtPkOAtR5mE6+LAf/KpjjgqrC7mpwDKADnOL/ic4Q== +"@docusaurus/types@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-2.0.0-beta.21.tgz#36659c6c012663040dcd4cbc97b5d7a555dae229" + integrity sha512-/GH6Npmq81eQfMC/ikS00QSv9jNyO1RXEpNSx5GLA3sFX8Iib26g2YI2zqNplM8nyxzZ2jVBuvUoeODTIbTchQ== dependencies: commander "^5.1.0" history "^4.9.0" joi "^17.6.0" react-helmet-async "^1.3.0" utility-types "^3.10.0" - webpack "^5.72.0" + webpack "^5.72.1" webpack-merge "^5.8.0" "@docusaurus/utils-common@2.0.0-beta.20": @@ -1745,6 +2539,13 @@ dependencies: tslib "^2.4.0" +"@docusaurus/utils-common@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.21.tgz#81e86ed04ad62b75e9ba6a5e7689dc23d5f36a0a" + integrity sha512-5w+6KQuJb6pUR2M8xyVuTMvO5NFQm/p8TOTDFTx60wt3p0P1rRX00v6FYsD4PK6pgmuoKjt2+Ls8dtSXc4qFpQ== + dependencies: + tslib "^2.4.0" + "@docusaurus/utils-validation@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.20.tgz#ebf475a4388066bd450877fe920f405c53ff5ad2" @@ -1756,6 +2557,17 @@ js-yaml "^4.1.0" tslib "^2.4.0" +"@docusaurus/utils-validation@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.21.tgz#10169661be5f8a233f4c12202ee5802ccb77400f" + integrity sha512-6NG1FHTRjv1MFzqW//292z7uCs77vntpWEbZBHk3n67aB1HoMn5SOwjLPtRDjbCgn6HCHFmdiJr6euCbjhYolg== + dependencies: + "@docusaurus/logger" "2.0.0-beta.21" + "@docusaurus/utils" "2.0.0-beta.21" + joi "^17.6.0" + js-yaml "^4.1.0" + tslib "^2.4.0" + "@docusaurus/utils@2.0.0-beta.20": version "2.0.0-beta.20" resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.20.tgz#d5a9816a328b2ca5e4e1a3fbf267e3674abacd48" @@ -1777,6 +2589,27 @@ url-loader "^4.1.1" webpack "^5.72.0" +"@docusaurus/utils@2.0.0-beta.21": + version "2.0.0-beta.21" + resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.21.tgz#8fc4499c4cfedd29805025d930f8008cad255044" + integrity sha512-M/BrVCDmmUPZLxtiStBgzpQ4I5hqkggcpnQmEN+LbvbohjbtVnnnZQ0vptIziv1w8jry/woY+ePsyOO7O/yeLQ== + dependencies: + "@docusaurus/logger" "2.0.0-beta.21" + "@svgr/webpack" "^6.2.1" + file-loader "^6.2.0" + fs-extra "^10.1.0" + github-slugger "^1.4.0" + globby "^11.1.0" + gray-matter "^4.0.3" + js-yaml "^4.1.0" + lodash "^4.17.21" + micromatch "^4.0.5" + resolve-pathname "^3.0.0" + shelljs "^0.8.5" + tslib "^2.4.0" + url-loader "^4.1.1" + webpack "^5.72.1" + "@eslint/eslintrc@^1.2.3": version "1.2.3" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz#fcaa2bcef39e13d6e9e7f6271f4cc7cae1174886" @@ -2109,6 +2942,15 @@ "@jridgewell/set-array" "^1.0.0" "@jridgewell/sourcemap-codec" "^1.4.10" +"@jridgewell/gen-mapping@^0.3.0": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9" + integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/resolve-uri@^3.0.3": version "3.0.7" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe" @@ -2711,32 +3553,7 @@ "@stdlib/types" "^0.0.x" debug "^2.6.9" -"@storybook/addon-actions@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.4.tgz#8ec4863982c805a3a39a19848aea3d65d80d491f" - integrity sha512-O70+brZOW78LBjbKsppXy37NQj4r3b2LQh3zUkIE1n37nb0bYhewr39UlT1/VhfDD4QA6PsBOqp0Mum8/V0GgQ== - dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/theming" "6.5.4" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - polished "^4.2.2" - prop-types "^15.7.2" - react-inspector "^5.1.0" - regenerator-runtime "^0.13.7" - telejson "^6.0.8" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - uuid-browser "^3.1.0" - -"@storybook/addon-actions@^6.5.6": +"@storybook/addon-actions@6.5.6", "@storybook/addon-actions@^6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-6.5.6.tgz#0e980a0a6d8d47db8031108ffa1fd51cc627a466" integrity sha512-AGtzpWOU/B0FxcqFDM7E/KSHQyr6tMbVts77JlAKCIbwqEncD1LIQoz9CyMdbr1jynkep0Ck0JjcDdmp7CXVoQ== @@ -2761,18 +3578,18 @@ util-deprecate "^1.0.2" uuid-browser "^3.1.0" -"@storybook/addon-backgrounds@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.5.4.tgz#97df5c73f350965bd5f2521e0882581df9f86315" - integrity sha512-lajT9N7VpBQRPHJF1iAGUIxJNuMwqZcMjijVAMoWX4gOdnGvjK7MpwoYbD2xAPXYrugJUGiYRG608d4PgPZT4w== +"@storybook/addon-backgrounds@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-backgrounds/-/addon-backgrounds-6.5.6.tgz#3763acdff1f2260286e165cf35e87d8097245496" + integrity sha512-D2khx57WBvQ2Ta/UMCZa8KQwAzVunk/oKmTJd6vau+1bm88wEx3a2seI9tZtC6nVHgHaBYgoH8os+7XpmlYlVQ== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/theming" "6.5.4" + "@storybook/theming" "6.5.6" core-js "^3.8.2" global "^4.4.0" memoizerific "^1.11.3" @@ -2780,47 +3597,47 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/addon-controls@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.5.4.tgz#d0cc2781bc0122eb16e59940b32c645775d0c8da" - integrity sha512-+2s++u1yXGs94BoxMVOOa4Ld0u6ylV5KdS9cWigyQz/OP3ZeoXDx6kCaJfYhEe/7Ccn59g11XjG4W8pjHMdb4A== +"@storybook/addon-controls@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-controls/-/addon-controls-6.5.6.tgz#bca1e33dd1edb059b6d6b1e1616c60ecdc9eb294" + integrity sha512-pJz2ltdL8d9/2wX1XOMdXeGwMNoBX5hIXkNfBCvBfOCmeVEXOczPOZARvwx4QTqmMSu1KikhFIGT64wwoETmBg== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-common" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-common" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/node-logger" "6.5.4" - "@storybook/store" "6.5.4" - "@storybook/theming" "6.5.4" + "@storybook/node-logger" "6.5.6" + "@storybook/store" "6.5.6" + "@storybook/theming" "6.5.6" core-js "^3.8.2" lodash "^4.17.21" ts-dedent "^2.0.0" -"@storybook/addon-docs@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.5.4.tgz#6b22711b50dec7ab370923b6d37aae12476d0b2a" - integrity sha512-Sqx8XJN760rbFGlNXywKG1QtG24X6gHgWXMEdfA1yy6FbH8vXu8p9VVm6KV3tHcb7o+ihSK7pObKtSXNdumD/A== +"@storybook/addon-docs@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-docs/-/addon-docs-6.5.6.tgz#39ea88cf5feebc82cc7faf9c0a10f9f3cba420bb" + integrity sha512-18MOB4Cvr10ibRlA58Y2MqaC0EM9NG758iSjweThaU4kZtSBSDn8R2qBLDGQPwEFkww+4+oAFXxR5/J0qO2xEw== dependencies: "@babel/plugin-transform-react-jsx" "^7.12.12" "@babel/preset-env" "^7.12.11" "@jest/transform" "^26.6.2" "@mdx-js/react" "^1.6.22" - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/docs-tools" "6.5.4" - "@storybook/mdx1-csf" canary - "@storybook/node-logger" "6.5.4" - "@storybook/postinstall" "6.5.4" - "@storybook/preview-web" "6.5.4" - "@storybook/source-loader" "6.5.4" - "@storybook/store" "6.5.4" - "@storybook/theming" "6.5.4" + "@storybook/docs-tools" "6.5.6" + "@storybook/mdx1-csf" "^0.0.1" + "@storybook/node-logger" "6.5.6" + "@storybook/postinstall" "6.5.6" + "@storybook/preview-web" "6.5.6" + "@storybook/source-loader" "6.5.6" + "@storybook/store" "6.5.6" + "@storybook/theming" "6.5.6" babel-loader "^8.0.0" core-js "^3.8.2" fast-deep-equal "^3.1.3" @@ -2832,23 +3649,23 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/addon-essentials@^6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.5.4.tgz#578f1f222027a556d7e23b799956750163fd83be" - integrity sha512-/ayPl274Tdrfz0YG0oSovkrXJNbstFm/Zoz7KO4wNMFgxTYes3kk+ruwkFIZegunBB8yR77cSzWHKqS9pFD8tA== +"@storybook/addon-essentials@^6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-essentials/-/addon-essentials-6.5.6.tgz#502e6152b729696d8de8c792fb44aae76fae934e" + integrity sha512-n+kDN/AI6NDJNJjofYXjGBh618Yg17DuRppFdXROnocwndKufuImF+/tRaQ0YLwXmnULpAiFSGbja6F0pc7fOw== dependencies: - "@storybook/addon-actions" "6.5.4" - "@storybook/addon-backgrounds" "6.5.4" - "@storybook/addon-controls" "6.5.4" - "@storybook/addon-docs" "6.5.4" - "@storybook/addon-measure" "6.5.4" - "@storybook/addon-outline" "6.5.4" - "@storybook/addon-toolbars" "6.5.4" - "@storybook/addon-viewport" "6.5.4" - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/node-logger" "6.5.4" + "@storybook/addon-actions" "6.5.6" + "@storybook/addon-backgrounds" "6.5.6" + "@storybook/addon-controls" "6.5.6" + "@storybook/addon-docs" "6.5.6" + "@storybook/addon-measure" "6.5.6" + "@storybook/addon-outline" "6.5.6" + "@storybook/addon-toolbars" "6.5.6" + "@storybook/addon-viewport" "6.5.6" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/node-logger" "6.5.6" core-js "^3.8.2" regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" @@ -2871,60 +3688,60 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-measure@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-6.5.4.tgz#af3dc98804e39411dd545eb2bff7b722b7ab6dbc" - integrity sha512-yucb2WnQMUyPo0cnbKKeIMp4pb18bU2zE8AFLm1GcQYJ56IfYD5EJbfpP7o3KpcMRRrZFjITggqhdU8DtncZkQ== +"@storybook/addon-measure@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-measure/-/addon-measure-6.5.6.tgz#843de6286861fed1761544adecf3c49d2982136c" + integrity sha512-V+KKoCTMVakExVmNiSu/1AHVsOgxUt62wo/Xm2fJvtRz+y/5LFFCLnENcN7/8qDTya8vgaHY7FR69zHvGiR4SA== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" global "^4.4.0" -"@storybook/addon-outline@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-6.5.4.tgz#a400a288b26ce793c4fd1b01dd54efde5b754b77" - integrity sha512-Qj9KfPTllcT0CxHqfIvKUbTxwu2ujIq/YfguFBecSQCTGwYTyTmLHzS1vwFHyEoVPgILLnQfsBLdLs57TaGl+A== +"@storybook/addon-outline@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-outline/-/addon-outline-6.5.6.tgz#8fedfc7b86faf3dc552b7ca12972909fd022ee5b" + integrity sha512-/Bgo+yQSDwriAZ7pnO0kzaiyMg77bBgieEhrPpjb+AMlWIBU2j9rZYVdmi0egYy075Hle3E/hLwjG4FT4QIo5A== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" global "^4.4.0" regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-toolbars@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.5.4.tgz#f99348cbefe905251a1a76bf3fdac6b604666929" - integrity sha512-cK80/EjDJ+Hr7/lqsEqasyZGHx5+j9pVQRWWhTEDzURcAsxh4HFSw9VSOnDk+EAgHrlvjm+PX2xeaHfT9ezo6Q== +"@storybook/addon-toolbars@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-toolbars/-/addon-toolbars-6.5.6.tgz#f4f311aaf918e1922d21e9c6f15b06e2cb7ac66c" + integrity sha512-9FvnuvLj8QdtSeY7QEuqJieNckwhIkSdmovaFzeToRzJso3eAmqoo6I6pp444QVVnMzrCl5As+2uAxhgaDLEXg== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/theming" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/theming" "6.5.6" core-js "^3.8.2" regenerator-runtime "^0.13.7" -"@storybook/addon-viewport@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.5.4.tgz#4bf17ccdbe59801404c8ff856cbfa1fe543026d9" - integrity sha512-K0DrUTwiGY9IeTVUgwgl0boEYzn7QbYz34N7C5CMEUFWIBNehc7FJu/Rc+d2ltNz1w3jtnQPAFpt0FQ8ZYvVGg== +"@storybook/addon-viewport@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-viewport/-/addon-viewport-6.5.6.tgz#bc6456b1d2f586da104fdc6b91a2d0355530e730" + integrity sha512-zjBjMLfeqflHW7W7iFL5EvxtGbUg+4j+yHjONnKKpZteUjrX4fsBBMOL56mQsC0bAJEQCb3w2SFFskYBa4CzIw== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/theming" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/theming" "6.5.6" core-js "^3.8.2" global "^4.4.0" memoizerific "^1.11.3" @@ -3011,28 +3828,28 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/builder-webpack4@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.4.tgz#c58708c18a657ab326026469e5f06aef462c074e" - integrity sha512-9AaSix850yOG7deAG8PDrAVNiDcTBm422Fjo9+OkONVN8tYIObW72U9kjwSrVL2HRMwu6Ikx939z1FBgA80NSw== +"@storybook/builder-webpack4@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/builder-webpack4/-/builder-webpack4-6.5.6.tgz#49eb7272402ff185ae12ffc679aef4677c48537d" + integrity sha512-/nACQ5SoddCs1geGUKXrrXiYDvYdTVXWXc0L6mXawjYANBeWIkAKFlhRpoXGN/KiFuuExO2+UgNCKlUyD0a51Q== dependencies: "@babel/core" "^7.12.10" - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/channel-postmessage" "6.5.4" - "@storybook/channels" "6.5.4" - "@storybook/client-api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/node-logger" "6.5.4" - "@storybook/preview-web" "6.5.4" - "@storybook/router" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/channel-postmessage" "6.5.6" + "@storybook/channels" "6.5.6" + "@storybook/client-api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/node-logger" "6.5.6" + "@storybook/preview-web" "6.5.6" + "@storybook/router" "6.5.6" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.4" - "@storybook/theming" "6.5.4" - "@storybook/ui" "6.5.4" + "@storybook/store" "6.5.6" + "@storybook/theming" "6.5.6" + "@storybook/ui" "6.5.6" "@types/node" "^14.0.10 || ^16.0.0" "@types/webpack" "^4.41.26" autoprefixer "^9.8.6" @@ -3134,17 +3951,6 @@ qs "^6.10.0" telejson "^6.0.8" -"@storybook/channel-websocket@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.4.tgz#659dac59649240ce9d9e74a84bcc28c9f359f62e" - integrity sha512-BQtN7ZVoeUUIDtQdsnVCOzKIfpODAIW4IQ8cEuYeHiQDuGWW0+4MuVP5fzfHVugXRoQEF+OBxP8YcVVgeakyQg== - dependencies: - "@storybook/channels" "6.5.4" - "@storybook/client-logger" "6.5.4" - core-js "^3.8.2" - global "^4.4.0" - telejson "^6.0.8" - "@storybook/channel-websocket@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/channel-websocket/-/channel-websocket-6.5.6.tgz#9d31ef139f6d86b29278452e9977a47fd3cc9706" @@ -3272,32 +4078,6 @@ regenerator-runtime "^0.13.7" util-deprecate "^1.0.2" -"@storybook/core-client@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.4.tgz#ab5eaa68c78c3e8816ea240afeea0887e2f68708" - integrity sha512-0rlQ5reKuCeFwqXdicPSLX/0ISAoEpVQgmBEosGt+1knRUfzS/IdLaBO+ZEwh+ajldFo3k9JfZOfxBOFqPMhsg== - dependencies: - "@storybook/addons" "6.5.4" - "@storybook/channel-postmessage" "6.5.4" - "@storybook/channel-websocket" "6.5.4" - "@storybook/client-api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/preview-web" "6.5.4" - "@storybook/store" "6.5.4" - "@storybook/ui" "6.5.4" - airbnb-js-shims "^2.2.1" - ansi-to-html "^0.6.11" - core-js "^3.8.2" - global "^4.4.0" - lodash "^4.17.21" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - ts-dedent "^2.0.0" - unfetch "^4.2.0" - util-deprecate "^1.0.2" - "@storybook/core-client@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/core-client/-/core-client-6.5.6.tgz#d09d144745c6d8a24dd002ae60ffa9b0c500ae54" @@ -3450,23 +4230,23 @@ dependencies: core-js "^3.8.2" -"@storybook/core-server@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.4.tgz#0e213ac52748fac1325b5734e7b64c23f982bd2f" - integrity sha512-Fmapj0xHHNQ3FUFXiHR/Zex9hBWnxKYMANxmNslAHbD3BEpf8xPYcjtptVvr0hJyHtnygtwqPbR0CUBbCG0KKQ== +"@storybook/core-server@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/core-server/-/core-server-6.5.6.tgz#4fe464847297117089900d5f9cc9acc08d638723" + integrity sha512-65kwbSXsKPl/0BKjGr9RTihv6jYGGIG/prfLscZPtm3u4/Z8ZxCX94rznztxcUatjLlUfKJ8iimizhUOIa0FJA== dependencies: "@discoveryjs/json-ext" "^0.5.3" - "@storybook/builder-webpack4" "6.5.4" - "@storybook/core-client" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/builder-webpack4" "6.5.6" + "@storybook/core-client" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/csf-tools" "6.5.4" - "@storybook/manager-webpack4" "6.5.4" - "@storybook/node-logger" "6.5.4" + "@storybook/csf-tools" "6.5.6" + "@storybook/manager-webpack4" "6.5.6" + "@storybook/node-logger" "6.5.6" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.4" - "@storybook/telemetry" "6.5.4" + "@storybook/store" "6.5.6" + "@storybook/telemetry" "6.5.6" "@types/node" "^14.0.10 || ^16.0.0" "@types/node-fetch" "^2.5.7" "@types/pretty-hrtime" "^1.0.0" @@ -3484,7 +4264,7 @@ fs-extra "^9.0.1" global "^4.4.0" globby "^11.0.2" - ip "^1.1.5" + ip "^2.0.0" lodash "^4.17.21" node-fetch "^2.6.7" open "^8.4.0" @@ -3501,18 +4281,18 @@ ws "^8.2.3" x-default-browser "^0.4.0" -"@storybook/core@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.5.4.tgz#b6fcd148aea97f695ad491ee77664c28f1ff9396" - integrity sha512-de43+5FgQnLWTJw51h4qpaDVy1aHFte2eE2wi5rC3VHICxqQJJQqtzDrAtZ9NoKhztS5tZHA6pk60fh1TtPk8g== +"@storybook/core@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/core/-/core-6.5.6.tgz#bc1792154ea010500950f0d43c78ae554ea4f9ec" + integrity sha512-DS6Q8SrEXBDoDS2K865NoWggSXEg8L9p+jx8sILLkLrr2QXJT0x6YIFSwEh6rGwkahxDV5ikON/rW39Wlxzk1w== dependencies: - "@storybook/core-client" "6.5.4" - "@storybook/core-server" "6.5.4" + "@storybook/core-client" "6.5.6" + "@storybook/core-server" "6.5.6" -"@storybook/csf-tools@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.5.4.tgz#01b4ab41482d6950781d2a3fa369445d818a1e92" - integrity sha512-mCAO8Ddig5PzXiI4HxiWhdLmPPpaovzVxqdh7g31k3fhpnRkQrKwftNGTW/ArFDdisMjB1+gm+ZOVACZg0pO4w== +"@storybook/csf-tools@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/csf-tools/-/csf-tools-6.5.6.tgz#147ced43313ee217c41b00d5fe32a80cb29b03bd" + integrity sha512-Gfah+5mEUoVG7v+E23svRjKAh546KCPIcwAvGU3m26j3hNbpvKq8edKDr+CCMfehG8VEGSZWfZPsgX04c/ItcA== dependencies: "@babel/core" "^7.12.10" "@babel/generator" "^7.12.11" @@ -3522,7 +4302,7 @@ "@babel/traverse" "^7.12.11" "@babel/types" "^7.12.11" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/mdx1-csf" canary + "@storybook/mdx1-csf" "^0.0.1" core-js "^3.8.2" fs-extra "^9.0.1" global "^4.4.0" @@ -3536,33 +4316,33 @@ dependencies: lodash "^4.17.15" -"@storybook/docs-tools@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.4.tgz#efe25c732f2061293e3cb84853e82a925e332804" - integrity sha512-XiCiCKwalbPrhcD9jhMM9IMOdOplUPNnwhW//VmHvWJ2j+JNiQVX42vfecl4hKy8wx63S/AzaGKw2yuavUAiHQ== +"@storybook/docs-tools@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/docs-tools/-/docs-tools-6.5.6.tgz#cf27e06ce25c55327048662f833628d2e329a140" + integrity sha512-QwOFWVzce4m5fQaC39rSUBVzNplpcSfGyIN3rBBen4wHllj43y7i30A69jSW24M15CKdcJmfDaLwN00s7y3ZHQ== dependencies: "@babel/core" "^7.12.10" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/store" "6.5.4" + "@storybook/store" "6.5.6" core-js "^3.8.2" doctrine "^3.0.0" lodash "^4.17.21" regenerator-runtime "^0.13.7" -"@storybook/manager-webpack4@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.4.tgz#1dfd152e7af7b57ba0c1d5162ec360b71e088f61" - integrity sha512-JgFAlnnsOV6+L0ShDApwbDDdzoEAwuy01+TLUVdl60rlpbcBaasBMkZYAy1iwKZ59gCT51GocGMGDXBVeUJq9g== +"@storybook/manager-webpack4@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/manager-webpack4/-/manager-webpack4-6.5.6.tgz#3a356ee52cb972533a98e4da426bc6cc3b8abaf3" + integrity sha512-GaUT1bNmGebq8Ci52M07XF0Zn9Ak7L8ZaKn8rdBJ4VSPhg0vEAeo7trD3aur3+h/3gLQmK64LhiNSOfvZfQDAw== dependencies: "@babel/core" "^7.12.10" "@babel/plugin-transform-template-literals" "^7.12.1" "@babel/preset-react" "^7.12.10" - "@storybook/addons" "6.5.4" - "@storybook/core-client" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/node-logger" "6.5.4" - "@storybook/theming" "6.5.4" - "@storybook/ui" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/core-client" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/node-logger" "6.5.6" + "@storybook/theming" "6.5.6" + "@storybook/ui" "6.5.6" "@types/node" "^14.0.10 || ^16.0.0" "@types/webpack" "^4.41.26" babel-loader "^8.0.0" @@ -3628,10 +4408,10 @@ webpack-dev-middleware "^4.1.0" webpack-virtual-modules "^0.4.1" -"@storybook/mdx1-csf@canary": - version "0.0.1-canary.1.867dcd5.0" - resolved "https://registry.yarnpkg.com/@storybook/mdx1-csf/-/mdx1-csf-0.0.1-canary.1.867dcd5.0.tgz#e8739a7451a557292977d83bfb7475986a8013b6" - integrity sha512-VnlE825M9SpjyJCPLCXbo+RbvqllsqXqRDCouzHKSpCE3Q79KR7MMURBsJo/vrTG1zeNG68Z4TZrLAu6IoyYaA== +"@storybook/mdx1-csf@^0.0.1": + version "0.0.1" + resolved "https://registry.yarnpkg.com/@storybook/mdx1-csf/-/mdx1-csf-0.0.1.tgz#d4184e3f6486fade9f7a6bfaf934d9bc07718d5b" + integrity sha512-4biZIWWzoWlCarMZmTpqcJNgo/RBesYZwGFbQeXiGYsswuvfWARZnW9RE9aUEMZ4XPn7B1N3EKkWcdcWe/K2tg== dependencies: "@babel/generator" "^7.12.11" "@babel/parser" "^7.12.11" @@ -3667,10 +4447,10 @@ npmlog "^5.0.1" pretty-hrtime "^1.0.3" -"@storybook/postinstall@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.4.tgz#01f7792f1a777cb1dee30e07f02314080cabd232" - integrity sha512-euiZOwz5KmtL3wcSxzxLTkGkxLCroZTVaNt/NopRBa0F8erJfT9MiQPVw/xFkS9QwEViaR+Zq4KmStxB41zycQ== +"@storybook/postinstall@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/postinstall/-/postinstall-6.5.6.tgz#df0bab91b0d1f576a9d4d63842ad56238e26c9d6" + integrity sha512-MPrlmVOXbfAiSaGzG1jgUM4l2zXOI9h3pvrh+0dQLJYP3tjO+5RNmJKMjH8c1PkTcAeoHkp1gUYZ0KKy2imRRQ== dependencies: core-js "^3.8.2" @@ -3743,24 +4523,24 @@ react-docgen-typescript "^2.1.1" tslib "^2.0.0" -"@storybook/react@^6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.5.4.tgz#54d947c79ed60aef8ae160332d5bce2e4281f40f" - integrity sha512-tZdoUc0TJ2HrE4iIHwNWjW/yJSM8+9uBE4U4rWmKjjqRk7jC0KGLxjPPgjGsJFx7iSdAurQlaZUW7cvcPuhz1w== +"@storybook/react@^6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/react/-/react-6.5.6.tgz#9b7ddc678790a8af100c26b8d47c332bc6f4fc84" + integrity sha512-lU2ggvZe9PbKWK4cbwHI6eDT7tlRAqdx489kLrfKhGTUVE8zhc/uosVEMpxbxS/zf1YYnXumr2DH1Uw2S3JeqA== dependencies: "@babel/preset-flow" "^7.12.1" "@babel/preset-react" "^7.12.10" "@pmmmwh/react-refresh-webpack-plugin" "^0.5.3" - "@storybook/addons" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core" "6.5.4" - "@storybook/core-common" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core" "6.5.6" + "@storybook/core-common" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/docs-tools" "6.5.4" - "@storybook/node-logger" "6.5.4" + "@storybook/docs-tools" "6.5.6" + "@storybook/node-logger" "6.5.6" "@storybook/react-docgen-typescript-plugin" "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.4" + "@storybook/store" "6.5.6" "@types/estree" "^0.0.51" "@types/node" "^14.14.20 || ^16.0.0" "@types/webpack-env" "^1.16.0" @@ -3810,13 +4590,13 @@ core-js "^3.6.5" find-up "^4.1.0" -"@storybook/source-loader@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.5.4.tgz#401bbfa4624c1c719a961394690f8621f93e0c3b" - integrity sha512-NfNktWLNvsGVyf3IjCke/4HftPcIHD251J7QOuPjq3lD9OTLZgL4blqscUmd2RrGZRUEH+KSfCIV9jTSeqS1wQ== +"@storybook/source-loader@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/source-loader/-/source-loader-6.5.6.tgz#e20c6a827c2021bbbab05d0bb2c1e6fb66e133a9" + integrity sha512-KsV9DU3JucYjWHq55f1bOu52mprgSpTIRUnvK2BojQdjY+kqN2ow0pP/I9FZzNpEKKsGFWdnREfYM5dYHZyvLw== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/client-logger" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/client-logger" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" core-js "^3.8.2" estraverse "^5.2.0" @@ -3868,13 +4648,13 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/telemetry@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.4.tgz#810209e928449c2eab7e3bdf7dd6dbe0de8327b0" - integrity sha512-BKQajMd80mXHp/sE54I1JiusgvfZrnRqBbZW93slGNG3JyWpJLGOBH/KCp4iyu6Htbqssi+nvrxneUCT+wA6eQ== +"@storybook/telemetry@6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/telemetry/-/telemetry-6.5.6.tgz#a7da1fa0019b307ceac24e65ff1e14ee0f36a8a5" + integrity sha512-l0vbStCgVA9u0ITvowZ1LNxmf32vAAdnPqSmB9DdA3ZO2wCpttW9rPyg1O4OV8c5uq7QJZ7mrKZ04p9SLo8wrw== dependencies: - "@storybook/client-logger" "6.5.4" - "@storybook/core-common" "6.5.4" + "@storybook/client-logger" "6.5.6" + "@storybook/core-common" "6.5.6" chalk "^4.1.0" core-js "^3.8.2" detect-package-manager "^2.0.1" @@ -3904,24 +4684,6 @@ core-js "^3.8.2" regenerator-runtime "^0.13.7" -"@storybook/ui@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.4.tgz#eb70602e78b871e6d762b43889b2dc7537a91331" - integrity sha512-+kMgNMcW7xma/H/O4LFzdxjX6GPfEEvOkm3HQDz0dJW7z/wtQVTgZKCA8gAVl+eNcNyRGzYRKOrOU0AzFfU7lw== - dependencies: - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/channels" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/router" "6.5.4" - "@storybook/semver" "^7.3.2" - "@storybook/theming" "6.5.4" - core-js "^3.8.2" - regenerator-runtime "^0.13.7" - resolve-from "^5.0.0" - "@storybook/ui@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-6.5.6.tgz#3b312728c11d1bdba9cac41d18d91b6806496028" @@ -5335,7 +6097,7 @@ algoliasearch-helper@^3.8.2: dependencies: "@algolia/events" "^4.0.1" -algoliasearch@^4.0.0, algoliasearch@^4.13.0: +algoliasearch@^4.0.0: version "4.13.0" resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.13.0.tgz#e36611fda82b1fc548c156ae7929a7f486e4b663" integrity sha512-oHv4faI1Vl2s+YC0YquwkK/TsaJs79g2JFg5FDm2rKN12VItPTAeQ7hyJMHarOPPYuCnNC5kixbtcqvb21wchw== @@ -5355,6 +6117,26 @@ algoliasearch@^4.0.0, algoliasearch@^4.13.0: "@algolia/requester-node-http" "4.13.0" "@algolia/transporter" "4.13.0" +algoliasearch@^4.13.1: + version "4.13.1" + resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.13.1.tgz#54195c41c9e4bd13ed64982248cf49d4576974fe" + integrity sha512-dtHUSE0caWTCE7liE1xaL+19AFf6kWEcyn76uhcitWpntqvicFHXKFoZe5JJcv9whQOTRM6+B8qJz6sFj+rDJA== + dependencies: + "@algolia/cache-browser-local-storage" "4.13.1" + "@algolia/cache-common" "4.13.1" + "@algolia/cache-in-memory" "4.13.1" + "@algolia/client-account" "4.13.1" + "@algolia/client-analytics" "4.13.1" + "@algolia/client-common" "4.13.1" + "@algolia/client-personalization" "4.13.1" + "@algolia/client-search" "4.13.1" + "@algolia/logger-common" "4.13.1" + "@algolia/logger-console" "4.13.1" + "@algolia/requester-browser-xhr" "4.13.1" + "@algolia/requester-common" "4.13.1" + "@algolia/requester-node-http" "4.13.1" + "@algolia/transporter" "4.13.1" + ansi-align@^3.0.0, ansi-align@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" @@ -5695,7 +6477,7 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@^10.3.7, autoprefixer@^10.4.5, autoprefixer@^10.4.6: +autoprefixer@^10.3.7, autoprefixer@^10.4.5, autoprefixer@^10.4.6, autoprefixer@^10.4.7: version "10.4.7" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.7.tgz#1db8d195f41a52ca5069b7593be167618edbbedf" integrity sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA== @@ -6623,16 +7405,17 @@ check-types@^11.1.1: resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.1.2.tgz#86a7c12bf5539f6324eb0e70ca8896c0e38f3e2f" integrity sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ== -cheerio-select@^1.5.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.6.0.tgz#489f36604112c722afa147dedd0d4609c09e1696" - integrity sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g== +cheerio-select@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4" + integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g== dependencies: - css-select "^4.3.0" - css-what "^6.0.1" - domelementtype "^2.2.0" - domhandler "^4.3.1" - domutils "^2.8.0" + boolbase "^1.0.0" + css-select "^5.1.0" + css-what "^6.1.0" + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.0.1" cheerio@^0.22.0: version "0.22.0" @@ -6656,18 +7439,19 @@ cheerio@^0.22.0: lodash.reject "^4.4.0" lodash.some "^4.4.0" -cheerio@^1.0.0-rc.10: - version "1.0.0-rc.10" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e" - integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw== +cheerio@^1.0.0-rc.11: + version "1.0.0-rc.11" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.11.tgz#1be84be1a126958366bcc57a11648cd9b30a60c2" + integrity sha512-bQwNaDIBKID5ts/DsdhxrjqFXYfLw4ste+wMKqWA8DyKcS4qwsPP4Bk8ZNaTJjvpiX/qW3BT4sU7d6Bh5i+dag== dependencies: - cheerio-select "^1.5.0" - dom-serializer "^1.3.2" - domhandler "^4.2.0" - htmlparser2 "^6.1.0" - parse5 "^6.0.1" - parse5-htmlparser2-tree-adapter "^6.0.1" - tslib "^2.2.0" + cheerio-select "^2.1.0" + dom-serializer "^2.0.0" + domhandler "^5.0.3" + domutils "^3.0.1" + htmlparser2 "^8.0.1" + parse5 "^7.0.0" + parse5-htmlparser2-tree-adapter "^7.0.0" + tslib "^2.4.0" chokidar@^2.1.8: version "2.1.8" @@ -6967,6 +7751,11 @@ commander@^8.0.0, commander@^8.3.0: resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@^9.2.0: + version "9.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.3.0.tgz#f619114a5a2d2054e0d9ff1b31d5ccf89255e26b" + integrity sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw== + common-path-prefix@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" @@ -7144,6 +7933,18 @@ copy-webpack-plugin@^10.2.4: schema-utils "^4.0.0" serialize-javascript "^6.0.0" +copy-webpack-plugin@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz#96d4dbdb5f73d02dd72d0528d1958721ab72e04a" + integrity sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ== + dependencies: + fast-glob "^3.2.11" + glob-parent "^6.0.1" + globby "^13.1.1" + normalize-path "^3.0.0" + schema-utils "^4.0.0" + serialize-javascript "^6.0.0" + core-js-compat@^3.21.0, core-js-compat@^3.22.1, core-js-compat@^3.8.1: version "3.22.5" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.5.tgz#7fffa1d20cb18405bd22756ca1353c6f1a0e8614" @@ -7167,6 +7968,11 @@ core-js@^3.0.4, core-js@^3.19.2, core-js@^3.22.3, core-js@^3.6.5, core-js@^3.8.2 resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.5.tgz#a5f5a58e663d5c0ebb4e680cd7be37536fb2a9cf" integrity sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA== +core-js@^3.22.7: + version "3.22.7" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.7.tgz#8d6c37f630f6139b8732d10f2c114c3f1d00024f" + integrity sha512-Jt8SReuDKVNZnZEzyEQT5eK6T2RRCXkfTq7Lo09kpm+fHjgGewSbNjV+Wt4yZMhPDdzz2x1ulI5z/w4nxpBseg== + core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" @@ -7399,6 +8205,18 @@ css-minimizer-webpack-plugin@^3.2.0, css-minimizer-webpack-plugin@^3.4.1: serialize-javascript "^6.0.0" source-map "^0.6.1" +css-minimizer-webpack-plugin@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-4.0.0.tgz#e11800388c19c2b7442c39cc78ac8ae3675c9605" + integrity sha512-7ZXXRzRHvofv3Uac5Y+RkWRNo0ZMlcg8e9/OtrqUYmwDWJo+qs67GvdeFrXLsFb7czKNwjQhPkM0avlIYl+1nA== + dependencies: + cssnano "^5.1.8" + jest-worker "^27.5.1" + postcss "^8.4.13" + schema-utils "^4.0.0" + serialize-javascript "^6.0.0" + source-map "^0.6.1" + css-prefers-color-scheme@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz#ca8a22e5992c10a5b9d315155e7caee625903349" @@ -7419,7 +8237,7 @@ css-select@^2.0.0: domutils "^1.7.0" nth-check "^1.0.2" -css-select@^4.1.3, css-select@^4.3.0: +css-select@^4.1.3: version "4.3.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== @@ -7430,6 +8248,17 @@ css-select@^4.1.3, css-select@^4.3.0: domutils "^2.8.0" nth-check "^2.0.1" +css-select@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6" + integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg== + dependencies: + boolbase "^1.0.0" + css-what "^6.1.0" + domhandler "^5.0.2" + domutils "^3.0.1" + nth-check "^2.0.1" + css-select@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" @@ -7466,7 +8295,7 @@ css-what@^3.2.1: resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== -css-what@^6.0.1: +css-what@^6.0.1, css-what@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== @@ -7507,6 +8336,53 @@ cssnano-preset-advanced@^5.3.3: postcss-reduce-idents "^5.2.0" postcss-zindex "^5.1.0" +cssnano-preset-advanced@^5.3.5: + version "5.3.6" + resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.3.6.tgz#6c995a86cecc9e6472bf6d120e5517231ed527dc" + integrity sha512-OZHsytu16eStRVrIY3wmPQqhJMaI0+O3raU4JHoKV3uuQYEeQek/FJVUIvYXD55hWR6OjCMyKYNRDw+k3/xgUw== + dependencies: + autoprefixer "^10.3.7" + cssnano-preset-default "^5.2.10" + postcss-discard-unused "^5.1.0" + postcss-merge-idents "^5.1.1" + postcss-reduce-idents "^5.2.0" + postcss-zindex "^5.1.0" + +cssnano-preset-default@^5.2.10: + version "5.2.10" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.10.tgz#6dfffe6cc3b13f3bb356a42c49a334a98700ef45" + integrity sha512-H8TJRhTjBKVOPltp9vr9El9I+IfYsOMhmXdK0LwdvwJcxYX9oWkY7ctacWusgPWAgQq1vt/WO8v+uqpfLnM7QA== + dependencies: + css-declaration-sorter "^6.2.2" + cssnano-utils "^3.1.0" + postcss-calc "^8.2.3" + postcss-colormin "^5.3.0" + postcss-convert-values "^5.1.2" + postcss-discard-comments "^5.1.2" + postcss-discard-duplicates "^5.1.0" + postcss-discard-empty "^5.1.1" + postcss-discard-overridden "^5.1.0" + postcss-merge-longhand "^5.1.5" + postcss-merge-rules "^5.1.2" + postcss-minify-font-values "^5.1.0" + postcss-minify-gradients "^5.1.1" + postcss-minify-params "^5.1.3" + postcss-minify-selectors "^5.2.1" + postcss-normalize-charset "^5.1.0" + postcss-normalize-display-values "^5.1.0" + postcss-normalize-positions "^5.1.0" + postcss-normalize-repeat-style "^5.1.0" + postcss-normalize-string "^5.1.0" + postcss-normalize-timing-functions "^5.1.0" + postcss-normalize-unicode "^5.1.0" + postcss-normalize-url "^5.1.0" + postcss-normalize-whitespace "^5.1.1" + postcss-ordered-values "^5.1.1" + postcss-reduce-initial "^5.1.0" + postcss-reduce-transforms "^5.1.0" + postcss-svgo "^5.1.0" + postcss-unique-selectors "^5.1.1" + cssnano-preset-default@^5.2.7: version "5.2.7" resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz#791e3603fb8f1b46717ac53b47e3c418e950f5f3" @@ -7556,6 +8432,15 @@ cssnano@^5.0.6, cssnano@^5.1.7: lilconfig "^2.0.3" yaml "^1.10.2" +cssnano@^5.1.8, cssnano@^5.1.9: + version "5.1.10" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.10.tgz#fc6ddd9a4d7d238f320634326ed814cf0abf6e1c" + integrity sha512-ACpnRgDg4m6CZD/+8SgnLcGCgy6DDGdkMbOawwdvVxNietTNLe/MtWcenp6qT0PRt5wzhGl6/cjMWCdhKXC9QA== + dependencies: + cssnano-preset-default "^5.2.10" + lilconfig "^2.0.3" + yaml "^1.10.2" + csso@^4.0.2, csso@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" @@ -7885,6 +8770,20 @@ del@^6.0.0: rimraf "^3.0.2" slash "^3.0.0" +del@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a" + integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg== + dependencies: + globby "^11.0.1" + graceful-fs "^4.2.4" + is-glob "^4.0.1" + is-path-cwd "^2.2.0" + is-path-inside "^3.0.2" + p-map "^4.0.0" + rimraf "^3.0.2" + slash "^3.0.0" + delaunator@5: version "5.0.0" resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.0.tgz#60f052b28bd91c9b4566850ebf7756efe821d81b" @@ -8073,7 +8972,7 @@ dom-serializer@0: domelementtype "^2.0.1" entities "^2.0.0" -dom-serializer@^1.0.1, dom-serializer@^1.3.2: +dom-serializer@^1.0.1: version "1.4.1" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== @@ -8082,6 +8981,15 @@ dom-serializer@^1.0.1, dom-serializer@^1.3.2: domhandler "^4.2.0" entities "^2.0.0" +dom-serializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + entities "^4.2.0" + dom-serializer@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" @@ -8105,7 +9013,7 @@ domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== -domelementtype@^2.0.1, domelementtype@^2.2.0: +domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== @@ -8131,6 +9039,13 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: dependencies: domelementtype "^2.2.0" +domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== + dependencies: + domelementtype "^2.3.0" + domutils@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" @@ -8156,6 +9071,15 @@ domutils@^2.5.2, domutils@^2.8.0: domelementtype "^2.2.0" domhandler "^4.2.0" +domutils@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" + integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== + dependencies: + dom-serializer "^2.0.0" + domelementtype "^2.3.0" + domhandler "^5.0.1" + dot-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" @@ -8324,6 +9248,11 @@ entities@^3.0.1: resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== +entities@^4.2.0, entities@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.3.0.tgz#62915f08d67353bb4eb67e3d62641a4059aec656" + integrity sha512-/iP1rZrSEJ0DTlPiX+jbzlA3eVkY/e8L8SozroF395fIqE3TYF/Nz7YOMAawta+vLmyJ/hkGNNPcSbMADCCXbg== + envinfo@^7.7.3: version "7.8.1" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" @@ -9637,6 +10566,17 @@ globby@^12.0.2: merge2 "^1.4.1" slash "^4.0.0" +globby@^13.1.1: + version "13.1.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.1.tgz#7c44a93869b0b7612e38f22ed532bfe37b25ea6f" + integrity sha512-XMzoDZbGZ37tufiv7g0N4F/zp3zkwdFtVbV3EHsVl1KQr4RPLfNoT068/97RPshz2J5xYNEjLKKBKaGHifBd3Q== + dependencies: + dir-glob "^3.0.1" + fast-glob "^3.2.11" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^4.0.0" + globby@^9.2.0: version "9.2.0" resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d" @@ -10103,6 +11043,16 @@ htmlparser2@^6.1.0: domutils "^2.5.2" entities "^2.0.0" +htmlparser2@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" + integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + domutils "^3.0.1" + entities "^4.3.0" + http-cache-semantics@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" @@ -10403,10 +11353,10 @@ invariant@^2.2.2, invariant@^2.2.4: dependencies: loose-envify "^1.0.0" -ip@^1.1.5: - version "1.1.7" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.7.tgz#4f6195d7bdb30435aac35301e7b993c6c8218c0d" - integrity sha512-SLm2ERgmBGag79RfrIknk+40ZOJCgUBpCQTl3WE2YER21VR0W3Vt/OAXXaYLSU0AIcBqWnytoTwk2ZcTbxH0xg== +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== ipaddr.js@1.9.1: version "1.9.1" @@ -12574,7 +13524,7 @@ nanoclone@^0.2.1: resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4" integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA== -nanoid@^3.3.1, nanoid@^3.3.3: +nanoid@^3.3.1, nanoid@^3.3.3, nanoid@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== @@ -13243,14 +14193,15 @@ parse-numeric-range@^1.3.0: resolved "https://registry.yarnpkg.com/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz#7c63b61190d61e4d53a1197f0c83c47bb670ffa3" integrity sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ== -parse5-htmlparser2-tree-adapter@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6" - integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA== +parse5-htmlparser2-tree-adapter@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz#23c2cc233bcf09bb7beba8b8a69d46b08c62c2f1" + integrity sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g== dependencies: - parse5 "^6.0.1" + domhandler "^5.0.2" + parse5 "^7.0.0" -parse5@6.0.1, parse5@^6.0.0, parse5@^6.0.1: +parse5@6.0.1, parse5@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== @@ -13260,6 +14211,13 @@ parse5@^5.0.0: resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== +parse5@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.0.0.tgz#51f74a5257f5fcc536389e8c2d0b3802e1bfa91a" + integrity sha512-y/t8IXSPWTuRZqXc0ajH/UwDj4mnqLEbSttNbThcFhGrZuOyoyvNBO85PBp2jQa55wY9d07PBNjsK8ZP3K5U6g== + dependencies: + entities "^4.3.0" + parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -13389,10 +14347,13 @@ pdfast@^0.2.0: resolved "https://registry.yarnpkg.com/pdfast/-/pdfast-0.2.0.tgz#8cbc556e1bf2522177787c0de2e0d4373ba885c9" integrity sha1-jLxVbhvyUiF3eHwN4uDUNzuohck= -peggy@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/peggy/-/peggy-1.2.0.tgz#657ba45900cbef1dc9f52356704bdbb193c2021c" - integrity sha512-PQ+NKpAobImfMprYQtc4Egmyi29bidRGEX0kKjCU5uuW09s0Cthwqhfy7mLkwcB4VcgacE5L/ZjruD/kOPCUUw== +peggy@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/peggy/-/peggy-2.0.0.tgz#878f3c25719bc6d44a84c04069cfab8cfd043215" + integrity sha512-bvK2jdxHWpxb+0DxD6ibq+iNppJl3UtMSdRwyOvVYc3O3lFM/0oyqcF1Ggwwb2/JS9hrKsPnR0Eheys0J+ykEA== + dependencies: + commander "^9.2.0" + source-map-generator "0.8.0" performance-now@^2.1.0: version "2.1.0" @@ -13565,6 +14526,14 @@ postcss-convert-values@^5.1.0: dependencies: postcss-value-parser "^4.2.0" +postcss-convert-values@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz#31586df4e184c2e8890e8b34a0b9355313f503ab" + integrity sha512-c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g== + dependencies: + browserslist "^4.20.3" + postcss-value-parser "^4.2.0" + postcss-custom-media@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz#1be6aff8be7dc9bf1fe014bde3b71b92bb4552f1" @@ -13596,6 +14565,11 @@ postcss-discard-comments@^5.1.1: resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz#e90019e1a0e5b99de05f63516ce640bd0df3d369" integrity sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ== +postcss-discard-comments@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696" + integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ== + postcss-discard-duplicates@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848" @@ -13724,6 +14698,15 @@ postcss-loader@^6.2.1: klona "^2.0.5" semver "^7.3.5" +postcss-loader@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.0.tgz#367d10eb1c5f1d93700e6b399683a6dc7c3af396" + integrity sha512-IDyttebFzTSY6DI24KuHUcBjbAev1i+RyICoPEWcAstZsj03r533uMXtDn506l6/wlsRYiS5XBdx7TpccCsyUg== + dependencies: + cosmiconfig "^7.0.0" + klona "^2.0.5" + semver "^7.3.7" + postcss-logical@^5.0.4: version "5.0.4" resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.4.tgz#ec75b1ee54421acc04d5921576b7d8db6b0e6f73" @@ -13750,6 +14733,14 @@ postcss-merge-longhand@^5.1.4: postcss-value-parser "^4.2.0" stylehacks "^5.1.0" +postcss-merge-longhand@^5.1.5: + version "5.1.5" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.5.tgz#b0e03bee3b964336f5f33c4fc8eacae608e91c05" + integrity sha512-NOG1grw9wIO+60arKa2YYsrbgvP6tp+jqc7+ZD5/MalIw234ooH2C6KlR6FEn4yle7GqZoBxSK1mLBE9KPur6w== + dependencies: + postcss-value-parser "^4.2.0" + stylehacks "^5.1.0" + postcss-merge-rules@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz#d327b221cd07540bcc8d9ff84446d8b404d00162" @@ -13760,6 +14751,16 @@ postcss-merge-rules@^5.1.1: cssnano-utils "^3.1.0" postcss-selector-parser "^6.0.5" +postcss-merge-rules@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz#7049a14d4211045412116d79b751def4484473a5" + integrity sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ== + dependencies: + browserslist "^4.16.6" + caniuse-api "^3.0.0" + cssnano-utils "^3.1.0" + postcss-selector-parser "^6.0.5" + postcss-minify-font-values@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b" @@ -13785,6 +14786,15 @@ postcss-minify-params@^5.1.2: cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" +postcss-minify-params@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz#ac41a6465be2db735099bbd1798d85079a6dc1f9" + integrity sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg== + dependencies: + browserslist "^4.16.6" + cssnano-utils "^3.1.0" + postcss-value-parser "^4.2.0" + postcss-minify-selectors@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c" @@ -13792,6 +14802,13 @@ postcss-minify-selectors@^5.2.0: dependencies: postcss-selector-parser "^6.0.5" +postcss-minify-selectors@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6" + integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg== + dependencies: + postcss-selector-parser "^6.0.5" + postcss-modules-extract-imports@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" @@ -14118,6 +15135,15 @@ postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.12, postcss@^8.4. picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^8.4.14: + version "8.4.14" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" + integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== + dependencies: + nanoid "^3.3.4" + picocolors "^1.0.0" + source-map-js "^1.0.2" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -14193,7 +15219,7 @@ pretty-time@^1.1.0: resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA== -prism-react-renderer@^1.3.1, prism-react-renderer@^1.3.3: +prism-react-renderer@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.3.tgz#9b5a4211a6756eee3c96fee9a05733abc0b0805c" integrity sha512-Viur/7tBTCH2HmYzwCHmt2rEFn+rdIWNIINXyg0StiISbDiIhHKhrFuEK8eMkKgvsIYSjgGqy/hNyucHp6FpoQ== @@ -14693,6 +15719,19 @@ react-router-dom@^5.2.0: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" +react-router-dom@^5.3.3: + version "5.3.3" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.3.tgz#8779fc28e6691d07afcaf98406d3812fe6f11199" + integrity sha512-Ov0tGPMBgqmbu5CDmN++tv2HQ9HlWDuWIIqn4b88gjlAN5IHI+4ZUZRcpz9Hl0azFIwihbLDYw1OiHGRo7ZIng== + dependencies: + "@babel/runtime" "^7.12.13" + history "^4.9.0" + loose-envify "^1.3.1" + prop-types "^15.6.2" + react-router "5.3.3" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" + react-router@5.3.1, react-router@^5.2.0: version "5.3.1" resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.1.tgz#b13e84a016c79b9e80dde123ca4112c4f117e3cf" @@ -14709,6 +15748,22 @@ react-router@5.3.1, react-router@^5.2.0: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" +react-router@5.3.3, react-router@^5.3.3: + version "5.3.3" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.3.tgz#8e3841f4089e728cf82a429d92cdcaa5e4a3a288" + integrity sha512-mzQGUvS3bM84TnbtMYR8ZjKnuPJ71IjSzR+DE6UkUqvN4czWIqEs17yLL8xkAycv4ev0AiN+IGrWu88vJs/p2w== + dependencies: + "@babel/runtime" "^7.12.13" + history "^4.9.0" + hoist-non-react-statics "^3.1.0" + loose-envify "^1.3.1" + mini-create-react-context "^0.4.0" + path-to-regexp "^1.7.0" + prop-types "^15.6.2" + react-is "^16.6.0" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" + react-scripts@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-5.0.1.tgz#6285dbd65a8ba6e49ca8d651ce30645a6d980003" @@ -15928,6 +16983,11 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +source-map-generator@0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/source-map-generator/-/source-map-generator-0.8.0.tgz#10d5ca0651e2c9302ea338739cbd4408849c5d00" + integrity sha512-psgxdGMwl5MZM9S3FWee4EgsEaIjahYV5AzGnwUvPhWeITz/j6rKpysQHlQ4USdxvINlb8lKfWGIXwfkrgtqkA== + source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" @@ -16982,7 +18042,7 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.1, tslib@^2.4.0: +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== From d13e6f7adda0ddb4b5374730fc82fb8ec4b8ca41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:31:36 +0000 Subject: [PATCH 281/340] :arrow_up: Bump react-hook-form from 7.31.2 to 7.31.3 Bumps [react-hook-form](https://github.com/react-hook-form/react-hook-form) from 7.31.2 to 7.31.3. - [Release notes](https://github.com/react-hook-form/react-hook-form/releases) - [Changelog](https://github.com/react-hook-form/react-hook-form/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-hook-form/react-hook-form/compare/v7.31.2...v7.31.3) --- updated-dependencies: - dependency-name: react-hook-form dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index f55adb05..29bb3d56 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -10,7 +10,7 @@ "react": "^18.1.0", "react-ace": "^10.1.0", "react-dom": "^18.1.0", - "react-hook-form": "^7.31.2", + "react-hook-form": "^7.31.3", "react-use": "^17.4.0", "react-vega": "^7.5.1", "vega": "^5.22.1", diff --git a/yarn.lock b/yarn.lock index e4247dc2..d4f388dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14545,10 +14545,10 @@ react-helmet-async@*, react-helmet-async@^1.3.0: react-fast-compare "^3.2.0" shallowequal "^1.1.0" -react-hook-form@^7.31.2: - version "7.31.2" - resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.31.2.tgz#efb7ac469810954488b7cf40be4e5017122c6e5e" - integrity sha512-oPudn3YuyzWg//IsT9z2cMEjWocAgHWX/bmueDT8cmsYQnGY5h7/njjvMDfLVv3mbdhYBjslTRnII2MIT7eNCA== +react-hook-form@^7.31.3: + version "7.31.3" + resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.31.3.tgz#b61bafb9a7435f91695351a7a9f714d8c4df0121" + integrity sha512-NVZdCWViIWXXXlQ3jxVQH0NuNfwPf8A/0KvuCxrM9qxtP1qYosfR2ZudarziFrVOC7eTUbWbm1T4OyYCwv9oSQ== react-inspector@^5.1.0: version "5.1.1" From eb08b6aa1cb99416252bb089b5682599ce647cd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:31:56 +0000 Subject: [PATCH 282/340] :arrow_up: Bump @storybook/builder-webpack5 from 6.5.4 to 6.5.6 Bumps [@storybook/builder-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.5.4 to 6.5.6. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.6/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.5.6/lib/core) --- updated-dependencies: - dependency-name: "@storybook/builder-webpack5" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 282 ++----------------------------- 2 files changed, 19 insertions(+), 265 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index f55adb05..fb1d6862 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -23,7 +23,7 @@ "@storybook/addon-actions": "^6.5.6", "@storybook/addon-essentials": "^6.5.6", "@storybook/addon-links": "^6.5.6", - "@storybook/builder-webpack5": "^6.5.4", + "@storybook/builder-webpack5": "^6.5.6", "@storybook/manager-webpack5": "^6.5.6", "@storybook/node-logger": "^6.5.6", "@storybook/preset-create-react-app": "^4.1.1", diff --git a/yarn.lock b/yarn.lock index e4247dc2..0fcf2a12 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2906,23 +2906,6 @@ prop-types "^15.7.2" regenerator-runtime "^0.13.7" -"@storybook/addons@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.5.4.tgz#10cf41ab8aa3c509963599092fe8f3cf9a15edb6" - integrity sha512-biPtPQ80HwVJeJl6ghF0yFMWZ9apuh+oxCWezeb9t0lr7EB8MLbZAGz8PbRerwDzV+mW4ZNV2RSvvnDD5MH/zg== - dependencies: - "@storybook/api" "6.5.4" - "@storybook/channels" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/router" "6.5.4" - "@storybook/theming" "6.5.4" - "@types/webpack-env" "^1.16.0" - core-js "^3.8.2" - global "^4.4.0" - regenerator-runtime "^0.13.7" - "@storybook/addons@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-6.5.6.tgz#ed7ab72ac3a4e2d74e2ba4d10b4a0721d66cd1cd" @@ -2940,29 +2923,6 @@ global "^4.4.0" regenerator-runtime "^0.13.7" -"@storybook/api@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.4.tgz#faa06cde4990fd3b2be551ff869fc44a80e66e53" - integrity sha512-nZAf7/6bcOMb6yDYsCr2rWZuKtGfHQhyVvlW7uD1uPVytQ0OHS/D215C2odTNvIRxTiG67dQ4zeXcZPHHar+qQ== - dependencies: - "@storybook/channels" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/router" "6.5.4" - "@storybook/semver" "^7.3.2" - "@storybook/theming" "6.5.4" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - regenerator-runtime "^0.13.7" - store2 "^2.12.0" - telejson "^6.0.8" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/api@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/api/-/api-6.5.6.tgz#7f7c7bc561b3888033eb7074a8c9ecce9f07cb54" @@ -3039,27 +2999,27 @@ webpack-hot-middleware "^2.25.1" webpack-virtual-modules "^0.2.2" -"@storybook/builder-webpack5@^6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.5.4.tgz#bc5b87848d3b8a854b5fe29a2f646184431075d4" - integrity sha512-BoqQkgnyqwySEcfaDreBG9SUnGTzp8jcfdUPqewtqyJK5qQgh79v2VowpSxT00G+eyWcsDkct2U4JnTmjrDpDg== +"@storybook/builder-webpack5@^6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.5.6.tgz#ec72827b3b6999362102eb6d173465ae29a94a9d" + integrity sha512-inR1xh16barDutfoxv8MCTQTztASLpewDsu6YDs87ifYlYfWuS/NlbY290EWj4D8je1LY53Rpbpkorj/49wCeA== dependencies: "@babel/core" "^7.12.10" - "@storybook/addons" "6.5.4" - "@storybook/api" "6.5.4" - "@storybook/channel-postmessage" "6.5.4" - "@storybook/channels" "6.5.4" - "@storybook/client-api" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/components" "6.5.4" - "@storybook/core-common" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/node-logger" "6.5.4" - "@storybook/preview-web" "6.5.4" - "@storybook/router" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/api" "6.5.6" + "@storybook/channel-postmessage" "6.5.6" + "@storybook/channels" "6.5.6" + "@storybook/client-api" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/components" "6.5.6" + "@storybook/core-common" "6.5.6" + "@storybook/core-events" "6.5.6" + "@storybook/node-logger" "6.5.6" + "@storybook/preview-web" "6.5.6" + "@storybook/router" "6.5.6" "@storybook/semver" "^7.3.2" - "@storybook/store" "6.5.4" - "@storybook/theming" "6.5.4" + "@storybook/store" "6.5.6" + "@storybook/theming" "6.5.6" "@types/node" "^14.0.10 || ^16.0.0" babel-loader "^8.0.0" babel-plugin-named-exports-order "^0.0.2" @@ -3083,19 +3043,6 @@ webpack-hot-middleware "^2.25.1" webpack-virtual-modules "^0.4.1" -"@storybook/channel-postmessage@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.5.4.tgz#246483250e0e538d7455630d560149b1e974c5d3" - integrity sha512-K9UG32KRXB4YKg9/WpyE6aoWBjOI2+XkFbjab9FEpI7zxJSEjKlOIqJk1uE9Xm+oWNvj80MvwD9ecGtJtw9BsA== - dependencies: - "@storybook/channels" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core-events" "6.5.4" - core-js "^3.8.2" - global "^4.4.0" - qs "^6.10.0" - telejson "^6.0.8" - "@storybook/channel-postmessage@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-6.5.6.tgz#3cfaef29c9ff62321152924de478058fdfd9d812" @@ -3120,15 +3067,6 @@ global "^4.4.0" telejson "^6.0.8" -"@storybook/channels@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.4.tgz#a3fdc20d45cf4aa74b5310e5e4eb111e353a408a" - integrity sha512-I78N4AIipaD5mrkh5p3Yiu4iim2G3Ci7N8Y7UeRtQ4TJJzSAEuYMm7ydlpmoEM6G+4+hdU0lG2GjaeWNkIFvtA== - dependencies: - core-js "^3.8.2" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/channels@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-6.5.6.tgz#a373127f0dd841dabfc31607e5cdac6245444b6c" @@ -3138,32 +3076,6 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/client-api@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.4.tgz#e79418ffb21857deb98f5b7fd88dfe23ef12cfe7" - integrity sha512-2QMcjXBOxGiqcBWqZu/v1lXSiT8jRCiHL8yiUncYK57rRwB6xltX43CcY9IZRnq2iNtQ+BfrWV6RgtbIa9mHhg== - dependencies: - "@storybook/addons" "6.5.4" - "@storybook/channel-postmessage" "6.5.4" - "@storybook/channels" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/store" "6.5.4" - "@types/qs" "^6.9.5" - "@types/webpack-env" "^1.16.0" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - store2 "^2.12.0" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/client-api@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-6.5.6.tgz#935026e682d41f8f9cd122dccd8a9ae3ebc3b613" @@ -3190,14 +3102,6 @@ ts-dedent "^2.0.0" util-deprecate "^1.0.2" -"@storybook/client-logger@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.4.tgz#57348015276e0453675968f6ca31d908ceb498ae" - integrity sha512-8z5cdocpLW2bK6lTGdlBoX8njmNLTd9rrzSEIYRtobAbWjyfB6leCY6F79OVDZCXGsXIOrx/e1fwzioCT/sJSQ== - dependencies: - core-js "^3.8.2" - global "^4.4.0" - "@storybook/client-logger@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-6.5.6.tgz#6ce56c687dcd7772247ffa3915b44737a62f729c" @@ -3206,21 +3110,6 @@ core-js "^3.8.2" global "^4.4.0" -"@storybook/components@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.4.tgz#8afdbba252ab957ba53318b34cb2593da964747b" - integrity sha512-FCJJm2r/OzW3QvavTCdHZeTubJkbNJeoiGKeZs9kMYSgDZAr4cDUr1xUl30Hw57Uy3TCY9gnYdtGZgCP1tQiLw== - dependencies: - "@storybook/client-logger" "6.5.4" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/theming" "6.5.4" - "@types/react-syntax-highlighter" "11.0.5" - core-js "^3.8.2" - qs "^6.10.0" - react-syntax-highlighter "^15.4.5" - regenerator-runtime "^0.13.7" - util-deprecate "^1.0.2" - "@storybook/components@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/components/-/components-6.5.6.tgz#83f03967bdd1c509e5d18111b924a8cb0789718a" @@ -3262,62 +3151,6 @@ unfetch "^4.2.0" util-deprecate "^1.0.2" -"@storybook/core-common@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.4.tgz#e77f48a2c93b5eb656a3ad6dd0c01903ba7e57f3" - integrity sha512-JJ9PJr8FRUfTVC9KvkTl+K1Fut1hxMOJYuknmh8HdL8mSFzFIUzaizggEf9X7WT+0VVQkzj3Yit6s6dWA5Rh8w== - dependencies: - "@babel/core" "^7.12.10" - "@babel/plugin-proposal-class-properties" "^7.12.1" - "@babel/plugin-proposal-decorators" "^7.12.12" - "@babel/plugin-proposal-export-default-from" "^7.12.1" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1" - "@babel/plugin-proposal-object-rest-spread" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.12.7" - "@babel/plugin-proposal-private-methods" "^7.12.1" - "@babel/plugin-proposal-private-property-in-object" "^7.12.1" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-transform-arrow-functions" "^7.12.1" - "@babel/plugin-transform-block-scoping" "^7.12.12" - "@babel/plugin-transform-classes" "^7.12.1" - "@babel/plugin-transform-destructuring" "^7.12.1" - "@babel/plugin-transform-for-of" "^7.12.1" - "@babel/plugin-transform-parameters" "^7.12.1" - "@babel/plugin-transform-shorthand-properties" "^7.12.1" - "@babel/plugin-transform-spread" "^7.12.1" - "@babel/preset-env" "^7.12.11" - "@babel/preset-react" "^7.12.10" - "@babel/preset-typescript" "^7.12.7" - "@babel/register" "^7.12.1" - "@storybook/node-logger" "6.5.4" - "@storybook/semver" "^7.3.2" - "@types/node" "^14.0.10 || ^16.0.0" - "@types/pretty-hrtime" "^1.0.0" - babel-loader "^8.0.0" - babel-plugin-macros "^3.0.1" - babel-plugin-polyfill-corejs3 "^0.1.0" - chalk "^4.1.0" - core-js "^3.8.2" - express "^4.17.1" - file-system-cache "^1.0.5" - find-up "^5.0.0" - fork-ts-checker-webpack-plugin "^6.0.4" - fs-extra "^9.0.1" - glob "^7.1.6" - handlebars "^4.7.7" - interpret "^2.2.0" - json5 "^2.1.3" - lazy-universal-dotenv "^3.0.1" - picomatch "^2.3.0" - pkg-dir "^5.0.0" - pretty-hrtime "^1.0.3" - resolve-from "^5.0.0" - slash "^3.0.0" - telejson "^6.0.8" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - webpack "4" - "@storybook/core-common@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/core-common/-/core-common-6.5.6.tgz#12c717f2fb9cad77b38e122fb89c15566130798a" @@ -3374,13 +3207,6 @@ util-deprecate "^1.0.2" webpack "4" -"@storybook/core-events@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.4.tgz#0c68ee42ac5afcc8ee7b56cd057d9a90d244067c" - integrity sha512-b03mPlzfX/TkeKqi7cgFzRof80dBb98w7ui6x0GzIXXcG/O0KebzqZ41/vXQICwsbkAIp5JQdkTEq9RUOh/KCg== - dependencies: - core-js "^3.8.2" - "@storybook/core-events@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-6.5.6.tgz#b4e9150216810621ba00d8d1eb3f9414493d6e61" @@ -3583,17 +3409,6 @@ prettier ">=2.2.1 <=2.3.0" ts-dedent "^2.0.0" -"@storybook/node-logger@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.4.tgz#1887abd364fd401ac7b76b313f92f12005a28c6f" - integrity sha512-2rK9oTBhvRm4VOr1ywIWXfWEXVbuV7wGdZu4hpSDlkhnBBFCyYBJH9asEJVoB4Qk77HPMCqkw2IHpstVjkASXQ== - dependencies: - "@types/npmlog" "^4.1.2" - chalk "^4.1.0" - core-js "^3.8.2" - npmlog "^5.0.1" - pretty-hrtime "^1.0.3" - "@storybook/node-logger@6.5.6", "@storybook/node-logger@^6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-6.5.6.tgz#24422886f894978b10c2e23feb6bf0657f5e514f" @@ -3624,28 +3439,6 @@ pnp-webpack-plugin "^1.7.0" semver "^7.3.5" -"@storybook/preview-web@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.5.4.tgz#a6899add3be1937ea79c14c4861c0f038c71efaa" - integrity sha512-mbyZI0ProlLSB5MVe+YvoCt+XtlyBvP3lzTVdPZWVVtRN6DK5SEcfsK9//rgmqxiYYXfSKfyI53skYZkKAIEcA== - dependencies: - "@storybook/addons" "6.5.4" - "@storybook/channel-postmessage" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/store" "6.5.4" - ansi-to-html "^0.6.11" - core-js "^3.8.2" - global "^4.4.0" - lodash "^4.17.21" - qs "^6.10.0" - regenerator-runtime "^0.13.7" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - unfetch "^4.2.0" - util-deprecate "^1.0.2" - "@storybook/preview-web@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/preview-web/-/preview-web-6.5.6.tgz#d4cf4a90a27819aa3315b48b21df6a515bb49b7a" @@ -3722,15 +3515,6 @@ util-deprecate "^1.0.2" webpack ">=4.43.0 <6.0.0" -"@storybook/router@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.5.4.tgz#575f4ae36629086622a8b41626226ba4da025bb7" - integrity sha512-Xw0oYaJSxd/zPUiZw8AoQRCdrePuxsn1XwlDvzfNlMnPnU17LAFzVf8kpHPXvx01F9pLnGI4ZggsjVomHy/E1Q== - dependencies: - "@storybook/client-logger" "6.5.4" - core-js "^3.8.2" - regenerator-runtime "^0.13.7" - "@storybook/router@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/router/-/router-6.5.6.tgz#83b442635c5a32a0eb0b4cd3f2da8b7cbecc32e7" @@ -3764,27 +3548,6 @@ prettier ">=2.2.1 <=2.3.0" regenerator-runtime "^0.13.7" -"@storybook/store@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.5.4.tgz#7770b7bffcc6c254a2497db2d4b1ee93b7a62659" - integrity sha512-hCHSQorxRVGseVlIfM4JXbJHkA6AAXuAFl+QsUTjG24q3zAc3sIE2nbH5KsHuJN5NorjcrGeLQOAO9amqzUeHA== - dependencies: - "@storybook/addons" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core-events" "6.5.4" - "@storybook/csf" "0.0.2--canary.4566f4d.1" - core-js "^3.8.2" - fast-deep-equal "^3.1.3" - global "^4.4.0" - lodash "^4.17.21" - memoizerific "^1.11.3" - regenerator-runtime "^0.13.7" - slash "^3.0.0" - stable "^0.1.8" - synchronous-promise "^2.0.15" - ts-dedent "^2.0.0" - util-deprecate "^1.0.2" - "@storybook/store@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/store/-/store-6.5.6.tgz#0250d92f10d9590f4df2f7e6e11a07103055c350" @@ -3824,15 +3587,6 @@ read-pkg-up "^7.0.1" regenerator-runtime "^0.13.7" -"@storybook/theming@6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.5.4.tgz#3be001bf425f682f6e16ce3581e8cd109c85f8ea" - integrity sha512-J5ipCqKH8FfMVj8SuVsjxSIYgb9GN8NBsVAVvTakVjqyKnv5znR+w+h0lvyzRNaEnF5LQCy7Uj7DE6+Pbg/wPw== - dependencies: - "@storybook/client-logger" "6.5.4" - core-js "^3.8.2" - regenerator-runtime "^0.13.7" - "@storybook/theming@6.5.6": version "6.5.6" resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-6.5.6.tgz#519e1675a7ff5c780f5a41b05b4b679c37b62fe8" From 4ecf459bbb1eb685a6a3d2b7cb8fa24e6e6050b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:32:55 +0000 Subject: [PATCH 283/340] :arrow_up: Bump typescript from 4.6.4 to 4.7.2 Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.6.4 to 4.7.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.6.4...v4.7.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- packages/squiggle-lang/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index f55adb05..e3836812 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -44,7 +44,7 @@ "tailwindcss": "^3.0.24", "ts-loader": "^9.3.0", "tsconfig-paths-webpack-plugin": "^3.5.2", - "typescript": "^4.6.3", + "typescript": "^4.7.2", "web-vitals": "^2.1.4", "webpack": "^5.72.1", "webpack-cli": "^4.9.2", diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 5a5172f6..4edda9b1 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -62,7 +62,7 @@ "ts-jest": "^27.1.4", "ts-loader": "^9.3.0", "ts-node": "^10.8.0", - "typescript": "^4.6.3", + "typescript": "^4.7.2", "webpack": "^5.72.1", "webpack-cli": "^4.9.2" }, diff --git a/yarn.lock b/yarn.lock index e4247dc2..e196a60b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17011,10 +17011,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^4.6.3: - version "4.6.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" - integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== +typescript@^4.7.2: + version "4.7.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4" + integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A== ua-parser-js@^0.7.30: version "0.7.31" From f1756cd38380f8a6408f79d5607ace0caaa36ee6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:38:20 +0000 Subject: [PATCH 284/340] :arrow_up: Bump mathjs from 10.5.2 to 10.6.0 Bumps [mathjs](https://github.com/josdejong/mathjs) from 10.5.2 to 10.6.0. - [Release notes](https://github.com/josdejong/mathjs/releases) - [Changelog](https://github.com/josdejong/mathjs/blob/develop/HISTORY.md) - [Commits](https://github.com/josdejong/mathjs/compare/v10.5.2...v10.6.0) --- updated-dependencies: - dependency-name: mathjs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/squiggle-lang/package.json | 4 ++-- yarn.lock | 32 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 5a5172f6..db99886f 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -38,7 +38,7 @@ "dependencies": { "@stdlib/stats": "^0.0.13", "jstat": "^1.9.5", - "mathjs": "^10.5.2", + "mathjs": "^10.6.0", "pdfast": "^0.2.0", "rescript": "^9.1.4" }, @@ -57,7 +57,7 @@ "moduleserve": "^0.9.1", "nyc": "^15.1.0", "peggy": "^2.0.0", - "reanalyze": "^2.19.0", + "reanalyze": "^2.22.0", "rescript-fast-check": "^1.1.1", "ts-jest": "^27.1.4", "ts-loader": "^9.3.0", diff --git a/yarn.lock b/yarn.lock index fe1e63a9..bf2df14f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2828,16 +2828,16 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-links@^6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.4.tgz#51e2944ba2ba45d70b6debacbc0f5d8ad664f62b" - integrity sha512-mJcg4Gpo7P6TFdyWpE2DQcMwSjfotPST3y713Ircgc+sYOouIPRdrxGpdvhLWWncsC5wK/z2xZyYtBWPNiKN/g== +"@storybook/addon-links@^6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.6.tgz#1074d239c3c9c8b7168d20c9cc20b8918e4993a6" + integrity sha512-a4+9HLc6+M9qv5Fvezoc8AJYze8HDfHlsEFvCY1AtQiyVEmxFRNBdAp6w+/teNzihXWY78EKRcGM0jjyt+9mWg== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/router" "6.5.4" + "@storybook/router" "6.5.6" "@types/qs" "^6.9.5" core-js "^3.8.2" global "^4.4.0" @@ -12042,10 +12042,10 @@ markdown-escapes@^1.0.0: resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg== -mathjs@^10.5.2: - version "10.5.2" - resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-10.5.2.tgz#bf0618b99b662a3af8a2613b6489ec0422314b08" - integrity sha512-yLl2yA597A+07+xsOgy1+pq/m4ZokQceWQbB9OsIkK2guCpA2Px9k11zul93eJAA0WUFZiMK6VcruY9ZBbSKjA== +mathjs@^10.6.0: + version "10.6.0" + resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-10.6.0.tgz#7d9a36fa98c727d05fadadf1f4dba99fff071ab9" + integrity sha512-4oI0CSX7LtcyexTSLV8uo+llj8hB5LvVE9ApjN6rBjBplQaZ4/Gr3jh0zEla9+KaCig5wonZ9oFKD+GKXFL8hg== dependencies: "@babel/runtime" "^7.17.9" complex.js "^2.1.1" @@ -14833,10 +14833,10 @@ reading-time@^1.5.0: resolved "https://registry.yarnpkg.com/reading-time/-/reading-time-1.5.0.tgz#d2a7f1b6057cb2e169beaf87113cc3411b5bc5bb" integrity sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg== -reanalyze@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/reanalyze/-/reanalyze-2.19.0.tgz#b34b16bd7249a07dc931bb3cc58410247bb36a03" - integrity sha512-ycVr19BH6b2J70BmG6nUIzrFWiBNLUCmip6D2NEPLpnJimF6wagE+BIksI6vcTCovqWjgNMKhFCbZKwm+5/8VQ== +reanalyze@^2.22.0: + version "2.22.0" + resolved "https://registry.yarnpkg.com/reanalyze/-/reanalyze-2.22.0.tgz#068cfb354b6e9aa95ceb8dbb04329a67b4a90494" + integrity sha512-VNwTXBsyuUbCkmcb2GkYYjQxv3NQW4CombkNd+n5E+YWNqF5LLFi1N5bETR09C2hbuOE1fM6RTJKgbijZX7jyA== rechoir@^0.6.2: version "0.6.2" From c85242a5ee950118916252ff0d18ece00113e88f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:39:53 +0000 Subject: [PATCH 285/340] :arrow_up: Bump gentype from 4.3.0 to 4.4.0 Bumps [gentype](https://github.com/cristianoc/gentype) from 4.3.0 to 4.4.0. - [Release notes](https://github.com/cristianoc/gentype/releases) - [Changelog](https://github.com/rescript-association/genType/blob/master/Changes.md) - [Commits](https://github.com/cristianoc/gentype/compare/v4.3.0...v4.4.0) --- updated-dependencies: - dependency-name: gentype dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/squiggle-lang/package.json | 4 ++-- yarn.lock | 32 ++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/squiggle-lang/package.json b/packages/squiggle-lang/package.json index 5a5172f6..296d01af 100644 --- a/packages/squiggle-lang/package.json +++ b/packages/squiggle-lang/package.json @@ -51,13 +51,13 @@ "chalk": "^5.0.1", "codecov": "^3.8.3", "fast-check": "^2.25.0", - "gentype": "^4.3.0", + "gentype": "^4.4.0", "jest": "^27.5.1", "lodash": "^4.17.21", "moduleserve": "^0.9.1", "nyc": "^15.1.0", "peggy": "^2.0.0", - "reanalyze": "^2.19.0", + "reanalyze": "^2.22.0", "rescript-fast-check": "^1.1.1", "ts-jest": "^27.1.4", "ts-loader": "^9.3.0", diff --git a/yarn.lock b/yarn.lock index fe1e63a9..f92c8a00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2828,16 +2828,16 @@ regenerator-runtime "^0.13.7" ts-dedent "^2.0.0" -"@storybook/addon-links@^6.5.4": - version "6.5.4" - resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.4.tgz#51e2944ba2ba45d70b6debacbc0f5d8ad664f62b" - integrity sha512-mJcg4Gpo7P6TFdyWpE2DQcMwSjfotPST3y713Ircgc+sYOouIPRdrxGpdvhLWWncsC5wK/z2xZyYtBWPNiKN/g== +"@storybook/addon-links@^6.5.6": + version "6.5.6" + resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.6.tgz#1074d239c3c9c8b7168d20c9cc20b8918e4993a6" + integrity sha512-a4+9HLc6+M9qv5Fvezoc8AJYze8HDfHlsEFvCY1AtQiyVEmxFRNBdAp6w+/teNzihXWY78EKRcGM0jjyt+9mWg== dependencies: - "@storybook/addons" "6.5.4" - "@storybook/client-logger" "6.5.4" - "@storybook/core-events" "6.5.4" + "@storybook/addons" "6.5.6" + "@storybook/client-logger" "6.5.6" + "@storybook/core-events" "6.5.6" "@storybook/csf" "0.0.2--canary.4566f4d.1" - "@storybook/router" "6.5.4" + "@storybook/router" "6.5.6" "@types/qs" "^6.9.5" core-js "^3.8.2" global "^4.4.0" @@ -9361,10 +9361,10 @@ gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -gentype@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/gentype/-/gentype-4.3.0.tgz#ebac3abcdde2ce2a8fc85611b11568a4cb349c8d" - integrity sha512-lqkc1ZS/Iog4uslRD4De47OV54Hu61vEBsirMKxRlgHIRvm8u6RqsdKxJ7JdJdrzmtKgPNvq1He69SozzW+6dQ== +gentype@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/gentype/-/gentype-4.4.0.tgz#20a61776703ce79c638c4db34b8808e1896d3267" + integrity sha512-hLcKmMhD3DJzHffDqwYUkEZfdGSWJk6ehYmdzGHBs35mTJa2dhiAp31WqmhjkZIqKvD+A+gFEE+//QHG5dZfwg== get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" @@ -14833,10 +14833,10 @@ reading-time@^1.5.0: resolved "https://registry.yarnpkg.com/reading-time/-/reading-time-1.5.0.tgz#d2a7f1b6057cb2e169beaf87113cc3411b5bc5bb" integrity sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg== -reanalyze@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/reanalyze/-/reanalyze-2.19.0.tgz#b34b16bd7249a07dc931bb3cc58410247bb36a03" - integrity sha512-ycVr19BH6b2J70BmG6nUIzrFWiBNLUCmip6D2NEPLpnJimF6wagE+BIksI6vcTCovqWjgNMKhFCbZKwm+5/8VQ== +reanalyze@^2.22.0: + version "2.22.0" + resolved "https://registry.yarnpkg.com/reanalyze/-/reanalyze-2.22.0.tgz#068cfb354b6e9aa95ceb8dbb04329a67b4a90494" + integrity sha512-VNwTXBsyuUbCkmcb2GkYYjQxv3NQW4CombkNd+n5E+YWNqF5LLFi1N5bETR09C2hbuOE1fM6RTJKgbijZX7jyA== rechoir@^0.6.2: version "0.6.2" From 374f115055e8f0ad538f8419b941f6e16a7be712 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:40:37 +0000 Subject: [PATCH 286/340] :arrow_up: Bump @types/react-dom from 18.0.4 to 18.0.5 Bumps [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) from 18.0.4 to 18.0.5. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom) --- updated-dependencies: - dependency-name: "@types/react-dom" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/components/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index de7ff65c..c586ce98 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -35,7 +35,7 @@ "@types/lodash": "^4.14.182", "@types/node": "^17.0.36", "@types/react": "^18.0.9", - "@types/react-dom": "^18.0.4", + "@types/react-dom": "^18.0.5", "@types/styled-components": "^5.1.24", "@types/webpack": "^5.28.0", "cross-env": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index 577b4c33..4cc5c771 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5083,10 +5083,10 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== -"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.4": - version "18.0.4" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.4.tgz#dcbcadb277bcf6c411ceff70069424c57797d375" - integrity sha512-FgTtbqPOCI3dzZPZoC2T/sx3L34qxy99ITWn4eoSA95qPyXDMH0ALoAqUp49ITniiJFsXUVBtalh/KffMpg21Q== +"@types/react-dom@^18.0.0", "@types/react-dom@^18.0.5": + version "18.0.5" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.5.tgz#330b2d472c22f796e5531446939eacef8378444a" + integrity sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA== dependencies: "@types/react" "*" From f17a3e5a03bead802ff5d0d3893a86dd6a6b79ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 15:48:16 +0000 Subject: [PATCH 287/340] :arrow_up: Bump @docusaurus/core from 2.0.0-beta.20 to 2.0.0-beta.21 Bumps [@docusaurus/core](https://github.com/facebook/docusaurus/tree/HEAD/packages/docusaurus) from 2.0.0-beta.20 to 2.0.0-beta.21. - [Release notes](https://github.com/facebook/docusaurus/releases) - [Changelog](https://github.com/facebook/docusaurus/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/docusaurus/commits/v2.0.0-beta.21/packages/docusaurus) --- updated-dependencies: - dependency-name: "@docusaurus/core" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/website/package.json | 2 +- yarn.lock | 791 +++------------------------------- 2 files changed, 53 insertions(+), 740 deletions(-) diff --git a/packages/website/package.json b/packages/website/package.json index 158c1ff9..afba63a2 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -12,7 +12,7 @@ "format": "prettier --write ." }, "dependencies": { - "@docusaurus/core": "2.0.0-beta.20", + "@docusaurus/core": "2.0.0-beta.21", "@docusaurus/preset-classic": "2.0.0-beta.21", "@quri/squiggle-components": "^0.2.20", "clsx": "^1.1.1", diff --git a/yarn.lock b/yarn.lock index 69d1ed2b..768e17bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -278,28 +278,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.16.0", "@babel/core@^7.17.10", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.10.tgz#74ef0fbf56b7dfc3f198fc2d927f4f03e12f4b05" - integrity sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA== - dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.10" - "@babel/helper-compilation-targets" "^7.17.10" - "@babel/helper-module-transforms" "^7.17.7" - "@babel/helpers" "^7.17.9" - "@babel/parser" "^7.17.10" - "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.10" - "@babel/types" "^7.17.10" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.1" - semver "^6.3.0" - -"@babel/core@^7.18.2": +"@babel/core@^7.1.0", "@babel/core@^7.11.1", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.15.5", "@babel/core@^7.16.0", "@babel/core@^7.18.2", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0": version "7.18.2" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876" integrity sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ== @@ -329,16 +308,7 @@ eslint-visitor-keys "^2.1.0" semver "^6.3.0" -"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.17.10", "@babel/generator@^7.7.2": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.10.tgz#c281fa35b0c349bbe9d02916f4ae08fc85ed7189" - integrity sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg== - dependencies: - "@babel/types" "^7.17.10" - "@jridgewell/gen-mapping" "^0.1.0" - jsesc "^2.5.1" - -"@babel/generator@^7.18.2": +"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.18.2", "@babel/generator@^7.7.2": version "7.18.2" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d" integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw== @@ -382,7 +352,7 @@ browserslist "^4.20.2" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.17.6", "@babel/helper-create-class-features-plugin@^7.17.9": +"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.17.9": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.12.tgz#d4f8393fc4838cbff6b7c199af5229aee16d07cf" integrity sha512-sZoOeUTkFJMyhqCei2+Z+wtH/BehW8NVKQt7IRUQlRiOARuXymJYfN/FCcI8CvVbR0XVyDM6eLFOlR7YtiXnew== @@ -408,7 +378,7 @@ "@babel/helper-replace-supers" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" -"@babel/helper-create-regexp-features-plugin@^7.16.7", "@babel/helper-create-regexp-features-plugin@^7.17.0": +"@babel/helper-create-regexp-features-plugin@^7.16.7": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA== @@ -500,7 +470,7 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7": +"@babel/helper-module-transforms@^7.12.1": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd" integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw== @@ -624,7 +594,7 @@ "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.12.5", "@babel/helpers@^7.17.9": +"@babel/helpers@^7.12.5": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a" integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q== @@ -651,7 +621,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.10": +"@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.10.tgz#873b16db82a8909e0fbd7f115772f4b739f6ce78" integrity sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ== @@ -661,13 +631,6 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef" integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow== -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" - integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e" @@ -675,15 +638,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" - integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.7" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz#0d498ec8f0374b1e2eb54b9cb2c4c78714c77753" @@ -693,15 +647,6 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-proposal-optional-chaining" "^7.17.12" -"@babel/plugin-proposal-async-generator-functions@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" - integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-remap-async-to-generator" "^7.16.8" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-proposal-async-generator-functions@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz#094a417e31ce7e692d84bab06c8e2a607cbeef03" @@ -711,7 +656,7 @@ "@babel/helper-remap-async-to-generator" "^7.16.8" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.16.0", "@babel/plugin-proposal-class-properties@^7.16.7": +"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.16.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww== @@ -727,15 +672,6 @@ "@babel/helper-create-class-features-plugin" "^7.17.12" "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-proposal-class-static-block@^7.17.6": - version "7.17.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c" - integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.17.6" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-proposal-class-static-block@^7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz#7d02253156e3c3793bdb9f2faac3a1c05f0ba710" @@ -773,14 +709,6 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-default-from" "^7.16.7" -"@babel/plugin-proposal-export-namespace-from@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" - integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-proposal-export-namespace-from@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz#b22864ccd662db9606edb2287ea5fd1709f05378" @@ -789,14 +717,6 @@ "@babel/helper-plugin-utils" "^7.17.12" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" - integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-proposal-json-strings@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz#f4642951792437233216d8c1af370bb0fbff4664" @@ -805,14 +725,6 @@ "@babel/helper-plugin-utils" "^7.17.12" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" - integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-proposal-logical-assignment-operators@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz#c64a1bcb2b0a6d0ed2ff674fd120f90ee4b88a23" @@ -821,7 +733,7 @@ "@babel/helper-plugin-utils" "^7.17.12" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": +"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ== @@ -854,7 +766,7 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.0" "@babel/plugin-transform-parameters" "^7.12.1" -"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.17.3": +"@babel/plugin-proposal-object-rest-spread@^7.12.1": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390" integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw== @@ -884,7 +796,7 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.7": +"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.16.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA== @@ -902,7 +814,7 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.12.1", "@babel/plugin-proposal-private-methods@^7.16.0", "@babel/plugin-proposal-private-methods@^7.16.11": +"@babel/plugin-proposal-private-methods@^7.12.1", "@babel/plugin-proposal-private-methods@^7.16.0": version "7.16.11" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw== @@ -918,7 +830,7 @@ "@babel/helper-create-class-features-plugin" "^7.17.12" "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-proposal-private-property-in-object@^7.12.1", "@babel/plugin-proposal-private-property-in-object@^7.16.7", "@babel/plugin-proposal-private-property-in-object@^7.17.12": +"@babel/plugin-proposal-private-property-in-object@^7.12.1", "@babel/plugin-proposal-private-property-in-object@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d" integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg== @@ -928,14 +840,6 @@ "@babel/helper-plugin-utils" "^7.17.12" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" - integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-proposal-unicode-property-regex@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz#3dbd7a67bd7f94c8238b394da112d86aaf32ad4d" @@ -944,6 +848,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.17.12" "@babel/helper-plugin-utils" "^7.17.12" +"@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" + integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" @@ -1105,13 +1017,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.16.7", "@babel/plugin-syntax-typescript@^7.7.2": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz#80031e6042cad6a95ed753f672ebd23c30933195" - integrity sha512-xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-typescript@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz#b54fc3be6de734a56b87508f99d6428b5b605a7b" @@ -1119,7 +1024,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.16.7": +"@babel/plugin-syntax-typescript@^7.7.2": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.10.tgz#80031e6042cad6a95ed753f672ebd23c30933195" + integrity sha512-xJefea1DWXW09pW4Tm9bjwVlPDyYA2it3fWlmEjpYz6alPvTUjL0EOzNzI/FEOyI3r4/J7uVH5UqKgl1TQ5hqQ== + dependencies: + "@babel/helper-plugin-utils" "^7.16.7" + +"@babel/plugin-transform-arrow-functions@^7.12.1": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ== @@ -1133,15 +1045,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-transform-async-to-generator@^7.16.8": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" - integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg== - dependencies: - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-remap-async-to-generator" "^7.16.8" - "@babel/plugin-transform-async-to-generator@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz#dbe5511e6b01eee1496c944e35cdfe3f58050832" @@ -1158,7 +1061,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.16.7": +"@babel/plugin-transform-block-scoping@^7.12.12": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ== @@ -1172,7 +1075,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.16.7": +"@babel/plugin-transform-classes@^7.12.1": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ== @@ -1200,13 +1103,6 @@ "@babel/helper-split-export-declaration" "^7.16.7" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" - integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-transform-computed-properties@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz#bca616a83679698f3258e892ed422546e531387f" @@ -1214,7 +1110,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.17.7": +"@babel/plugin-transform-destructuring@^7.12.1": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1" integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ== @@ -1236,13 +1132,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-duplicate-keys@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" - integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-transform-duplicate-keys@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz#a09aa709a3310013f8e48e0e23bc7ace0f21477c" @@ -1266,7 +1155,7 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-flow" "^7.16.7" -"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.16.7": +"@babel/plugin-transform-for-of@^7.12.1": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg== @@ -1289,13 +1178,6 @@ "@babel/helper-function-name" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-literals@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" - integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-transform-literals@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz#97131fbc6bbb261487105b4b3edbf9ebf9c830ae" @@ -1310,15 +1192,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-modules-amd@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" - integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g== - dependencies: - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" - "@babel/plugin-transform-modules-amd@^7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz#7ef1002e67e36da3155edc8bf1ac9398064c02ed" @@ -1328,16 +1201,6 @@ "@babel/helper-plugin-utils" "^7.17.12" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6" - integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw== - dependencies: - "@babel/helper-module-transforms" "^7.17.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-simple-access" "^7.17.7" - babel-plugin-dynamic-import-node "^2.3.3" - "@babel/plugin-transform-modules-commonjs@^7.18.2": version "7.18.2" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz#1aa8efa2e2a6e818b6a7f2235fceaf09bdb31e9e" @@ -1348,17 +1211,6 @@ "@babel/helper-simple-access" "^7.18.2" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.17.8": - version "7.17.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859" - integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw== - dependencies: - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-module-transforms" "^7.17.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-validator-identifier" "^7.16.7" - babel-plugin-dynamic-import-node "^2.3.3" - "@babel/plugin-transform-modules-systemjs@^7.18.0": version "7.18.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz#3d6fd9868c735cce8f38d6ae3a407fb7e61e6d46" @@ -1370,14 +1222,6 @@ "@babel/helper-validator-identifier" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" - integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ== - dependencies: - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-transform-modules-umd@^7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz#56aac64a2c2a1922341129a4597d1fd5c3ff020f" @@ -1386,13 +1230,6 @@ "@babel/helper-module-transforms" "^7.18.0" "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-transform-named-capturing-groups-regex@^7.17.10": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.10.tgz#715dbcfafdb54ce8bccd3d12e8917296a4ba66a4" - integrity sha512-v54O6yLaJySCs6mGzaVOUw9T967GnH38T6CQSAtnzdNPwu84l2qAjssKzo/WSO8Yi7NF+7ekm5cVbF/5qiIgNA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.17.0" - "@babel/plugin-transform-named-capturing-groups-regex@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz#9c4a5a5966e0434d515f2675c227fd8cc8606931" @@ -1401,13 +1238,6 @@ "@babel/helper-create-regexp-features-plugin" "^7.17.12" "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-transform-new-target@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" - integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-transform-new-target@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz#10842cd605a620944e81ea6060e9e65c265742e3" @@ -1495,13 +1325,6 @@ "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-regenerator@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz#0a33c3a61cf47f45ed3232903683a0afd2d3460c" - integrity sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ== - dependencies: - regenerator-transform "^0.15.0" - "@babel/plugin-transform-regenerator@^7.18.0": version "7.18.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz#44274d655eb3f1af3f3a574ba819d3f48caf99d5" @@ -1510,13 +1333,6 @@ "@babel/helper-plugin-utils" "^7.17.12" regenerator-transform "^0.15.0" -"@babel/plugin-transform-reserved-words@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" - integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-transform-reserved-words@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz#7dbd349f3cdffba751e817cf40ca1386732f652f" @@ -1524,19 +1340,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-transform-runtime@^7.16.4", "@babel/plugin-transform-runtime@^7.17.10": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.10.tgz#b89d821c55d61b5e3d3c3d1d636d8d5a81040ae1" - integrity sha512-6jrMilUAJhktTr56kACL8LnWC5hx3Lf27BS0R0DSyW/OoJfb/iTHeE96V3b1dgKG3FSFdd/0culnYWMkjcKCig== - dependencies: - "@babel/helper-module-imports" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.5.0" - babel-plugin-polyfill-regenerator "^0.3.0" - semver "^6.3.0" - -"@babel/plugin-transform-runtime@^7.18.2": +"@babel/plugin-transform-runtime@^7.16.4", "@babel/plugin-transform-runtime@^7.18.2": version "7.18.2" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.2.tgz#04637de1e45ae8847ff14b9beead09c33d34374d" integrity sha512-mr1ufuRMfS52ttq+1G1PD8OJNqgcTFjq3hwn8SZ5n1x1pBhi0E36rYMdTK0TsKtApJ4lDEdfXJwtGobQMHSMPg== @@ -1555,7 +1359,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.16.7": +"@babel/plugin-transform-spread@^7.12.1": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg== @@ -1578,7 +1382,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.16.7": +"@babel/plugin-transform-template-literals@^7.12.1": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA== @@ -1592,13 +1396,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-transform-typeof-symbol@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" - integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-transform-typeof-symbol@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz#0f12f57ac35e98b35b4ed34829948d42bd0e6889" @@ -1606,15 +1403,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.17.12" -"@babel/plugin-transform-typescript@^7.16.7": - version "7.16.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0" - integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/plugin-syntax-typescript" "^7.16.7" - "@babel/plugin-transform-typescript@^7.17.12": version "7.18.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz#587eaf6a39edb8c06215e550dc939faeadd750bf" @@ -1639,87 +1427,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.12.11", "@babel/preset-env@^7.15.6", "@babel/preset-env@^7.16.4", "@babel/preset-env@^7.17.10": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.17.10.tgz#a81b093669e3eb6541bb81a23173c5963c5de69c" - integrity sha512-YNgyBHZQpeoBSRBg0xixsZzfT58Ze1iZrajvv0lJc70qDDGuGfonEnMGfWeSY0mQ3JTuCWFbMkzFRVafOyJx4g== - dependencies: - "@babel/compat-data" "^7.17.10" - "@babel/helper-compilation-targets" "^7.17.10" - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-validator-option" "^7.16.7" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7" - "@babel/plugin-proposal-async-generator-functions" "^7.16.8" - "@babel/plugin-proposal-class-properties" "^7.16.7" - "@babel/plugin-proposal-class-static-block" "^7.17.6" - "@babel/plugin-proposal-dynamic-import" "^7.16.7" - "@babel/plugin-proposal-export-namespace-from" "^7.16.7" - "@babel/plugin-proposal-json-strings" "^7.16.7" - "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7" - "@babel/plugin-proposal-numeric-separator" "^7.16.7" - "@babel/plugin-proposal-object-rest-spread" "^7.17.3" - "@babel/plugin-proposal-optional-catch-binding" "^7.16.7" - "@babel/plugin-proposal-optional-chaining" "^7.16.7" - "@babel/plugin-proposal-private-methods" "^7.16.11" - "@babel/plugin-proposal-private-property-in-object" "^7.16.7" - "@babel/plugin-proposal-unicode-property-regex" "^7.16.7" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.16.7" - "@babel/plugin-transform-async-to-generator" "^7.16.8" - "@babel/plugin-transform-block-scoped-functions" "^7.16.7" - "@babel/plugin-transform-block-scoping" "^7.16.7" - "@babel/plugin-transform-classes" "^7.16.7" - "@babel/plugin-transform-computed-properties" "^7.16.7" - "@babel/plugin-transform-destructuring" "^7.17.7" - "@babel/plugin-transform-dotall-regex" "^7.16.7" - "@babel/plugin-transform-duplicate-keys" "^7.16.7" - "@babel/plugin-transform-exponentiation-operator" "^7.16.7" - "@babel/plugin-transform-for-of" "^7.16.7" - "@babel/plugin-transform-function-name" "^7.16.7" - "@babel/plugin-transform-literals" "^7.16.7" - "@babel/plugin-transform-member-expression-literals" "^7.16.7" - "@babel/plugin-transform-modules-amd" "^7.16.7" - "@babel/plugin-transform-modules-commonjs" "^7.17.9" - "@babel/plugin-transform-modules-systemjs" "^7.17.8" - "@babel/plugin-transform-modules-umd" "^7.16.7" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.17.10" - "@babel/plugin-transform-new-target" "^7.16.7" - "@babel/plugin-transform-object-super" "^7.16.7" - "@babel/plugin-transform-parameters" "^7.16.7" - "@babel/plugin-transform-property-literals" "^7.16.7" - "@babel/plugin-transform-regenerator" "^7.17.9" - "@babel/plugin-transform-reserved-words" "^7.16.7" - "@babel/plugin-transform-shorthand-properties" "^7.16.7" - "@babel/plugin-transform-spread" "^7.16.7" - "@babel/plugin-transform-sticky-regex" "^7.16.7" - "@babel/plugin-transform-template-literals" "^7.16.7" - "@babel/plugin-transform-typeof-symbol" "^7.16.7" - "@babel/plugin-transform-unicode-escapes" "^7.16.7" - "@babel/plugin-transform-unicode-regex" "^7.16.7" - "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.17.10" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.5.0" - babel-plugin-polyfill-regenerator "^0.3.0" - core-js-compat "^3.22.1" - semver "^6.3.0" - -"@babel/preset-env@^7.18.2": +"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.12.11", "@babel/preset-env@^7.15.6", "@babel/preset-env@^7.16.4", "@babel/preset-env@^7.18.2": version "7.18.2" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.2.tgz#f47d3000a098617926e674c945d95a28cb90977a" integrity sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q== @@ -1820,19 +1528,7 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/preset-react@^7.12.10", "@babel/preset-react@^7.12.5", "@babel/preset-react@^7.14.5", "@babel/preset-react@^7.16.0", "@babel/preset-react@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852" - integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-validator-option" "^7.16.7" - "@babel/plugin-transform-react-display-name" "^7.16.7" - "@babel/plugin-transform-react-jsx" "^7.16.7" - "@babel/plugin-transform-react-jsx-development" "^7.16.7" - "@babel/plugin-transform-react-pure-annotations" "^7.16.7" - -"@babel/preset-react@^7.17.12": +"@babel/preset-react@^7.12.10", "@babel/preset-react@^7.12.5", "@babel/preset-react@^7.14.5", "@babel/preset-react@^7.16.0", "@babel/preset-react@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.17.12.tgz#62adbd2d1870c0de3893095757ed5b00b492ab3d" integrity sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA== @@ -1844,16 +1540,7 @@ "@babel/plugin-transform-react-jsx-development" "^7.16.7" "@babel/plugin-transform-react-pure-annotations" "^7.16.7" -"@babel/preset-typescript@^7.12.7", "@babel/preset-typescript@^7.15.0", "@babel/preset-typescript@^7.16.0", "@babel/preset-typescript@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9" - integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" - "@babel/helper-validator-option" "^7.16.7" - "@babel/plugin-transform-typescript" "^7.16.7" - -"@babel/preset-typescript@^7.17.12": +"@babel/preset-typescript@^7.12.7", "@babel/preset-typescript@^7.15.0", "@babel/preset-typescript@^7.16.0", "@babel/preset-typescript@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz#40269e0a0084d56fc5731b6c40febe1c9a4a3e8c" integrity sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg== @@ -1873,15 +1560,7 @@ pirates "^4.0.5" source-map-support "^0.5.16" -"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.17.9": - version "7.17.9" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.9.tgz#3d02d0161f0fbf3ada8e88159375af97690f4055" - integrity sha512-WxYHHUWF2uZ7Hp1K+D1xQgbgkGUfA+5UPOegEXGt2Y5SMog/rYCVaifLZDbw8UkNXozEqqrZTy6bglL7xTaCOw== - dependencies: - core-js-pure "^3.20.2" - regenerator-runtime "^0.13.4" - -"@babel/runtime-corejs3@^7.18.3": +"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.18.3": version "7.18.3" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.18.3.tgz#52f0241a31e0ec61a6187530af6227c2846bd60c" integrity sha512-l4ddFwrc9rnR+EJsHsh+TJ4A35YqQz/UqcjtlX2ov53hlJYG5CxtQmNZxyajwDVmCxwy++rtvGU5HazCK4W41Q== @@ -1905,23 +1584,7 @@ "@babel/parser" "^7.16.7" "@babel/types" "^7.16.7" -"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.10", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.7.2": - version "7.17.10" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.10.tgz#1ee1a5ac39f4eac844e6cf855b35520e5eb6f8b5" - integrity sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw== - dependencies: - "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.10" - "@babel/helper-environment-visitor" "^7.16.7" - "@babel/helper-function-name" "^7.17.9" - "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-split-export-declaration" "^7.16.7" - "@babel/parser" "^7.17.10" - "@babel/types" "^7.17.10" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2": +"@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9", "@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2", "@babel/traverse@^7.7.2": version "7.18.2" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz#b77a52604b5cc836a9e1e08dca01cba67a12d2e8" integrity sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA== @@ -1937,7 +1600,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.11", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.10", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": +"@babel/types@^7.0.0", "@babel/types@^7.12.11", "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": version "7.17.10" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.10.tgz#d35d7b4467e439fcf06d195f8100e0fea7fc82c4" integrity sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A== @@ -2078,83 +1741,6 @@ "@docsearch/css" "3.1.0" algoliasearch "^4.0.0" -"@docusaurus/core@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.20.tgz#cf4aeeccecacb547a6fb42340c83bed0cccb57c0" - integrity sha512-a3UgZ4lIcIOoZd4j9INqVkWSXEDxR7EicJXt8eq2whg4N5hKGqLHoDSnWfrVSPQn4NoG5T7jhPypphSoysImfQ== - dependencies: - "@babel/core" "^7.17.10" - "@babel/generator" "^7.17.10" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-transform-runtime" "^7.17.10" - "@babel/preset-env" "^7.17.10" - "@babel/preset-react" "^7.16.7" - "@babel/preset-typescript" "^7.16.7" - "@babel/runtime" "^7.17.9" - "@babel/runtime-corejs3" "^7.17.9" - "@babel/traverse" "^7.17.10" - "@docusaurus/cssnano-preset" "2.0.0-beta.20" - "@docusaurus/logger" "2.0.0-beta.20" - "@docusaurus/mdx-loader" "2.0.0-beta.20" - "@docusaurus/react-loadable" "5.5.2" - "@docusaurus/utils" "2.0.0-beta.20" - "@docusaurus/utils-common" "2.0.0-beta.20" - "@docusaurus/utils-validation" "2.0.0-beta.20" - "@slorber/static-site-generator-webpack-plugin" "^4.0.4" - "@svgr/webpack" "^6.2.1" - autoprefixer "^10.4.5" - babel-loader "^8.2.5" - babel-plugin-dynamic-import-node "2.3.0" - boxen "^6.2.1" - chokidar "^3.5.3" - clean-css "^5.3.0" - cli-table3 "^0.6.2" - combine-promises "^1.1.0" - commander "^5.1.0" - copy-webpack-plugin "^10.2.4" - core-js "^3.22.3" - css-loader "^6.7.1" - css-minimizer-webpack-plugin "^3.4.1" - cssnano "^5.1.7" - del "^6.0.0" - detect-port "^1.3.0" - escape-html "^1.0.3" - eta "^1.12.3" - file-loader "^6.2.0" - fs-extra "^10.1.0" - html-minifier-terser "^6.1.0" - html-tags "^3.2.0" - html-webpack-plugin "^5.5.0" - import-fresh "^3.3.0" - leven "^3.1.0" - lodash "^4.17.21" - mini-css-extract-plugin "^2.6.0" - postcss "^8.4.13" - postcss-loader "^6.2.1" - prompts "^2.4.2" - react-dev-utils "^12.0.1" - react-helmet-async "^1.3.0" - react-loadable "npm:@docusaurus/react-loadable@5.5.2" - react-loadable-ssr-addon-v5-slorber "^1.0.1" - react-router "^5.2.0" - react-router-config "^5.1.1" - react-router-dom "^5.2.0" - remark-admonitions "^1.2.1" - rtl-detect "^1.0.4" - semver "^7.3.7" - serve-handler "^6.1.3" - shelljs "^0.8.5" - terser-webpack-plugin "^5.3.1" - tslib "^2.4.0" - update-notifier "^5.1.0" - url-loader "^4.1.1" - wait-on "^6.0.1" - webpack "^5.72.0" - webpack-bundle-analyzer "^4.5.0" - webpack-dev-server "^4.8.1" - webpack-merge "^5.8.0" - webpackbar "^5.0.2" - "@docusaurus/core@2.0.0-beta.21": version "2.0.0-beta.21" resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.0.0-beta.21.tgz#50897317b22dbd94b1bf91bb30c2a0fddd15a806" @@ -2233,15 +1819,6 @@ webpack-merge "^5.8.0" webpackbar "^5.0.2" -"@docusaurus/cssnano-preset@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.20.tgz#c47722e347fd044f2372e924199eabf61733232f" - integrity sha512-7pfrYuahHl3YYS+gYhbb1YHsq5s5+hk+1KIU7QqNNn4YjrIqAHlOznCQ9XfQfspe9boZmaNFGMZQ1tawNOVLqQ== - dependencies: - cssnano-preset-advanced "^5.3.3" - postcss "^8.4.13" - postcss-sort-media-queries "^4.2.1" - "@docusaurus/cssnano-preset@2.0.0-beta.21": version "2.0.0-beta.21" resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.21.tgz#38113877a5857c3f9d493522085d20909dcec474" @@ -2252,14 +1829,6 @@ postcss-sort-media-queries "^4.2.1" tslib "^2.4.0" -"@docusaurus/logger@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.20.tgz#bb49e8516e48082ab96bca11569a18541476d5a6" - integrity sha512-7Rt7c8m3ZM81o5jsm6ENgdbjq/hUICv8Om2i7grynI4GT2aQyFoHcusaNbRji4FZt0DaKT2CQxiAWP8BbD4xzQ== - dependencies: - chalk "^4.1.2" - tslib "^2.4.0" - "@docusaurus/logger@2.0.0-beta.21": version "2.0.0-beta.21" resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.0.0-beta.21.tgz#f6ab4133917965349ae03fd9111a940b24d4fd12" @@ -2268,28 +1837,6 @@ chalk "^4.1.2" tslib "^2.4.0" -"@docusaurus/mdx-loader@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.20.tgz#7016e8ce7e4a11c9ea458e2236d3c93af71f393f" - integrity sha512-BBuf77sji3JxbCEW7Qsv3CXlgpm+iSLTQn6JUK7x8vJ1JYZ3KJbNgpo9TmxIIltpcvNQ/QOy6dvqrpSStaWmKQ== - dependencies: - "@babel/parser" "^7.17.10" - "@babel/traverse" "^7.17.10" - "@docusaurus/logger" "2.0.0-beta.20" - "@docusaurus/utils" "2.0.0-beta.20" - "@mdx-js/mdx" "^1.6.22" - escape-html "^1.0.3" - file-loader "^6.2.0" - fs-extra "^10.1.0" - image-size "^1.0.1" - mdast-util-to-string "^2.0.0" - remark-emoji "^2.2.0" - stringify-object "^3.3.0" - tslib "^2.4.0" - unist-util-visit "^2.0.3" - url-loader "^4.1.1" - webpack "^5.72.0" - "@docusaurus/mdx-loader@2.0.0-beta.21": version "2.0.0-beta.21" resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.21.tgz#52af341e21f22be882d2155a7349bea10f5d77a3" @@ -2532,13 +2079,6 @@ webpack "^5.72.1" webpack-merge "^5.8.0" -"@docusaurus/utils-common@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.20.tgz#adb914c331d711a3c0ef2ba3f64139acdf4cd781" - integrity sha512-HabHh23vOQn6ygs0PjuCSF/oZaNsYTFsxB2R6EwHNyw01nWgBC3QAcGVmyIWQhlb9p8V3byKgbzVS68hZX5t9A== - dependencies: - tslib "^2.4.0" - "@docusaurus/utils-common@2.0.0-beta.21": version "2.0.0-beta.21" resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.0.0-beta.21.tgz#81e86ed04ad62b75e9ba6a5e7689dc23d5f36a0a" @@ -2546,17 +2086,6 @@ dependencies: tslib "^2.4.0" -"@docusaurus/utils-validation@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.20.tgz#ebf475a4388066bd450877fe920f405c53ff5ad2" - integrity sha512-7MxMoaF4VNAt5vUwvITa6nbkw1tb4WE6hp1VlfIoLCY4D7Wk5cMf1ZFhppCP1UzmPwvFb9zw8fPuvDfB3Tb5nQ== - dependencies: - "@docusaurus/logger" "2.0.0-beta.20" - "@docusaurus/utils" "2.0.0-beta.20" - joi "^17.6.0" - js-yaml "^4.1.0" - tslib "^2.4.0" - "@docusaurus/utils-validation@2.0.0-beta.21": version "2.0.0-beta.21" resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.21.tgz#10169661be5f8a233f4c12202ee5802ccb77400f" @@ -2568,27 +2097,6 @@ js-yaml "^4.1.0" tslib "^2.4.0" -"@docusaurus/utils@2.0.0-beta.20": - version "2.0.0-beta.20" - resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.20.tgz#d5a9816a328b2ca5e4e1a3fbf267e3674abacd48" - integrity sha512-eUQquakhrbnvhsmx8jRPLgoyjyzMuOhmQC99m7rotar7XOzROpgEpm7+xVaquG5Ha47WkybE3djHJhKNih7GZQ== - dependencies: - "@docusaurus/logger" "2.0.0-beta.20" - "@svgr/webpack" "^6.2.1" - file-loader "^6.2.0" - fs-extra "^10.1.0" - github-slugger "^1.4.0" - globby "^11.1.0" - gray-matter "^4.0.3" - js-yaml "^4.1.0" - lodash "^4.17.21" - micromatch "^4.0.5" - resolve-pathname "^3.0.0" - shelljs "^0.8.5" - tslib "^2.4.0" - url-loader "^4.1.1" - webpack "^5.72.0" - "@docusaurus/utils@2.0.0-beta.21": version "2.0.0-beta.21" resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.0.0-beta.21.tgz#8fc4499c4cfedd29805025d930f8008cad255044" @@ -6115,11 +5623,6 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array-union@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975" - integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw== - array-uniq@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" @@ -6231,7 +5734,7 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@^10.3.7, autoprefixer@^10.4.5, autoprefixer@^10.4.6, autoprefixer@^10.4.7: +autoprefixer@^10.3.7, autoprefixer@^10.4.6, autoprefixer@^10.4.7: version "10.4.7" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.7.tgz#1db8d195f41a52ca5069b7593be167618edbbedf" integrity sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA== @@ -6326,13 +5829,6 @@ babel-plugin-apply-mdx-type-prop@1.6.22: "@babel/helper-plugin-utils" "7.10.4" "@mdx-js/util" "1.6.22" -babel-plugin-dynamic-import-node@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" - integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ== - dependencies: - object.assign "^4.1.0" - babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" @@ -7675,18 +7171,6 @@ copy-to-clipboard@^3.3.1: dependencies: toggle-selection "^1.0.6" -copy-webpack-plugin@^10.2.4: - version "10.2.4" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz#6c854be3fdaae22025da34b9112ccf81c63308fe" - integrity sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg== - dependencies: - fast-glob "^3.2.7" - glob-parent "^6.0.1" - globby "^12.0.2" - normalize-path "^3.0.0" - schema-utils "^4.0.0" - serialize-javascript "^6.0.0" - copy-webpack-plugin@^11.0.0: version "11.0.0" resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz#96d4dbdb5f73d02dd72d0528d1958721ab72e04a" @@ -7717,12 +7201,7 @@ core-js@^2.4.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-js@^3.0.4, core-js@^3.19.2, core-js@^3.22.3, core-js@^3.6.5, core-js@^3.8.2: - version "3.22.5" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.5.tgz#a5f5a58e663d5c0ebb4e680cd7be37536fb2a9cf" - integrity sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA== - -core-js@^3.22.7: +core-js@^3.0.4, core-js@^3.19.2, core-js@^3.22.7, core-js@^3.6.5, core-js@^3.8.2: version "3.22.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.7.tgz#8d6c37f630f6139b8732d10f2c114c3f1d00024f" integrity sha512-Jt8SReuDKVNZnZEzyEQT5eK6T2RRCXkfTq7Lo09kpm+fHjgGewSbNjV+Wt4yZMhPDdzz2x1ulI5z/w4nxpBseg== @@ -7947,7 +7426,7 @@ css-loader@^6.5.1, css-loader@^6.7.1: postcss-value-parser "^4.2.0" semver "^7.3.5" -css-minimizer-webpack-plugin@^3.2.0, css-minimizer-webpack-plugin@^3.4.1: +css-minimizer-webpack-plugin@^3.2.0: version "3.4.1" resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f" integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q== @@ -8078,18 +7557,6 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-advanced@^5.3.3: - version "5.3.3" - resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.3.3.tgz#848422118d7a62b5b29a53edc160f58c7f7f7539" - integrity sha512-AB9SmTSC2Gd8T7PpKUsXFJ3eNsg7dc4CTZ0+XAJ29MNxyJsrCEk7N1lw31bpHrsQH2PVJr21bbWgGAfA9j0dIA== - dependencies: - autoprefixer "^10.3.7" - cssnano-preset-default "^5.2.7" - postcss-discard-unused "^5.1.0" - postcss-merge-idents "^5.1.1" - postcss-reduce-idents "^5.2.0" - postcss-zindex "^5.1.0" - cssnano-preset-advanced@^5.3.5: version "5.3.6" resolved "https://registry.yarnpkg.com/cssnano-preset-advanced/-/cssnano-preset-advanced-5.3.6.tgz#6c995a86cecc9e6472bf6d120e5517231ed527dc" @@ -8137,56 +7604,12 @@ cssnano-preset-default@^5.2.10: postcss-svgo "^5.1.0" postcss-unique-selectors "^5.1.1" -cssnano-preset-default@^5.2.7: - version "5.2.7" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz#791e3603fb8f1b46717ac53b47e3c418e950f5f3" - integrity sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA== - dependencies: - css-declaration-sorter "^6.2.2" - cssnano-utils "^3.1.0" - postcss-calc "^8.2.3" - postcss-colormin "^5.3.0" - postcss-convert-values "^5.1.0" - postcss-discard-comments "^5.1.1" - postcss-discard-duplicates "^5.1.0" - postcss-discard-empty "^5.1.1" - postcss-discard-overridden "^5.1.0" - postcss-merge-longhand "^5.1.4" - postcss-merge-rules "^5.1.1" - postcss-minify-font-values "^5.1.0" - postcss-minify-gradients "^5.1.1" - postcss-minify-params "^5.1.2" - postcss-minify-selectors "^5.2.0" - postcss-normalize-charset "^5.1.0" - postcss-normalize-display-values "^5.1.0" - postcss-normalize-positions "^5.1.0" - postcss-normalize-repeat-style "^5.1.0" - postcss-normalize-string "^5.1.0" - postcss-normalize-timing-functions "^5.1.0" - postcss-normalize-unicode "^5.1.0" - postcss-normalize-url "^5.1.0" - postcss-normalize-whitespace "^5.1.1" - postcss-ordered-values "^5.1.1" - postcss-reduce-initial "^5.1.0" - postcss-reduce-transforms "^5.1.0" - postcss-svgo "^5.1.0" - postcss-unique-selectors "^5.1.1" - cssnano-utils@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861" integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA== -cssnano@^5.0.6, cssnano@^5.1.7: - version "5.1.7" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.7.tgz#99858bef6c76c9240f0cdc9239570bc7db8368be" - integrity sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg== - dependencies: - cssnano-preset-default "^5.2.7" - lilconfig "^2.0.3" - yaml "^1.10.2" - -cssnano@^5.1.8, cssnano@^5.1.9: +cssnano@^5.0.6, cssnano@^5.1.8, cssnano@^5.1.9: version "5.1.10" resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.10.tgz#fc6ddd9a4d7d238f320634326ed814cf0abf6e1c" integrity sha512-ACpnRgDg4m6CZD/+8SgnLcGCgy6DDGdkMbOawwdvVxNietTNLe/MtWcenp6qT0PRt5wzhGl6/cjMWCdhKXC9QA== @@ -8510,20 +7933,6 @@ defined@^1.0.0: resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= -del@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" - integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ== - dependencies: - globby "^11.0.1" - graceful-fs "^4.2.4" - is-glob "^4.0.1" - is-path-cwd "^2.2.0" - is-path-inside "^3.0.2" - p-map "^4.0.0" - rimraf "^3.0.2" - slash "^3.0.0" - del@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a" @@ -9626,7 +9035,7 @@ fast-glob@^2.2.6: merge2 "^1.2.3" micromatch "^3.1.10" -fast-glob@^3.2.11, fast-glob@^3.2.7, fast-glob@^3.2.9: +fast-glob@^3.2.11, fast-glob@^3.2.9: version "3.2.11" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== @@ -10308,18 +9717,6 @@ globby@^11.0.1, globby@^11.0.2, globby@^11.0.4, globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -globby@^12.0.2: - version "12.2.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-12.2.0.tgz#2ab8046b4fba4ff6eede835b29f678f90e3d3c22" - integrity sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA== - dependencies: - array-union "^3.0.1" - dir-glob "^3.0.1" - fast-glob "^3.2.7" - ignore "^5.1.9" - merge2 "^1.4.1" - slash "^4.0.0" - globby@^13.1.1: version "13.1.1" resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.1.tgz#7c44a93869b0b7612e38f22ed532bfe37b25ea6f" @@ -10966,7 +10363,7 @@ ignore@^4.0.3: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.8, ignore@^5.1.9, ignore@^5.2.0: +ignore@^5.1.8, ignore@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -13278,7 +12675,7 @@ nanoclone@^0.2.1: resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4" integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA== -nanoid@^3.3.1, nanoid@^3.3.3, nanoid@^3.3.4: +nanoid@^3.3.1, nanoid@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== @@ -14273,13 +13670,6 @@ postcss-colormin@^5.3.0: colord "^2.9.1" postcss-value-parser "^4.2.0" -postcss-convert-values@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz#f8d3abe40b4ce4b1470702a0706343eac17e7c10" - integrity sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g== - dependencies: - postcss-value-parser "^4.2.0" - postcss-convert-values@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz#31586df4e184c2e8890e8b34a0b9355313f503ab" @@ -14314,11 +13704,6 @@ postcss-dir-pseudo-class@^6.0.4: dependencies: postcss-selector-parser "^6.0.9" -postcss-discard-comments@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz#e90019e1a0e5b99de05f63516ce640bd0df3d369" - integrity sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ== - postcss-discard-comments@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696" @@ -14479,14 +13864,6 @@ postcss-merge-idents@^5.1.1: cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-merge-longhand@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz#0f46f8753989a33260efc47de9a0cdc571f2ec5c" - integrity sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA== - dependencies: - postcss-value-parser "^4.2.0" - stylehacks "^5.1.0" - postcss-merge-longhand@^5.1.5: version "5.1.5" resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.5.tgz#b0e03bee3b964336f5f33c4fc8eacae608e91c05" @@ -14495,16 +13872,6 @@ postcss-merge-longhand@^5.1.5: postcss-value-parser "^4.2.0" stylehacks "^5.1.0" -postcss-merge-rules@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz#d327b221cd07540bcc8d9ff84446d8b404d00162" - integrity sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww== - dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - cssnano-utils "^3.1.0" - postcss-selector-parser "^6.0.5" - postcss-merge-rules@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz#7049a14d4211045412116d79b751def4484473a5" @@ -14531,15 +13898,6 @@ postcss-minify-gradients@^5.1.1: cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-minify-params@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz#77e250780c64198289c954884ebe3ee4481c3b1c" - integrity sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g== - dependencies: - browserslist "^4.16.6" - cssnano-utils "^3.1.0" - postcss-value-parser "^4.2.0" - postcss-minify-params@^5.1.3: version "5.1.3" resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz#ac41a6465be2db735099bbd1798d85079a6dc1f9" @@ -14549,13 +13907,6 @@ postcss-minify-params@^5.1.3: cssnano-utils "^3.1.0" postcss-value-parser "^4.2.0" -postcss-minify-selectors@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c" - integrity sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA== - dependencies: - postcss-selector-parser "^6.0.5" - postcss-minify-selectors@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6" @@ -14880,16 +14231,7 @@ postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0 picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.12, postcss@^8.4.13, postcss@^8.4.4, postcss@^8.4.7: - version "8.4.13" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.13.tgz#7c87bc268e79f7f86524235821dfdf9f73e5d575" - integrity sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA== - dependencies: - nanoid "^3.3.3" - picocolors "^1.0.0" - source-map-js "^1.0.2" - -postcss@^8.4.14: +postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.12, postcss@^8.4.13, postcss@^8.4.14, postcss@^8.4.4, postcss@^8.4.7: version "8.4.14" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== @@ -15460,19 +14802,6 @@ react-router-config@^5.1.1: dependencies: "@babel/runtime" "^7.1.2" -react-router-dom@^5.2.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.1.tgz#0151baf2365c5fcd8493f6ec9b9b31f34d0f8ae1" - integrity sha512-f0pj/gMAbv9e8gahTmCEY20oFhxhrmHwYeIwH5EO5xu0qme+wXtsdB8YfUOAZzUz4VaXmb58m3ceiLtjMhqYmQ== - dependencies: - "@babel/runtime" "^7.12.13" - history "^4.9.0" - loose-envify "^1.3.1" - prop-types "^15.6.2" - react-router "5.3.1" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" - react-router-dom@^5.3.3: version "5.3.3" resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.3.tgz#8779fc28e6691d07afcaf98406d3812fe6f11199" @@ -15486,22 +14815,6 @@ react-router-dom@^5.3.3: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-router@5.3.1, react-router@^5.2.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.1.tgz#b13e84a016c79b9e80dde123ca4112c4f117e3cf" - integrity sha512-v+zwjqb7bakqgF+wMVKlAPTca/cEmPOvQ9zt7gpSNyPXau1+0qvuYZ5BWzzNDP1y6s15zDwgb9rPN63+SIniRQ== - dependencies: - "@babel/runtime" "^7.12.13" - history "^4.9.0" - hoist-non-react-statics "^3.1.0" - loose-envify "^1.3.1" - mini-create-react-context "^0.4.0" - path-to-regexp "^1.7.0" - prop-types "^15.6.2" - react-is "^16.6.0" - tiny-invariant "^1.0.2" - tiny-warning "^1.0.0" - react-router@5.3.3, react-router@^5.3.3: version "5.3.3" resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.3.tgz#8e3841f4089e728cf82a429d92cdcaa5e4a3a288" @@ -18879,7 +18192,7 @@ webpack-dev-middleware@^5.3.1: range-parser "^1.2.1" schema-utils "^4.0.0" -webpack-dev-server@^4.6.0, webpack-dev-server@^4.8.1, webpack-dev-server@^4.9.0: +webpack-dev-server@^4.6.0, webpack-dev-server@^4.9.0: version "4.9.0" resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.0.tgz#737dbf44335bb8bde68f8f39127fc401c97a1557" integrity sha512-+Nlb39iQSOSsFv0lWUuUTim3jDQO8nhK3E68f//J2r5rIcp4lULHXz2oZ0UVdEeWXEh5lSzYUlzarZhDAeAVQw== @@ -19014,7 +18327,7 @@ webpack@4: watchpack "^1.7.4" webpack-sources "^1.4.1" -"webpack@>=4.43.0 <6.0.0", webpack@^5, webpack@^5.64.4, webpack@^5.72.0, webpack@^5.72.1, webpack@^5.9.0: +"webpack@>=4.43.0 <6.0.0", webpack@^5, webpack@^5.64.4, webpack@^5.72.1, webpack@^5.9.0: version "5.72.1" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.1.tgz#3500fc834b4e9ba573b9f430b2c0a61e1bb57d13" integrity sha512-dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung== From 6b80118e7eb334fbb2919a6bbe74b819e7b5ac3c Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Mon, 30 May 2022 13:10:25 -0700 Subject: [PATCH 288/340] Added lots of tailwind styling --- packages/components/package.json | 2 + .../components/src/components/CodeEditor.tsx | 1 + .../components/src/components/ErrorBox.tsx | 17 +- .../src/components/SquiggleChart.tsx | 2 +- .../src/components/SquigglePlayground.tsx | 324 +++++++++++++----- yarn.lock | 10 + 6 files changed, 269 insertions(+), 87 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index aa62c4a3..db9b3160 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -3,6 +3,8 @@ "version": "0.2.20", "license": "MIT", "dependencies": { + "@headlessui/react": "^1.6.4", + "@heroicons/react": "^1.0.6", "@hookform/resolvers": "^2.8.10", "@quri/squiggle-lang": "^0.2.8", "@react-hook/size": "^2.1.2", diff --git a/packages/components/src/components/CodeEditor.tsx b/packages/components/src/components/CodeEditor.tsx index b052d7e1..473afd93 100644 --- a/packages/components/src/components/CodeEditor.tsx +++ b/packages/components/src/components/CodeEditor.tsx @@ -29,6 +29,7 @@ export let CodeEditor: FC = ({ mode="golang" theme="github" width={"100%"} + fontSize={14} height={String(height) + "px"} minLines={oneLine ? lineCount : undefined} maxLines={oneLine ? lineCount : undefined} diff --git a/packages/components/src/components/ErrorBox.tsx b/packages/components/src/components/ErrorBox.tsx index eb34b9d5..1eaed201 100644 --- a/packages/components/src/components/ErrorBox.tsx +++ b/packages/components/src/components/ErrorBox.tsx @@ -1,12 +1,21 @@ import * as React from "react"; +import { XCircleIcon } from "@heroicons/react/solid"; + export const ErrorBox: React.FC<{ heading: string; children: React.ReactNode; }> = ({ heading = "Error", children }) => { return ( -
-

{heading}

- {children} +
+
+
+
+
+

{heading}

+
{children}
+
+
); -}; +}; \ No newline at end of file diff --git a/packages/components/src/components/SquiggleChart.tsx b/packages/components/src/components/SquiggleChart.tsx index 08586dcc..3b4232ce 100644 --- a/packages/components/src/components/SquiggleChart.tsx +++ b/packages/components/src/components/SquiggleChart.tsx @@ -54,7 +54,7 @@ export const VariableBox: React.FC = ({ return (
-

{heading}

+

{heading}

{children}
diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index cf02c96b..a66d33b9 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -8,6 +8,9 @@ import { useForm, useWatch } from "react-hook-form"; import * as yup from "yup"; import { yupResolver } from "@hookform/resolvers/yup"; import { defaultBindings, environment } from "@quri/squiggle-lang"; +import { Tab } from "@headlessui/react"; +import { CodeIcon } from "@heroicons/react/solid"; +import { CogIcon } from "@heroicons/react/solid"; interface ShowBoxProps { height: number; @@ -15,9 +18,7 @@ interface ShowBoxProps { } const ShowBox: React.FC = ({ height, children }) => ( -
- {children} -
+
{children}
); interface TitleProps { @@ -26,12 +27,7 @@ interface TitleProps { } const Display: React.FC = ({ maxHeight, children }) => ( -
- {children} -
+
{children}
); interface PlaygroundProps { @@ -88,12 +84,70 @@ type InputProps = { }; const InputItem: React.FC = ({ label, children }) => ( -
- - {children} +
+ +
{children}
); +let numberStyle = + "max-w-lg block w-full shadow-sm focus:ring-indigo-500 focus:border-indigo-500 sm:max-w-xs sm:text-sm border-gray-300 rounded-md"; +let checkboxStyle = + "focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300 rounded"; + +const tabs = [ + { name: "Editor", href: "#", current: true }, + { name: "Settings", href: "#", current: false }, +]; + +function classNames(...classes) { + return classes.filter(Boolean).join(" "); +} + +function Example() { + return ( + + ); +} + let SquigglePlayground: FC = ({ initialSquiggleString = "", height = 500, @@ -142,80 +196,186 @@ let SquigglePlayground: FC = ({ setImportsAreValid(false); } }; + + let tab = (key, icon) => ( + + classNames( + "whitespace-nowrap pb-1 pt-2 px-1 border-b-2 font-medium text-sm focus-within:outline-none group inline-flex items-center", + selected + ? "border-slate-400 text-gray-500" + : "border-transparent text-gray-400 hover:text-gray-600 hover:border-slate-300" + ) + } + > + {icon} + {key} + + ); + return ( - - -
-
- {vars.showSettingsPage ? ( - <> - - - - - - - - - - - - - - - - - - - - - - - <> - + +
+
+
+ + {tab( + "Code", + +
+
+
+
+
+ + + + + + <> +
+ + <> + +

+ How many samples to use for Monte Carlo simulations. + This can be overridden by specific programs. +

+ + + + <> + +

+ When distributions are converted into PointSet shapes, + we need to know how many coordinates to use. +

+ + + + + + + + +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+ + <> + + {importsAreValid ? "Valid" : "Invalid"} + + +
- - - ) : ( - - )} + + +
+ +
+
+ +
+
-
- - - -
-
- + +
); }; export default SquigglePlayground; diff --git a/yarn.lock b/yarn.lock index 282fcbaf..af03d222 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1824,6 +1824,16 @@ dependencies: "@hapi/hoek" "^9.0.0" +"@headlessui/react@^1.6.4": + version "1.6.4" + resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.6.4.tgz#c73084e23386bef5fb86cd16da3352c3a844bb4c" + integrity sha512-0yqz1scwbFtwljmbbKjXsSGl5ABEYNICVHZnMCWo0UtOZodo2Tpu94uOVgCRjRZ77l2WcTi2S0uidINDvG7lsA== + +"@heroicons/react@^1.0.6": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@heroicons/react/-/react-1.0.6.tgz#35dd26987228b39ef2316db3b1245c42eb19e324" + integrity sha512-JJCXydOFWMDpCP4q13iEplA503MQO3xLoZiKum+955ZCtHINWnx26CUxVxxFQu/uLb4LW3ge15ZpzIkXKkJ8oQ== + "@hookform/resolvers@^2.8.10": version "2.8.10" resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-2.8.10.tgz#b66d7a7848b1b1dd5b976a73fff36bb366666e7d" From d6bc9422653f0240860328a0ac5fb54df9fc4008 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Mon, 30 May 2022 14:09:59 -0700 Subject: [PATCH 289/340] Added simple pill for code-settings toggle --- .../src/components/SquigglePlayground.tsx | 140 +++++++----------- 1 file changed, 55 insertions(+), 85 deletions(-) diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index a66d33b9..bf98ccb7 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -11,6 +11,7 @@ import { defaultBindings, environment } from "@quri/squiggle-lang"; import { Tab } from "@headlessui/react"; import { CodeIcon } from "@heroicons/react/solid"; import { CogIcon } from "@heroicons/react/solid"; +import { Fragment } from "react"; interface ShowBoxProps { height: number; @@ -104,50 +105,6 @@ function classNames(...classes) { return classes.filter(Boolean).join(" "); } -function Example() { - return ( - - ); -} - let SquigglePlayground: FC = ({ initialSquiggleString = "", height = 500, @@ -197,47 +154,60 @@ let SquigglePlayground: FC = ({ } }; - let tab = (key, icon) => ( - - classNames( - "whitespace-nowrap pb-1 pt-2 px-1 border-b-2 font-medium text-sm focus-within:outline-none group inline-flex items-center", - selected - ? "border-slate-400 text-gray-500" - : "border-transparent text-gray-400 hover:text-gray-600 hover:border-slate-300" - ) - } - > - {icon} - {key} - - ); + // className="text-gray-400 group-hover:text-gray-500 -ml-0.5 mr-2 h-4 w-4" + let tab = (key) => { + let iconStyle = (isSelected) => + classNames( + "-ml-0.5 mr-2 h-4 w-4 ", + isSelected ? "text-teal-500" : "text-gray-500 group-hover:text-gray-900" + ); + return ( + + {({ selected }) => ( + + )} + + ); + }; return ( -
- -
-
-
- - {tab( - "Code", - -
-
+ +
+
+ + {tab("Code")} + {tab("Settings")} +
@@ -374,8 +344,8 @@ let SquigglePlayground: FC = ({
- -
+
+ ); }; export default SquigglePlayground; From 1213ca2bf00f3a8384698bdc4e4c81b42fec70ab Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Mon, 30 May 2022 16:29:46 -0700 Subject: [PATCH 290/340] Cleaning up Playground toolbar --- .../components/src/components/ErrorBox.tsx | 2 +- .../src/components/SquigglePlayground.tsx | 255 ++++++++++-------- 2 files changed, 142 insertions(+), 115 deletions(-) diff --git a/packages/components/src/components/ErrorBox.tsx b/packages/components/src/components/ErrorBox.tsx index 1eaed201..4e752ffd 100644 --- a/packages/components/src/components/ErrorBox.tsx +++ b/packages/components/src/components/ErrorBox.tsx @@ -6,7 +6,7 @@ export const ErrorBox: React.FC<{ children: React.ReactNode; }> = ({ heading = "Error", children }) => { return ( -
+
From 88adccf2e73833e3b097239e5f1c572d55c72e14 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Wed, 1 Jun 2022 20:04:50 -0700 Subject: [PATCH 301/340] Added max widths to settings pages --- packages/components/src/components/SquigglePlayground.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/components/src/components/SquigglePlayground.tsx b/packages/components/src/components/SquigglePlayground.tsx index 53da8f92..97b3604d 100644 --- a/packages/components/src/components/SquigglePlayground.tsx +++ b/packages/components/src/components/SquigglePlayground.tsx @@ -198,7 +198,7 @@ let SquigglePlayground: FC = ({ }; let samplingSettings = ( -
+
<> = ({ ); let viewSettings = ( -
+

General Display Settings @@ -331,7 +331,7 @@ let SquigglePlayground: FC = ({ ); let inputVariableSettings = ( - <> +

Import Variables from JSON

@@ -360,7 +360,7 @@ let SquigglePlayground: FC = ({ )}
- +

); return ( From 800a832a061f2d8888aea6d5f1c78974cba6aff8 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Wed, 1 Jun 2022 20:13:19 -0700 Subject: [PATCH 302/340] Formatted, converted tab to component --- packages/components/src/components/Alert.tsx | 19 +++++++++++++++---- .../src/components/DistributionChart.tsx | 4 ++-- .../src/components/FunctionChart.tsx | 4 +++- .../src/components/SquiggleChart.tsx | 4 ++-- .../src/components/SquiggleEditor.tsx | 6 +++++- .../src/components/SquigglePlayground.tsx | 19 ++++++++++++------- packages/components/tailwind.config.js | 4 +--- 7 files changed, 40 insertions(+), 20 deletions(-) diff --git a/packages/components/src/components/Alert.tsx b/packages/components/src/components/Alert.tsx index d610e3a9..4e1dc646 100644 --- a/packages/components/src/components/Alert.tsx +++ b/packages/components/src/components/Alert.tsx @@ -1,5 +1,9 @@ import * as React from "react"; -import { XCircleIcon, InformationCircleIcon, CheckCircleIcon } from "@heroicons/react/solid"; +import { + XCircleIcon, + InformationCircleIcon, + CheckCircleIcon, +} from "@heroicons/react/solid"; export const Alert: React.FC<{ heading: string; @@ -53,7 +57,12 @@ export const MessageAlert: React.FC<{ backgroundColor="bg-slate-100" headingColor="text-slate-700" bodyColor="text-slate-700" - icon={