diff --git a/package.json b/package.json index f7029a685..b45df0f9d 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,12 @@ }, "dependencies": { "@emotion/core": "^10.0.22", - "@emotion/styled": "^10.0.22", - "@material-ui/core": "^4.5.0", + "@emotion/styled": "^10.0.23", + "@material-ui/core": "^4.6.0", "color": "^3.1.2", - "luxon": "^1.19.3", - "next": "9.1.1", + "luxon": "^1.21.1", + "next": "9.1.2", + "prism-react-renderer": "^1.0.2", "react": "^16.11.0", "react-dom": "^16.11.0", "react-spring": "^8.0.27", @@ -47,16 +48,16 @@ "@types/glob": "^7.1.1", "@types/luxon": "^1.15.2", "@types/material-ui": "^0.21.7", - "@types/node": "^12.11.7", + "@types/node": "^12.12.6", "@types/nprogress": "^0.2.0", "@types/prettier": "^1.18.3", "@types/react": "^16.9.5", - "@types/react-dom": "^16.9.1", + "@types/react-dom": "^16.9.4", "@types/smoothscroll-polyfill": "^0.3.1", - "@typescript-eslint/eslint-plugin": "^2.5.0", - "@typescript-eslint/parser": "^2.5.0", + "@typescript-eslint/eslint-plugin": "^2.6.1", + "@typescript-eslint/parser": "^2.6.1", "babel-eslint": "^10.0.3", - "babel-plugin-emotion": "^10.0.22", + "babel-plugin-emotion": "^10.0.23", "concurrently": "^5.0.0", "eslint": "^6.5.1", "eslint-config-prettier": "^6.4.0", @@ -68,9 +69,9 @@ "eslint-plugin-react": "^7.16.0", "eslint-plugin-react-hooks": "1.x", "fs-extra": "^8.1.0", - "glob": "^7.1.5", + "glob": "^7.1.6", "module-alias": "^2.2.2", "prettier": "^1.18.2", - "typescript": "^3.7.1-rc" + "typescript": "^3.7.2" } } diff --git a/pages/_error.tsx b/pages/_error.tsx index ed573226c..33930f7c2 100644 --- a/pages/_error.tsx +++ b/pages/_error.tsx @@ -20,12 +20,13 @@ export default () => ( -
- + > } episodeTitle={} @@ -46,11 +47,6 @@ export default () => ( -
) diff --git a/pages/emojis-functional-programming.tsx b/pages/emojis-functional-programming.tsx index b102842d2..90bacadf3 100644 --- a/pages/emojis-functional-programming.tsx +++ b/pages/emojis-functional-programming.tsx @@ -1,95 +1,1671 @@ /** @jsx jsx */ -import { css, jsx } from '@emotion/core' +import { css, jsx, Global } from '@emotion/core' +import { useState, useContext } from 'react' import Page from 'src/components/Page' import Head from 'next/head' -// import H from 'src/components/H' -import { fontSizes, colors, spaces } from 'src/lib/theme' +import { ns, radii, fontSizes, colors, spaces, maxWidths } from 'src/lib/theme' +import { lessonTitle } from 'src/lib/titles' import Container from 'src/components/Container' -// import CardWrapper from 'src/components/CardWrapper' +import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' +import ExpressionRunnerCaptionWrapper from 'src/components/ExpressionRunnerCaptionWrapper' +import BottomRightBadge from 'src/components/BottomRightBadge' +import Emoji from 'src/components/Emoji' +import H from 'src/components/H' +import EmojiForLetter from 'src/components/EmojiForLetter' import EpisodeHero from 'src/components/EpisodeHero' +import InlinePrioritiesLabel from 'src/components/InlinePrioritiesLabel' import EpisodePageFooter from 'src/components/EpisodePageFooter' -import { P, ExternalLink } from 'src/components/ContentTags' +import EmojiNumber from 'src/components/EmojiNumber' +import CustomEmoji from 'src/components/CustomEmoji' +import ButtonWithTouchActiveStates from 'src/components/ButtonWithTouchActiveStates' +import * as R from 'src/components/Runners' +import { + ExternalLink, + P, + Italic, + HighlightBold, + Bold, + InternalLink, + Highlight, + H3, + Ul, + Hr, + UlLi +} from 'src/components/ContentTags' import locale from 'src/lib/locale' -// import { EpisodeCardListType } from 'src/components/EpisodeCardList' import { DateTime } from 'luxon' +import { enBaseUrl } from 'src/lib/meta' +import BaseAlert, { alertSpacing, AlertProps } from 'src/components/Alert' +import PrismHighlight, { defaultProps } from 'prism-react-renderer' +import theme from 'prism-react-renderer/themes/nightOwlLight' +import BubbleQuoteContext from 'src/components/BubbleQuoteContext' +import EmojiWithText from 'src/components/EmojiWithText' +import ExpressionRunnerConfigContext from 'src/components/ExpressionRunnerConfigContext' +import { + StepOne, + StepTwo, + InstructionTwo, + StepThree, + InstructionThree, + InstructionFour, + StepFour +} from 'src/contents/4.en' +import VariableShadeContext from 'src/components/VariableShadeContext' -const date = DateTime.fromISO('2019-11-06T12:00:00Z') -const dateString = date - .setLocale('en') - .setZone('America/Los_Angeles') - .toFormat('LLL d, yyyy') +const numSteps = 10 + +const date = DateTime.fromISO('2019-11-08T12:00:00Z') +// const dateString = date +// .setLocale('en') +// .setZone('America/Los_Angeles') +// .toFormat('LLL d, yyyy') const dateSchemaString = date.setZone('America/Los_Angeles').toISO() -const title = 'Using emojis to teach functional programming to non-programmers' -const titleSplit = ( +const title = 'You Don’t Need Code to Explain Functional Programming' +const titleWithEmoji = `🍣 ${title} 🥪` +const description = + 'An emoji-based implementation of Lambda calculus, Church encoding, and Y combinator' +const url = `${enBaseUrl}/emojis-functional-programming` +const ogImageUrl = `${enBaseUrl}/static/images/blog-og.png` + +const tweetUrl = `https://twitter.com/intent/tweet?url=${encodeURIComponent( + url +)}&via=chibicode&text=${encodeURIComponent(title)}` + +const Alert = (props: AlertProps) => ( + +
+ +
+ +) + +Alert.defaultProps = BaseAlert.defaultProps + +const Subheading = ({ + step, + noHrTop, + children, + coveredIn, + ...props +}: JSX.IntrinsicElements['h3'] & { + noHrTop?: boolean + step: number | 'none' + coveredIn: number | 'none' +}) => ( <> - Using emojis to teach -
- functional programming to -
- non-programmers + {!noHrTop && ( +
+ )} + {step !== 'none' && coveredIn !== 'none' && ( +
+ Step{' '} + + {step} + + /{numSteps} + + {' '} + · From my course’s{' '} + + + {' '} + level + +
+ )} +

+ {children} +

) -// const cards: EpisodeCardListType = [] +const codeFontFamily = `'Victor Mono', SFMono-Regular, Consolas, +Liberation Mono, Menlo, Courier, monospace` + +const InlineCode = ({ + children, + highlighted +}: { + children: string + highlighted?: boolean +}) => ( + + {children} + +) + +const CodeBlock = ({ + children, + shouldHighlight, + result, + pointToRunButton, + defaultResultVisible, + caption +}: { + children: string + shouldHighlight?: (lineNumber: number, tokenNumber: number) => boolean + result?: string + pointToRunButton?: boolean + defaultResultVisible: boolean + caption?: React.ReactNode +}) => { + const [resultVisible, setResultVisible] = useState(defaultResultVisible) + const buttonOnClick = () => setResultVisible(true) + return ( +
+ {caption && ( + + {caption} + + )} + + {({ tokens, getLineProps, getTokenProps }) => ( + 
+            

+              {tokens.map((line, i) => (
+                

+                  {line.map((token, key) => (
+                    
+                  ))}
+                

+              ))}
+            

+
+ )} + + {result && ( + <> +
+ {resultVisible ? ( +
+ + Result:{' '} + + + {result} + +
+ ) : ( + <> + + Run ▶️ + + {pointToRunButton && ( + + ← + + )} + + )} +
+ + )} +
+ ) +} + +CodeBlock.defaultProps = { + defaultResultVisible: false +} + +const PointToRunButton = ({ children }: { children: React.ReactNode }) => { + const config = useContext(ExpressionRunnerConfigContext) + return ( + + {children} + + ) +} + +const DimUnhighlighted = ({ children }: { children: React.ReactNode }) => ( + + {children} + +) + +const guessTheResult = ( + <> + Guess what the result would be +
+ before pressing the button! + +) -export default () => - locale === 'en' ? ( +export default () => { + let step = 1 + return locale === 'en' ? ( + - {title} - - {/* + {titleWithEmoji} + + - */} + -
- - -
+ +

- {dateString} · Shu Uesugi ( - - @chibicode - - ) -

+ {description} + {title} -

- Lorem ipsum dolor sit amet consectetur adipisicing elit. Consequatur, - neque quod eum maxime distinctio, commodi alias qui magni ullam - dolores ipsa, odio esse quidem dicta. Voluptatem illo voluptate - doloremque odit. -

+ + +

+ + Last month, I published a free online course called “ + + Y Combinator for Non-programmers + + ”. + {' '} + In this 17-page course, I teach computer science concepts such as + functional programming, lambda calculus, Church encoding, and Y + combinator in a way such that{' '} + + people who have zero programming knowledge can understand + + . +

+

+ I didn’t use any code to explain these concepts. Instead, I + created an emoji puzzle that works as a runtime for + functional expressions. In this article, I’ll explain how my emoji + puzzles can represent and execute functional code{' '} + visually. Here’s a sneak peek— + + try pressing below! + + : +

+ Functional JS code:} + >{`(sushi => sushi)('sandwich')`} + + Equivalent emoji puzzle: + +

+ If you like to teach programming to beginners, or if you like + functional programming in general, I think you’ll enjoy this + article. +

+ + Overview + +

+ This article has 10 steps. +

+
    + + In steps 1 through 6, I’ll show you how some simple + JavaScript code can be represented using my emoji puzzles. Even + if you’re not familiar with JS, you should still be able to + understand it. + + + In steps 7 through 10, I’ll talk about how I used + my emoji puzzles to teach functional programming concepts such + as lambda calculus, Church encoding, and Y combinator. + +
+

+ If you plan to read later, I’d love it if you could share on + Twitter before you go.{' '} + + + Click here to Tweet this + article. + + {' '} + Also, the source code for this article is{' '} + + available on GitHub + + . +

+ +
+ ⚠️ This article is for programmers. If you’re a + non-programmer, check out the course itself instead: “ + + Y Combinator for Non-programmers + + ”. +
+ + + Identity function in JS + +

+ First, take a look at the following code. It’s an{' '} + identity function in JavaScript that returns the + argument. +

+ {`// Identity function in JS +sushi => sushi`} +

+ If you apply the above function on a string{' '} + 'sandwich', then the result would be{' '} + 'sandwich'. +

+ {`// The result would be 'sandwich' +(sushi => sushi)('sandwich')`} +

+ Now, here’s the interesting part: One day, I realized + that the above JS code can be{' '} + described visually using emojis. Check this out: +

+ + An “emoji puzzle” that visually describes +
+ the JS code from the above + +

+ The above emoji puzzle is equivalent to the earlier JS code. + First, the identity function{' '} + sushi => sushi… +

+ + lineNumber === 0 && tokenNumber > 0 && tokenNumber < 5 + } + >{`(sushi => sushi)('sandwich')`} +

+ …is represented by the bottom two items on the + puzzle, which are both . +

+ + + sushi => sushi is represented +
+ by the bottom two items + + +

+ Second, the argument 'sandwich' to the + identity function… +

+ + lineNumber === 0 && tokenNumber > 6 && tokenNumber < 8 + } + >{`(sushi => sushi)('sandwich')`} +

+ …is represented by the top item on the puzzle, + which is a . +

+ + + The argument 'sandwich' is represented +
+ by the top item + + +

+ That’s how my emoji puzzles can visually describe a simple JS + expression. Next, let’s talk about how we can{' '} + it. +

+ + Side Note: To keep things simple, this puzzle doesn’t + distinguish between variable names (e.g.{' '} + sushi) and strings (e.g.{' '} + 'sushi'). Therefore, both{' '} + sushi and{' '} + 'sushi' will be represented as{' '} + . + + + Running the function + +

+ I’ve added the button to the JS code + snippet so you can see the result.{' '} + + If you press , + {' '} + you’ll see that the result is 'sandwich'. +

+ {`(sushi => sushi)('sandwich')`} +

+ Now, we can also “run” the equivalent emoji puzzle and get the + same result.{' '} + + Try pressing the button below the + puzzle. + +

+ + + +

+ The result is , which is the same as + what happens when you run the equivalent JS code. +

+

+ So, you can an emoji + puzzle just as you can run a piece of JS code. Basically, this is + how I taught functional programming to non-programmers in my + course ( + + Y Combinator for Non-programmers + + )—without showing any code. I could have used letters instead of + emojis, but emojis are less scary-looking for non-programers. +

+ + Another example + +

+ Let’s take a look at another example. Here’s a piece of JS code + that’s slightly different from before. It’s a function that{' '} + ignores the input and always returns{' '} + 'pizza'. +

+ {`// A function that ignores the input +// and always returns 'pizza' +sushi => 'pizza'`} +

+ Let’s run the above code with 'sandwich'{' '} + as the argument. +

+ {`(sushi => 'pizza')('sandwich')`} +

+ As expected, the result is 'pizza'. Now, + this code can be represented using an emoji puzzle as follows.{' '} + +

+ +

+ Just like the JS code, the emoji puzzle ended up with a{' '} + after running it. +

+ +

+ What we learned so far: Simple JS code like below + can be visually represented using emoji puzzles. +

+ Functional JS code:} + >{`(sushi => sushi)('sandwich')`} + Equivalent emoji puzzle: + + +
+ Functional JS code:} + >{`(sushi => 'pizza')('sandwich')`} + Equivalent emoji puzzle: + + + + + Visualizing evaluation rules + +

+ Because you know how to code, you have a mental model of how + function evaluation works. If you see{' '} + (sushi => sushi)('sandwich'), you can + quickly figure out that the result would be{' '} + 'sandwich'. If you see{' '} + (sushi => 'pizza')('sandwich'), you know + that the result would be 'pizza'. You + know what free variables and bound variables mean. +

+

+ On the other hand, non-programmers may not have a mental model of + how function evaluation works. To help them develop a mental model + without showing them any code, I created a{' '} + step-by-step visualization of function evaluation + rules using the emoji puzzle I mentioned earlier. +

+

Let’s reuse the earlier example again:

+ Functional JS code:} + >{`(sushi => sushi)('sandwich')`} + Equivalent emoji puzzle: +

+ On the puzzle below,{' '} + + try pressing the button + + . This button is a bit different from the last time— + + it shows all the steps that happen in between the beginning and + the end + + . +

+ + + +

Here are the four steps it displayed:

+

+ Step 1.{' '} + + + +

+

+ First, we label each emoji.{' '} + + The top item is labeled as{' '} + (for + “Top”), the left item is labeled as{' '} + (for + “Left”), and the right item is labeled as{' '} + {' '} + (for “Right”). + +

+ + + +

+ Step 2.{' '} + + + +

+

+ Second, In this case, both the + bottom-left and the bottom-right are , + so there’s a match. +

+ + + +

+ Step 3.{' '} + + + +

+

+ Third, In this case, we copy the{' '} + on the top to the bottom-right. +

+ + + +

+ Step 4.{' '} + + + +

+

+ Finally, We’re left with just the{' '} + at the end. +

+ + + + + +

+ The above steps visually represent how functions are + evaluated—they are equivalent to how JavaScript evaluates{' '} + (sushi => sushi)('sandwich'). By learning + these rules, non-programmers can evaluate functions intuitively, + without learning about how variable bindings work. +

+ + If there’s no match + +

Let’s take a look at the other example from earlier:

+ Functional JS code:} + >{`(sushi => 'pizza')('sandwich')`} + Equivalent emoji puzzle: +

+ + Try pressing the button and see + what happens: + +

+ +

Here are the three steps it displayed:

+

+ Step 1.{' '} + + + —this is the same as before. + +

+ + + +

+ Step 2.{' '} + + This time, there’s no match between{' '} + and{' '} + . + The bottom-left is , but the + bottom-right is . + +

+ + No match:{' '} + {' '} + {' '} + ❌ + +

+ If there’s no match,{' '} + + we skip step 3 () and go directly to step 4. + +

+

+ Step 4.{' '} + + + +

+ + + +

+ That’s how the emoji puzzle visualizes the evaluation of a + function when there’s no matching variable in the function + body—like{' '} + {`(sushi => 'pizza')('sandwich')`}. +

+ +

+ More examples (optional read): Here are more + examples that might be helpful for your understanding. You can{' '} + + press + {' '} + on each example to see the evaluation visualization.{' '} + +

+ 'bread')`} + caption={<>Functional JS code:} + >{`(pizza => pizza)(spaghetti => 'bread')`} + Equivalent emoji puzzle: +
+ Functional JS code:} + >{`(salad => 'hotDog')(curry => 'tacos')`} + Equivalent emoji puzzle: + + + More complicated expressions + +

+ Let’s take a look at more complicated functional JS expressions + and see if they can be represented using an emoji puzzle. Check + out the following JS expression, and + + {' '} + try to guess what the result would be before pressing the{' '} + button. + +

+ + Guess what the result would be +
+ before pressing the button! + + } + >{`(sushi => sandwich => sushi)( + 'hamburger' +)('chicken')`} +

+ The result was {`'hamburger'`}. It’s + because {'sushi'} is bound to{' '} + {`'hamburger'`},{' '} + {'sandwich'} is bound to{' '} + {`'chicken'`}, and it returns what’s in{' '} + {'sushi'}. +

+

And here’s the equivalent emoji puzzle:

+ +

Let’s break it down. First, the function expression…

+ + lineNumber === 0 && tokenNumber > 0 && tokenNumber < 9 + } + >{`(sushi => sandwich => sushi)( + 'hamburger' +)('chicken')`} +

…is represented by the bottom row:

+ + + sushi => sandwich => sushi + + +

And the two arguments…

+ + (lineNumber === 1 && tokenNumber > 0 && tokenNumber < 2) || + (lineNumber === 2 && tokenNumber > 2 && tokenNumber < 4) + } + >{`(sushi => sandwich => sushi)( + 'hamburger' +)('chicken')`} +

…are represented by the top and the middle rows:

+ + + ('hamburger')('chicken') + + +

+ Now, let’s talk about how we evaluate this function. In JS, we + first evaluate the function call with the argument{' '} + 'hamburger'. +

+ In JS, we evaluate this part first} + shouldHighlight={(lineNumber, tokenNumber) => + lineNumber === 0 || + (lineNumber === 1 && tokenNumber > 0 && tokenNumber < 2) || + (lineNumber === 2 && tokenNumber < 2) + } + >{`(sushi => sandwich => sushi)( + 'hamburger' +)('chicken')`} +

+ Equivalently, in the emoji puzzle,{' '} + we evaluate the bottom two rows first. We ignore + the top row initially, which is shaded in blue. +

+ + Focus on the bottom two rows, and +
+ Ignore the top row for now + +

+ If you look at the left edge of the puzzle, the bottom two rows + correspond to the pair of{' '} + 1 + ’s. That’s the rule:{' '} + + In an emoji puzzle with 3 rows, you start with the pair of{' '} + 1’s. + +

+

+ Next, let’s label each item on the bottom two rows. This time, in + addition to{' '} + {' '} + {' '} + ,{' '} + + we now have a new label{' '} + + {' '} + for the . +

+ + There’s a new label{' '} + +
+ for the + +

+ Here’s the rule:{' '} + + The middle items on the bottom row are labeled as{' '} + , + and you can ignore them. + {' '} + You can pretend that{' '} + + ’s don’t exist and apply the other rules from before. +

+

Let’s take a look at the next few steps in this iteration:

+ + + + + + + +

This is exactly like how the earlier JS code is evaluated.

+ After evaluating this part…} + shouldHighlight={(lineNumber, tokenNumber) => + lineNumber === 0 || + (lineNumber === 1 && tokenNumber > 0 && tokenNumber < 2) || + (lineNumber === 2 && tokenNumber < 2) + } + >{`(sushi => sandwich => sushi)( + 'hamburger' +)('chicken')`} + + + …it becomes this, which is +
+ equivalent to the above emoji puzzle + + } + >{`(sandwich => 'hamburger')('chicken')`} +

+ But we’re not done yet! Let’s continue to the end by{' '} + + pressing the button below: + +

+ Let’s continue to the end! +

+ We ended up with a , which is exactly + the same as what the JS code evaluated to. So we’ve shown that + complex functional JS expressions can be represented using an + emoji puzzle. +

+ +

+ What we learned so far: Complex functional JS + expressions can be represented using an emoji puzzle. +

+ Functional JS code:} + >{`(sushi => sandwich => sushi)( + 'hamburger' +)('chicken')`} + + Equivalent emoji puzzle: +
+ (Start with the pair of{' '} + 1’s) + + + + + +

+ More examples (optional read): Here’s another + example that might be helpful for your understanding. Check out + the following JS expression, and{' '} + + try to guess what the result would be before pressing the{' '} + button. + +

+ {`(friedPotatoes => pizza => pizza)( + spaghetti => spaghetti +)('salad')`} +

+ The result was 'salad'. Now, here’s the + equivalent emoji puzzle below.{' '} + + Try pressing . + {' '} + Again, remember that: +

+
    + + We start with the pair of{' '} + 1’s. + + + The middle items on the bottom row are labeled as{' '} + + , and you can ignore them. + +
+ Equivalent emoji puzzle: +
+

+ Next, here’s slightly different JS code.{' '} + + There’s an extra pair of parentheses around{' '} + (spaghetti => spaghetti)('salad'), so + this will be evaluated first + + , and the result will be different from the last time. +

+ pizza`} + caption={guessTheResult} + >{`(friedPotatoes => pizza => pizza)( + (spaghetti => spaghetti)("salad") +)`} +

+ Let’s take a look at the equivalent emoji puzzle. This time,{' '} + + the pair of 1’s + is on the top two rows + {' '} + instead.{' '} + + Try pressing + {' '} + and see what happens! +

+ + This time, the pair of{' '} + 1’s is +
+ on the top two rows instead + +

+ Summary: +

+
    + + In JavaScript, you can change the evaluation + order of an expression by placing{' '} + parentheses on different locations. + + + In emoji puzzles, you can change the evaluation + order by placing{' '} + + the numbers (e.g.{' '} + 1’s and{' '} + 2’s) + {' '} + on different locations. + +
+ + + Church numerals + +

+ Let’s take a look at something more interesting. Here’s a function + called convert that takes a function as + an argument. It then applies{' '} + (n => n + 1)(0) to it. +

+ {`function convert(f) { + return f(n => n + 1)(0) +}`} +

+ Now, suppose that we apply convert on + this function:{' '} + sushi => sandwich => sandwich. What would + the result be?{' '} + + Try to guess before pressing the {' '} + button. + +

+ {`function convert(f) { + return f(n => n + 1)(0) +} + +convert(sushi => sandwich => + sandwich +)`} +

+ The result is 0 because: +

+
    + + sushi is bound to{' '} + n => n + 1 + + + sandwich is bound to{' '} + 0 + + + And it returns sandwich, which is{' '} + 0. + +
+

+ Now, what if the input changes as follows?{' '} + + Try pressing on each example. + +

+ {`convert(sushi => sandwich => + sushi(sandwich) +)`} + {`convert(sushi => sandwich => + sushi(sushi(sandwich)) +)`} + {`convert(sushi => sandwich => + sushi(sushi(sushi(sandwich))) +)`} +

+ The results are 1,{' '} + 2, and 3{' '} + respectively because: +

+
    + + sushi is bound to{' '} + n => n + 1 + + + sandwich is bound to{' '} + 0 + + + So it applies n => n + 1 to{' '} + 0 for the number of times{' '} + sushi is used in the function body. + +
+ +

+ What we learned so far: If we have a function that + has one of the following patterns: +

+ {`// a & b can be any variable name +a => b => b +a => b => a(b) +a => b => a(a(b)) +a => b => a(a(a(b))) +// ...and so on...`} +

+ Then, when the function is passed to{' '} + convert(),{' '} + + it returns the number of times a is + applied to b + {' '} + in the function body. +

+ {`convert(a => b => b) // 0 +convert(a => b => a(b)) // 1 +convert(a => b => a(a(b))) // 2 +convert(a => b => a(a(a(b)))) // 3 +// ...and so on...`} + +

+ These functions that can be converted to numbers using{' '} + convert() have a{' '} + special name. They are called{' '} + + Church numerals + + . Each function represents some Church numeral. +

+ {`// Church numeral 0 +a => b => b + +// Church numeral 1 +a => b => a(b) + +// Church numeral 2 +a => b => a(a(b))) + +// Church numeral 3 +a => b => a(a(a(b)))) + +// ...and so on...`} +

+ You might be wondering: “What’s the point of this?” + I’ll explain it shortly, but before I do so, let me explain how my + emoji puzzles can express Church numerals. +

+

+ Here’s an emoji puzzle that represents{' '} + sushi => sandwich => sandwich, which is{' '} + Church numeral 0. +

+ + Represents: +
+ sushi => sandwich => sandwich +
+ (Church numeral 0) + +

+ Here’s what’s new:{' '} + + We now have a {' '} + button below the puzzle which converts it to the corresponding + Church number. + {' '} + Try pressing it. +

+ + + +

+ Other Church numeral functions can also be represented using emoji + puzzles, and they can be converted as well. Of course, the emojis + don’t need to be and{' '} + + —they can be other emojis, as long as they follow the same + pattern. +

+ + Represents: +
+ + hamburger => chicken => hamburger(chicken) + +
+ (Church numeral 1) + + + Church numeral 2 + + + Church numeral 3 + +

+ Now that we’ve covered the basics of Church numerals, we’ll talk + next about why Church numerals are interesting. +

+ + You can do maths with functions + +

+ Church numerals are interesting because{' '} + they let you do maths with functions. First, take + a look at this function: +

+ {`sushi => sandwich => pizza => + sandwich( + sushi(sandwich)(pizza) + )`} +

+ It looks pretty complicated, but don’t worry too much. Now, + suppose that: +

+
    + + We apply the above function to the Church numeral zero ( has the + pattern a => b => b), and + + + Run convert() (from earlier) on it. + What would the result be? + +
+

+ Let’s take a look.{' '} + + Try to guess before pressing the {' '} + button! + +

+ {`// Function from the above +const f = sushi => sandwich => pizza => + sandwich( + sushi(sandwich)(pizza) + ) + +// Church numeral zero +const zero = chicken => salad => salad + +// What happens when you apply f to zero, +// and convert it? +convert(f(zero))`} +

+ The result is 1, which is 1 greater than + the input Church numeral, which was 0. + Basically, 0 became{' '} + 1. +

+

+ Here’s the secret:{' '} + + This function we used actually adds 1 to the input + church numeral. + {' '} + When you apply this function to a Church numeral, it returns a{' '} + new Church numeral that’s 1 greater than before. +

+ {`// If we apply this function to a +// Church numeral, it returns a new +// Church numeral that’s greater by 1. +const f = sushi => sandwich => pizza => + sandwich( + sushi(sandwich)(pizza) + )`} +

You can try out more examples to verify this:

+ {`// Church numeral one +const one = chicken => salad => + chicken(salad) + +convert(f(one))`} + {`// Church numeral two +const two = chicken => salad => + chicken(chicken(salad)) + +convert(f(two))`} +

+ This is what I mean by “ + doing maths with functions”: +

+
    + + You can calcultate someNumber + 1… + + + By using a Church numeral function that can be converted to{' '} + someNumber… + + + And the function f we saw earlier. + +
+

+ + Now, let’s see if we can explain this to non-programmers using + emoji puzzles. + +

+

+ First, here’s an emoji puzzle representation of the Church numeral{' '} + 0. You can confirm that it can be converted to{' '} + by pressing the button. +

+ + Represents: +
+ chicken => salad => salad +
+ (Church numeral 0) + +

+ And here’s the function f we saw earlier, + represented as an emoji puzzle: +

+ {`const f = sushi => sandwich => pizza => + sandwich( + sushi(sandwich)(pizza) + )`} + + Equivalent emoji puzzle: +

+ Let’s apply f to the Church numeral{' '} + 0. To do that, we just combine the above two emoji + puzzles and run it. +

+ Combined the above two emoji puzzles +

+ The result is equivalent to{' '} + sandwich => pizza => sandwich(pizza), + which is Church numeral 1. +

+ + Represents: +
+ sandwich => pizza => sandwich(pizza) +
+ (Church numeral 1) + + +

+ What just happened: An emoji puzzle that can be + converted to became a puzzle that can + be converted to . +

+ + + +

+ In other words:{' '} + + We can use an emoji puzzle to calculate{' '} + someNumber + 1, in a way that’s + equivalent to using Church numeral functions in JS. + +

+ + +

+ More examples (optional read): Let’s see if we can + calculate 1 + 1 = 2 using the same method. Here’s an emoji + puzzle that can be converted to : +

+ + Represents: +
+ chicken => salad => chicken(salad) +
+ (Church numeral 1) + +

+ And let’s combine it with the earlier emoji puzzle and run it.{' '} + +

+ +

+ The result is equivalent to Church numeral 2 and + can be converted to . +

+ + Church numeral 2 + +

+ So, it successfully calculated 1 + 1 = 2! Again, this is what + just happened: +

+ + + + + + More complicated computations + + + -
) : ( <> ) +} diff --git a/public/static/fonts/VictorMono-SemiBold.woff b/public/static/fonts/VictorMono-SemiBold.woff new file mode 100644 index 000000000..d8340d3ae Binary files /dev/null and b/public/static/fonts/VictorMono-SemiBold.woff differ diff --git a/public/static/fonts/VictorMono-SemiBold.woff2 b/public/static/fonts/VictorMono-SemiBold.woff2 new file mode 100644 index 000000000..bed97f852 Binary files /dev/null and b/public/static/fonts/VictorMono-SemiBold.woff2 differ diff --git a/public/static/images/blog-og.png b/public/static/images/blog-og.png new file mode 100644 index 000000000..4a92de423 Binary files /dev/null and b/public/static/images/blog-og.png differ diff --git a/scripts/lib/buildExpressionContainers.ts b/scripts/lib/buildExpressionContainers.ts index 5b13b2bd9..ddf246df4 100644 --- a/scripts/lib/buildExpressionContainers.ts +++ b/scripts/lib/buildExpressionContainers.ts @@ -1,6 +1,7 @@ import { ExpressionRunnerConfig } from 'scripts/lib/buildExpressionRunnerConfigFromShorthand' import { isContainerWithState } from 'src/lib/expressionContainerGuards' import stepExpressionContainer from 'scripts/lib/stepExpressionContainer' +import prioritizeExpressionContainer from 'scripts/lib/prioritizeExpressionContainer' import { ExpressionContainer, SteppedExpressionContainer @@ -18,15 +19,25 @@ const buildExpressionContainers = ({ hideControls, lastAllowedExpressionState, lastAllowedExpressionStateAfterIterations, + applicativeOrder, hideRunButton }: ExpressionRunnerConfig): readonly ExpressionContainer[] => { if (initialExpressionContainer) { let currentExpressionContainer: SteppedExpressionContainer = initialExpressionContainer + + if (applicativeOrder) { + currentExpressionContainer = prioritizeExpressionContainer( + initialExpressionContainer, + applicativeOrder + ) + } + const results: ExpressionContainer[] = [] const stepOptions = { showAllShowSteps, skipAlphaConvert, - skipActive + skipActive, + applicativeOrder } initializeInstructions.forEach(initializeInstruction => { @@ -128,7 +139,9 @@ const buildExpressionContainers = ({ return results } } else if (initialExpressionContainers) { - return initialExpressionContainers + return initialExpressionContainers.map(x => + applicativeOrder ? prioritizeExpressionContainer(x, applicativeOrder) : x + ) } else { throw new Error() } diff --git a/scripts/lib/buildExpressionRunnerConfigFromShorthand.ts b/scripts/lib/buildExpressionRunnerConfigFromShorthand.ts index a9a4c460c..462b78973 100644 --- a/scripts/lib/buildExpressionRunnerConfigFromShorthand.ts +++ b/scripts/lib/buildExpressionRunnerConfigFromShorthand.ts @@ -8,13 +8,15 @@ import { isExpressionRunnerRunButtonOnlyConfig, isExpressionRunnerSingleStepConfig } from 'scripts/lib/expressionRunnerShorthandConfig' -import { ExpressionContainer } from 'src/types/ExpressionContainerTypes' +import { + ExpressionContainer, + SteppedExpressionContainer +} from 'src/types/ExpressionContainerTypes' import { InitializeInstruction, ExpressionRunnerContextProps, expressionRunnerContextDefault } from 'src/types/ExpressionRunnerTypes' -import { SteppedExpressionContainer } from 'src/types/ExpressionContainerTypes' import { ExpressionRunnerProps } from 'src/types/ExpressionRunnerTypes' export interface ExpressionRunnerConfig { @@ -42,6 +44,7 @@ export interface ExpressionRunnerConfig { highlightFunctions: boolean convert?: ExpressionRunnerProps['convert'] crossed?: boolean + applicativeOrder?: boolean } const expressionRunnerDefaults = { @@ -114,6 +117,7 @@ const buildExpressionRunnerConfigFromShorthand = ( initialState, isDone, skipAlphaConvert, + applicativeOrder, skipActive, showDefaultAndActiveOnly, nextIterations, @@ -139,6 +143,7 @@ const buildExpressionRunnerConfigFromShorthand = ( showAllShowSteps, highlightOverridesCallArgAndFuncUnboundOnly, skipAlphaConvert, + applicativeOrder, skipActive, showDefaultAndActiveOnly, bottomRightBadgeOverrides, @@ -165,6 +170,7 @@ const buildExpressionRunnerConfigFromShorthand = ( showAllShowSteps, speed, skipAlphaConvert, + applicativeOrder, skipActive, showDefaultAndActiveOnly, highlightOverrides, @@ -183,6 +189,7 @@ const buildExpressionRunnerConfigFromShorthand = ( hideFuncUnboundBadgeOnExplanation, skipToTheEnd, skipAlphaConvert, + applicativeOrder, skipActive, showDefaultAndActiveOnly, explanationsVisibility: @@ -234,6 +241,7 @@ const buildExpressionRunnerConfigFromShorthand = ( showPriorities, explanationsVisibility, showAllShowSteps, + applicativeOrder, nextIterations, skipToTheEnd, convert @@ -247,6 +255,7 @@ const buildExpressionRunnerConfigFromShorthand = ( hidePriorities: !showPriorities, hideFuncUnboundBadgeOnExplanation, hideRunButton: false, + applicativeOrder, explanationsVisibility, lastAllowedExpressionStateAfterIterations: nextIterations, showAllShowSteps, diff --git a/scripts/lib/expressionRunnerShorthandConfig.ts b/scripts/lib/expressionRunnerShorthandConfig.ts index 0596da39f..92bbef832 100644 --- a/scripts/lib/expressionRunnerShorthandConfig.ts +++ b/scripts/lib/expressionRunnerShorthandConfig.ts @@ -1,6 +1,8 @@ -import { ExpressionContainer } from 'src/types/ExpressionContainerTypes' +import { + ExpressionContainer, + SteppedExpressionContainer +} from 'src/types/ExpressionContainerTypes' import { ExpressionRunnerProps } from 'src/types/ExpressionRunnerTypes' -import { SteppedExpressionContainer } from 'src/types/ExpressionContainerTypes' export const expressionRunnerSimpleConfigDefault = { isDone: false, @@ -16,6 +18,7 @@ interface ExpressionRunnerSimpleConfig { initialState?: ExpressionContainer['previouslyChangedExpressionState'] isDone?: boolean skipAlphaConvert?: boolean + applicativeOrder?: boolean skipActive?: boolean showDefaultAndActiveOnly?: boolean nextIterations?: number @@ -65,6 +68,7 @@ interface ExpressionRunnerRunButtonOnlyConfig { showAllShowSteps?: ExpressionRunnerProps['showAllShowSteps'] speed?: number skipAlphaConvert?: boolean + applicativeOrder?: boolean skipActive?: boolean showDefaultAndActiveOnly?: boolean highlightOverrides?: ExpressionRunnerProps['highlightOverrides'] @@ -116,6 +120,7 @@ interface ExpressionRunnerPredefinedConfig { hideFuncUnboundBadgeOnExplanation?: boolean showPriorities?: boolean nextIterations?: number + applicativeOrder?: boolean explanationsVisibility?: ExpressionRunnerProps['explanationsVisibility'] showAllShowSteps?: ExpressionRunnerProps['showAllShowSteps'] skipToTheEnd?: boolean diff --git a/scripts/lib/findNextExecutableAndParent.ts b/scripts/lib/findNextExecutableAndParent.ts index ee5359d62..a5e56a04a 100644 --- a/scripts/lib/findNextExecutableAndParent.ts +++ b/scripts/lib/findNextExecutableAndParent.ts @@ -17,6 +17,7 @@ import { BinaryExpression, ExecutableBinary } from 'src/types/ExpressionTypes' +import { StepOptions } from 'scripts/lib/stepExpressionContainer' export interface FindResult { readonly expression?: @@ -42,7 +43,8 @@ function helper({ callParent, callParentKey, binaryParent, - binaryParentKey + binaryParentKey, + applicativeOrder }: { expression: CallExpression | ConditionalExpression | BinaryExpression conditionalParent?: ConditionalExpression @@ -50,16 +52,19 @@ function helper({ callParent?: CallExpression callParentKey?: 'func' | 'arg' binaryParentKey?: 'first' | 'second' + applicativeOrder?: boolean }): FindResult { if (isCall(expression)) { - if (isExecutableCall(expression)) { - return { - expression, - callParent, - callParentKey, - binaryParentKey, - conditionalParent, - binaryParent + if (!applicativeOrder) { + if (isExecutableCall(expression)) { + return { + expression, + callParent, + callParentKey, + binaryParentKey, + conditionalParent, + binaryParent + } } } @@ -67,7 +72,8 @@ function helper({ const result: FindResult = helper({ expression: expression.func, callParentKey: 'func', - callParent: expression + callParent: expression, + applicativeOrder }) if (result.expression) { return result @@ -78,21 +84,37 @@ function helper({ const result: FindResult = helper({ expression: expression.arg, callParentKey: 'arg', - callParent: expression + callParent: expression, + applicativeOrder }) if (result.expression) { return result } } + + if (applicativeOrder) { + if (isExecutableCall(expression)) { + return { + expression, + callParent, + callParentKey, + binaryParentKey, + conditionalParent, + binaryParent + } + } + } } else if (isConditional(expression)) { - if (isExecutableConditional(expression)) { - return { - expression, - callParent, - callParentKey, - binaryParentKey, - conditionalParent, - binaryParent + if (!applicativeOrder) { + if (isExecutableConditional(expression)) { + return { + expression, + callParent, + callParentKey, + binaryParentKey, + conditionalParent, + binaryParent + } } } @@ -103,21 +125,37 @@ function helper({ ) { const result: FindResult = helper({ expression: expression.condition, - conditionalParent: expression + conditionalParent: expression, + applicativeOrder }) if (result.expression) { return result } } + + if (applicativeOrder) { + if (isExecutableConditional(expression)) { + return { + expression, + callParent, + callParentKey, + binaryParentKey, + conditionalParent, + binaryParent + } + } + } } else { - if (isExecutableBinary(expression)) { - return { - expression, - callParent, - callParentKey, - binaryParentKey, - conditionalParent, - binaryParent + if (!applicativeOrder) { + if (isExecutableBinary(expression)) { + return { + expression, + callParent, + callParentKey, + binaryParentKey, + conditionalParent, + binaryParent + } } } @@ -129,7 +167,8 @@ function helper({ const result: FindResult = helper({ expression: expression.first, binaryParent: expression, - binaryParentKey: 'first' + binaryParentKey: 'first', + applicativeOrder }) if (result.expression) { return result @@ -144,12 +183,26 @@ function helper({ const result: FindResult = helper({ expression: expression.second, binaryParent: expression, - binaryParentKey: 'second' + binaryParentKey: 'second', + applicativeOrder }) if (result.expression) { return result } } + + if (applicativeOrder) { + if (isExecutableBinary(expression)) { + return { + expression, + callParent, + callParentKey, + binaryParentKey, + conditionalParent, + binaryParent + } + } + } } const notFound: FindResult = {} @@ -157,11 +210,15 @@ function helper({ } export default function findNextExecutableAndParent( - expression: Expression + expression: Expression, + stepOptions: StepOptions ): FindResult { const notFound: FindResult = {} if (isCall(expression) || isConditional(expression) || isBinary(expression)) { - return helper({ expression }) + return helper({ + expression, + applicativeOrder: stepOptions.applicativeOrder + }) } else if (isFunction(expression)) { let currentExpression: Expression = expression let previousExpression: FunctionExpression | null = null @@ -175,7 +232,8 @@ export default function findNextExecutableAndParent( isBinary(currentExpression) ) { const helperResult = helper({ - expression: currentExpression + expression: currentExpression, + applicativeOrder: stepOptions.applicativeOrder }) if ( helperResult.callParent || diff --git a/scripts/lib/initialExpressionContainers.ts b/scripts/lib/initialExpressionContainers.ts index 1f3a2f328..de43f0d23 100644 --- a/scripts/lib/initialExpressionContainers.ts +++ b/scripts/lib/initialExpressionContainers.ts @@ -25,6 +25,14 @@ export const nyhe = initializeExpressionContainer([ 'b' ]) +export const sckn = initializeExpressionContainer([ + { + arg: 'a', + body: 'f' + }, + 'b' +]) + export const txbv = initializeExpressionContainer([ { arg: 'c', @@ -160,6 +168,38 @@ export const epon = initializeExpressionContainer([ 'h' ]) +export const mfca = initializeExpressionContainer([ + { + arg: 'e', + body: { + arg: 'f', + body: 'f' + } + }, + { + arg: 'g', + body: 'g' + }, + 'h' +]) + +export const csqx = initializeExpressionContainer([ + { + arg: 'e', + body: { + arg: 'f', + body: 'f' + } + }, + [ + { + arg: 'g', + body: 'g' + }, + 'h' + ] +]) + export const lqti = initializeExpressionContainer([ { arg: 'b', @@ -323,6 +363,8 @@ export const jpac = initializeExpressionContainer( ) export const xvjz = initializeExpressionContainer(numberParams('f', 'g', 0)) +export const yqiv = initializeExpressionContainer(numberParams('d', 'h', 0)) +export const aeoc = initializeExpressionContainer(numberParams('d', 'h', 1)) const yCombinator: FunctionExpressionParams = { arg: 'a', @@ -2099,20 +2141,6 @@ export const ibfr = initializeExpressionContainer([ } ]) -export const crxl = initializeExpressionContainer([ - [ - addParams('a', 'b', 'c', 'd'), - { - shorthandNumberAfterConvert: 'number', - shorthandNumber: 3 - } - ], - { - shorthandNumberAfterConvert: 'number', - shorthandNumber: 2 - } -]) - export const bgiy = initializeExpressionContainer({ shorthandNumberAfterConvert: 'number', shorthandNumber: 5 @@ -2157,6 +2185,20 @@ export const rovo = initializeExpressionContainer([ } ]) +export const wetc = initializeExpressionContainer([ + [ + multParams('a', 'b', 'c', 'd'), + { + shorthandNumberAfterConvert: 'number', + shorthandNumber: 3 + } + ], + { + shorthandNumberAfterConvert: 'number', + shorthandNumber: 2 + } +]) + export const glvb = initializeExpressionContainer([ { arg: 'A', @@ -2177,6 +2219,37 @@ export const ntes = initializeExpressionContainer(numberParams('c', 'd', 1)) export const tgxv = initializeExpressionContainer(numberParams('g', 'h', 3)) +export const nzne = initializeExpressionContainer(numberParams('b', 'f', 1)) +export const fkvc = initializeExpressionContainer(numberParams('b', 'f', 2)) + +export const hgjl = initializeExpressionContainer(succParams('a', 'b', 'f')) + +export const psen = initializeExpressionContainer([ + succParams('a', 'b', 'f'), + numberParams('d', 'h', 0) +]) + +export const dzod = initializeExpressionContainer([ + succParams('a', 'b', 'f'), + numberParams('d', 'h', 1) +]) + +export const nhmt = initializeExpressionContainer([ + succParams('a', 'b', 'f'), + { + shorthandNumber: 0, + shorthandNumberAfterConvert: 'number' + } +]) + +export const sjbn = initializeExpressionContainer([ + succParams('a', 'b', 'f'), + { + shorthandNumber: 1, + shorthandNumberAfterConvert: 'number' + } +]) + export const jxur = initializeExpressionContainer([ succParams('a', 'b', 'c'), [succParams('a', 'b', 'c'), numberParams('d', 'e', 2)] diff --git a/scripts/lib/prioritizeExpression.ts b/scripts/lib/prioritizeExpression.ts index 59eb2c860..b44ad4d0b 100644 --- a/scripts/lib/prioritizeExpression.ts +++ b/scripts/lib/prioritizeExpression.ts @@ -16,10 +16,12 @@ import populateMaxNestedFunctionDepths from 'scripts/lib/populateMaxNestedFuncti function prioritizeCallExpressionHelper({ expression, - priority + priority, + applicativeOrder }: { expression: E priority: number + applicativeOrder?: boolean }): { expression: E maxDescendantPriority: number @@ -38,25 +40,32 @@ function prioritizeCallExpressionHelper({ if (isCall(expression.func)) { funcResult = prioritizeCallExpressionHelper({ expression: expression.func, - priority + priority, + applicativeOrder }) } else if (isConditional(expression.func)) { funcResult = prioritizeConditionalExpressionHelper({ expression: expression.func, - priority + priority, + applicativeOrder }) } else { funcResult = prioritizeBinaryExpressionHelper({ expression: expression.func, - priority + priority, + applicativeOrder }) } newFunc = funcResult.expression - currentPriority = funcResult.maxDescendantPriority + 1 - maxDescendantPriority = currentPriority + if (applicativeOrder) { + currentPriority = funcResult.expression.priority + 1 + } else { + currentPriority = funcResult.maxDescendantPriority + 1 + maxDescendantPriority = currentPriority + } } else { - newFunc = prioritizeExpressionHelper(expression.func) + newFunc = prioritizeExpressionHelper(expression.func, applicativeOrder) } if ( @@ -68,24 +77,31 @@ function prioritizeCallExpressionHelper({ if (isCall(expression.arg)) { argResult = prioritizeCallExpressionHelper({ expression: expression.arg, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } else if (isConditional(expression.arg)) { argResult = prioritizeConditionalExpressionHelper({ expression: expression.arg, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } else { argResult = prioritizeBinaryExpressionHelper({ expression: expression.arg, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } newArg = argResult.expression - maxDescendantPriority = argResult.maxDescendantPriority + if (applicativeOrder) { + currentPriority = argResult.expression.priority + 1 + } else { + maxDescendantPriority = argResult.maxDescendantPriority + } } else { - newArg = prioritizeExpressionHelper(expression.arg) + newArg = prioritizeExpressionHelper(expression.arg, applicativeOrder) } return { @@ -101,10 +117,12 @@ function prioritizeCallExpressionHelper({ function prioritizeBinaryExpressionHelper({ expression, - priority + priority, + applicativeOrder }: { expression: E priority: number + applicativeOrder?: boolean }): { expression: E maxDescendantPriority: number @@ -123,25 +141,32 @@ function prioritizeBinaryExpressionHelper({ if (isCall(expression.first)) { funcResult = prioritizeCallExpressionHelper({ expression: expression.first, - priority + priority, + applicativeOrder }) } else if (isConditional(expression.first)) { funcResult = prioritizeConditionalExpressionHelper({ expression: expression.first, - priority + priority, + applicativeOrder }) } else { funcResult = prioritizeBinaryExpressionHelper({ expression: expression.first, - priority + priority, + applicativeOrder }) } newFirst = funcResult.expression - currentPriority = funcResult.maxDescendantPriority + 1 - maxDescendantPriority = currentPriority + if (applicativeOrder) { + currentPriority = funcResult.expression.priority + 1 + } else { + currentPriority = funcResult.maxDescendantPriority + 1 + maxDescendantPriority = currentPriority + } } else { - newFirst = prioritizeExpressionHelper(expression.first) + newFirst = prioritizeExpressionHelper(expression.first, applicativeOrder) } if ( @@ -153,24 +178,31 @@ function prioritizeBinaryExpressionHelper({ if (isCall(expression.second)) { argResult = prioritizeCallExpressionHelper({ expression: expression.second, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } else if (isConditional(expression.second)) { argResult = prioritizeConditionalExpressionHelper({ expression: expression.second, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } else { argResult = prioritizeBinaryExpressionHelper({ expression: expression.second, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } newSecond = argResult.expression - maxDescendantPriority = argResult.maxDescendantPriority + if (applicativeOrder) { + currentPriority = argResult.expression.priority + 1 + } else { + maxDescendantPriority = argResult.maxDescendantPriority + } } else { - newSecond = prioritizeExpressionHelper(expression.second) + newSecond = prioritizeExpressionHelper(expression.second, applicativeOrder) } return { @@ -188,10 +220,12 @@ function prioritizeConditionalExpressionHelper< E extends ConditionalExpression >({ expression, - priority + priority, + applicativeOrder }: { expression: E priority: number + applicativeOrder?: boolean }): { expression: E maxDescendantPriority: number @@ -211,24 +245,34 @@ function prioritizeConditionalExpressionHelper< if (isCall(expression.condition)) { conditionResult = prioritizeCallExpressionHelper({ expression: expression.condition, - priority + priority, + applicativeOrder }) } else if (isConditional(expression.condition)) { conditionResult = prioritizeConditionalExpressionHelper({ expression: expression.condition, - priority + priority, + applicativeOrder }) } else { conditionResult = prioritizeBinaryExpressionHelper({ expression: expression.condition, - priority + priority, + applicativeOrder }) } newCondition = conditionResult.expression - currentPriority = conditionResult.maxDescendantPriority + 1 - maxDescendantPriority = currentPriority + if (applicativeOrder) { + currentPriority = conditionResult.expression.priority + 1 + } else { + currentPriority = conditionResult.maxDescendantPriority + 1 + maxDescendantPriority = currentPriority + } } else { - newCondition = prioritizeExpressionHelper(expression.condition) + newCondition = prioritizeExpressionHelper( + expression.condition, + applicativeOrder + ) } if ( @@ -240,23 +284,33 @@ function prioritizeConditionalExpressionHelper< if (isCall(expression.trueCase)) { trueCaseResult = prioritizeCallExpressionHelper({ expression: expression.trueCase, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } else if (isConditional(expression.trueCase)) { trueCaseResult = prioritizeConditionalExpressionHelper({ expression: expression.trueCase, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } else { trueCaseResult = prioritizeBinaryExpressionHelper({ expression: expression.trueCase, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } newTrueCase = trueCaseResult.expression - maxDescendantPriority = trueCaseResult.maxDescendantPriority + if (applicativeOrder) { + currentPriority = trueCaseResult.expression.priority + 1 + } else { + maxDescendantPriority = trueCaseResult.maxDescendantPriority + } } else { - newTrueCase = prioritizeExpressionHelper(expression.trueCase) + newTrueCase = prioritizeExpressionHelper( + expression.trueCase, + applicativeOrder + ) } if ( @@ -268,23 +322,33 @@ function prioritizeConditionalExpressionHelper< if (isCall(expression.falseCase)) { falseCaseResult = prioritizeCallExpressionHelper({ expression: expression.falseCase, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } else if (isConditional(expression.falseCase)) { falseCaseResult = prioritizeConditionalExpressionHelper({ expression: expression.falseCase, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } else { falseCaseResult = prioritizeBinaryExpressionHelper({ expression: expression.falseCase, - priority: currentPriority + 1 + priority: currentPriority + (applicativeOrder ? 0 : 1), + applicativeOrder }) } newFalseCase = falseCaseResult.expression - maxDescendantPriority = falseCaseResult.maxDescendantPriority + if (applicativeOrder) { + currentPriority = falseCaseResult.expression.priority + 1 + } else { + maxDescendantPriority = falseCaseResult.maxDescendantPriority + } } else { - newFalseCase = prioritizeExpressionHelper(expression.falseCase) + newFalseCase = prioritizeExpressionHelper( + expression.falseCase, + applicativeOrder + ) } return { @@ -300,7 +364,8 @@ function prioritizeConditionalExpressionHelper< } function prioritizeExpressionHelper( - expression: E + expression: E, + applicativeOrder?: boolean ): E { if (isVariable(expression)) { return { @@ -311,28 +376,31 @@ function prioritizeExpressionHelper( } else if (isCall(expression)) { return prioritizeCallExpressionHelper({ priority: 1, - expression + expression, + applicativeOrder }).expression } else if (isFunction(expression)) { return { ...expression, - arg: prioritizeExpressionHelper(expression.arg), - body: prioritizeExpressionHelper(expression.body) + arg: prioritizeExpressionHelper(expression.arg, applicativeOrder), + body: prioritizeExpressionHelper(expression.body, applicativeOrder) } } else if (isConditional(expression)) { return prioritizeConditionalExpressionHelper({ priority: 1, - expression + expression, + applicativeOrder }).expression } else if (isRepeat(expression)) { return { ...expression, - child: prioritizeExpressionHelper(expression.child) + child: prioritizeExpressionHelper(expression.child, applicativeOrder) } } else if (isBinary(expression)) { return prioritizeBinaryExpressionHelper({ priority: 1, - expression + expression, + applicativeOrder }).expression } else { throw new Error() @@ -353,13 +421,17 @@ function populatePriorityAggs({ ...expression, arg: populatePriorityAggs({ expression: expression.arg, - argPriorityAgg: [...argPriorityAgg, expression.priority], + argPriorityAgg: [...argPriorityAgg, expression.priority].sort( + (a, b) => a - b + ), funcPriorityAgg: [] as number[] }), func: populatePriorityAggs({ expression: expression.func, argPriorityAgg: [] as number[], - funcPriorityAgg: [expression.priority, ...funcPriorityAgg] + funcPriorityAgg: [expression.priority, ...funcPriorityAgg].sort( + (a, b) => a - b + ) }) } } else if (isFunction(expression)) { @@ -383,7 +455,9 @@ function populatePriorityAggs({ ...expression, falseCase: populatePriorityAggs({ expression: expression.falseCase, - argPriorityAgg: [...argPriorityAgg, expression.priority], + argPriorityAgg: [...argPriorityAgg, expression.priority].sort( + (a, b) => a - b + ), funcPriorityAgg: [] as number[] }), condition: populatePriorityAggs({ @@ -394,7 +468,9 @@ function populatePriorityAggs({ trueCase: populatePriorityAggs({ expression: expression.trueCase, argPriorityAgg: [] as number[], - funcPriorityAgg: [expression.priority, ...funcPriorityAgg] + funcPriorityAgg: [expression.priority, ...funcPriorityAgg].sort( + (a, b) => a - b + ) }) } } else if (isRepeat(expression)) { @@ -411,13 +487,17 @@ function populatePriorityAggs({ ...expression, first: populatePriorityAggs({ expression: expression.first, - argPriorityAgg: [...argPriorityAgg, expression.priority], + argPriorityAgg: [...argPriorityAgg, expression.priority].sort( + (a, b) => a - b + ), funcPriorityAgg: [] as number[] }), second: populatePriorityAggs({ expression: expression.second, argPriorityAgg: [] as number[], - funcPriorityAgg: [expression.priority, ...funcPriorityAgg] + funcPriorityAgg: [expression.priority, ...funcPriorityAgg].sort( + (a, b) => a - b + ) }) } } else { @@ -426,11 +506,12 @@ function populatePriorityAggs({ } export default function prioritizeExpression( - expression: E + expression: E, + applicativeOrder?: boolean ): E { return populatePriorityAggs({ expression: populateMaxNestedFunctionDepths( - prioritizeExpressionHelper(expression) + prioritizeExpressionHelper(expression, applicativeOrder) ), argPriorityAgg: [] as number[], funcPriorityAgg: [] as number[] diff --git a/scripts/lib/prioritizeExpressionContainer.ts b/scripts/lib/prioritizeExpressionContainer.ts index 83ab02cee..6b0e86f33 100644 --- a/scripts/lib/prioritizeExpressionContainer.ts +++ b/scripts/lib/prioritizeExpressionContainer.ts @@ -1,15 +1,33 @@ import prioritizeExpression from 'scripts/lib/prioritizeExpression' -import { ContainerWithState } from 'src/types/ExpressionContainerTypes' +import { + ContainerWithState, + ExpressionContainer +} from 'src/types/ExpressionContainerTypes' import { Expression } from 'src/types/ExpressionTypes' +import { isContainerWithState } from 'src/lib/expressionContainerGuards' export default function prioritizeExpressionContainer( - expressionContainer: ContainerWithState<'needsPrioritize', E> -): ContainerWithState<'ready', E> { + expressionContainer: ContainerWithState<'done', E>, + applicativeOrder?: boolean +): ContainerWithState<'done', E> +export default function prioritizeExpressionContainer( + expressionContainer: ExpressionContainer, + applicativeOrder?: boolean +): ContainerWithState<'ready', E> +export default function prioritizeExpressionContainer( + expressionContainer: ExpressionContainer, + applicativeOrder?: boolean +) { return { ...expressionContainer, - containerState: 'ready', + containerState: isContainerWithState(expressionContainer, 'done') + ? 'done' + : 'ready', previouslyChangedExpressionState: expressionContainer.previouslyChangedExpressionState, - expression: prioritizeExpression(expressionContainer.expression) + expression: prioritizeExpression( + expressionContainer.expression, + applicativeOrder + ) } } diff --git a/scripts/lib/runnerConfigs.ts b/scripts/lib/runnerConfigs.ts index 849195f95..41eed5b1b 100644 --- a/scripts/lib/runnerConfigs.ts +++ b/scripts/lib/runnerConfigs.ts @@ -34,6 +34,30 @@ export const pbhg: ExpressionRunnerShorthandConfig = { } } +export const itvv: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.pisd, + initialState: 'betaReducePreviewBefore', + showPriorities: true, + explanationsVisibility: 'visible' +} + +export const nefh: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.pisd, + initialState: 'betaReducePreviewAfter', + showPriorities: true, + explanationsVisibility: 'visible' +} + +export const qwtn: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.pisd, + initialState: 'betaReducePreviewCrossed', + showPriorities: true, + explanationsVisibility: 'visible' +} + export const wwtl: ExpressionRunnerShorthandConfig = { runner: 'singleStep', initialExpressionContainer: initialExpressionContainers.pisd, @@ -194,6 +218,26 @@ export const cvtc: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const lxzn: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.pisd, + showPriorities: true, + highlightOverrides: { + a: 'highlighted', + b: 'highlighted' + } +} + +export const ujuq: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.pisd, + showPriorities: true, + highlightOverrides: { + c: 'highlighted', + d: 'highlighted' + } +} + export const oork: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.hrdv, @@ -404,6 +448,21 @@ export const hdxc: ExpressionRunnerShorthandConfig = { skipToTheEnd: false } +export const xhje: ExpressionRunnerShorthandConfig = { + runner: 'runButtonOnly', + initialExpressionContainer: initialExpressionContainers.mfca, + showPriorities: true, + skipToTheEnd: false +} + +export const hyvj: ExpressionRunnerShorthandConfig = { + runner: 'runButtonOnly', + initialExpressionContainer: initialExpressionContainers.csqx, + showPriorities: true, + skipToTheEnd: false, + applicativeOrder: true +} + export const hykj: ExpressionRunnerShorthandConfig = { runner: 'runButtonOnly', skipToTheEnd: false, @@ -426,6 +485,12 @@ export const ilpo: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.nyhe } +export const lngo: ExpressionRunnerShorthandConfig = { + runner: 'simple', + isDone: true, + initialExpressionContainer: initialExpressionContainers.nyhe +} + export const elku: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.nyhe, @@ -504,6 +569,15 @@ export const kvso: ExpressionRunnerShorthandConfig = { skipToTheEnd: false } +export const iwxm: ExpressionRunnerShorthandConfig = { + runner: 'runButtonOnly', + initialExpressionContainer: initialExpressionContainers.pisd, + nextIterations: 1, + initialState: 'active', + showPriorities: true, + skipToTheEnd: false +} + export const sgnp: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.pisd, @@ -649,6 +723,86 @@ export const jarm: ExpressionRunnerShorthandConfig = { initialExpressionContainer: initialExpressionContainers.mzxw } +export const pjih: ExpressionRunnerShorthandConfig = { + runner: 'simple', + showPriorities: true, + initialExpressionContainer: initialExpressionContainers.nhmt, + applicativeOrder: true +} + +export const kqtz: ExpressionRunnerShorthandConfig = { + runner: 'simple', + showPriorities: true, + initialExpressionContainer: initialExpressionContainers.sjbn, + applicativeOrder: true +} + +export const afxj: ExpressionRunnerShorthandConfig = { + runner: 'runButtonOnly', + showPriorities: true, + skipToTheEnd: false, + initialExpressionContainer: initialExpressionContainers.psen, + applicativeOrder: true, + speed: 1.25 +} + +export const egka: ExpressionRunnerShorthandConfig = { + runner: 'runButtonOnly', + showPriorities: true, + skipToTheEnd: false, + initialExpressionContainer: initialExpressionContainers.dzod, + applicativeOrder: true, + speed: 1.25 +} + +export const uxno: ExpressionRunnerShorthandConfig = { + runner: 'predefined', + showPriorities: true, + initialExpressionContainers: [ + initialExpressionContainers.nzne, + initialExpressionContainers.ntua + ], + convert: 'toMathBox' +} + +export const dvio: ExpressionRunnerShorthandConfig = { + runner: 'predefined', + showPriorities: true, + initialExpressionContainers: [ + initialExpressionContainers.fkvc, + initialExpressionContainers.hdpc + ], + convert: 'toMathBox', + applicativeOrder: true +} + +export const qyhn: ExpressionRunnerShorthandConfig = { + runner: 'simple', + showPriorities: true, + initialExpressionContainer: initialExpressionContainers.hgjl, + applicativeOrder: true +} + +export const hfgh: ExpressionRunnerShorthandConfig = { + runner: 'predefined', + showPriorities: true, + initialExpressionContainers: [ + initialExpressionContainers.yqiv, + initialExpressionContainers.irhr + ], + convert: 'toMathBox' +} + +export const yfwq: ExpressionRunnerShorthandConfig = { + runner: 'predefined', + showPriorities: true, + initialExpressionContainers: [ + initialExpressionContainers.aeoc, + initialExpressionContainers.ntua + ], + convert: 'toMathBox' +} + export const jjjh: ExpressionRunnerShorthandConfig = { runner: 'predefined', initialExpressionContainers: [ @@ -686,6 +840,17 @@ export const epoi: ExpressionRunnerShorthandConfig = { convert: 'toMathBox' } +export const fgen: ExpressionRunnerShorthandConfig = { + runner: 'predefined', + initialExpressionContainers: [ + initialExpressionContainers.nskn, + initialExpressionContainers.hdpc + ], + showPriorities: true, + convert: 'toMathBox', + applicativeOrder: true +} + export const nlyu: ExpressionRunnerShorthandConfig = { runner: 'simple', showPriorities: true, @@ -793,6 +958,17 @@ export const vlob: ExpressionRunnerShorthandConfig = { convert: 'toMathBox' } +export const pebp: ExpressionRunnerShorthandConfig = { + runner: 'predefined', + initialExpressionContainers: [ + initialExpressionContainers.tgxv, + initialExpressionContainers.qjcv + ], + showPriorities: true, + convert: 'toMathBox', + applicativeOrder: true +} + export const dubm: ExpressionRunnerShorthandConfig = { runner: 'simple', showPriorities: true, @@ -1611,6 +1787,46 @@ export const xqjd: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const qcme: ExpressionRunnerShorthandConfig = { + runner: 'runButtonOnly', + initialExpressionContainer: initialExpressionContainers.sckn +} + +export const gthd: ExpressionRunnerShorthandConfig = { + runner: 'runButtonOnly', + skipToTheEnd: false, + initialExpressionContainer: initialExpressionContainers.sckn +} + +export const gogn: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.sckn, + initialState: 'showFuncBound' +} + +export const zvpc: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.sckn, + initialState: 'betaReducePreviewBefore' +} + +export const nsds: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.sckn, + initialState: 'betaReducePreviewCrossed' +} + +export const bjny: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.sckn +} + +export const ukzq: ExpressionRunnerShorthandConfig = { + runner: 'simple', + isDone: true, + initialExpressionContainer: initialExpressionContainers.sckn +} + export const cldb: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.smxz, @@ -2439,12 +2655,6 @@ export const mlnt: ExpressionRunnerShorthandConfig = { showPriorities: true } -export const ochk: ExpressionRunnerShorthandConfig = { - runner: 'simple', - initialExpressionContainer: initialExpressionContainers.crxl, - showPriorities: true -} - export const ryqp: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.bgiy @@ -2477,6 +2687,12 @@ export const nvdn: ExpressionRunnerShorthandConfig = { showPriorities: true } +export const fvii: ExpressionRunnerShorthandConfig = { + runner: 'simple', + initialExpressionContainer: initialExpressionContainers.wetc, + showPriorities: true +} + export const uhqo: ExpressionRunnerShorthandConfig = { runner: 'simple', initialExpressionContainer: initialExpressionContainers.tjcx diff --git a/scripts/lib/stepExpressionContainer.ts b/scripts/lib/stepExpressionContainer.ts index 9e3c369c9..57027e138 100644 --- a/scripts/lib/stepExpressionContainer.ts +++ b/scripts/lib/stepExpressionContainer.ts @@ -47,20 +47,24 @@ import { } from 'src/types/ExpressionTypes' import prioritizeExpression from 'scripts/lib/prioritizeExpression' -interface StepOptions { +export interface StepOptions { showAllShowSteps?: boolean skipAlphaConvert?: boolean skipActive?: boolean + applicativeOrder?: boolean } const stepExpressionContainerReset = ( - e: ContainerWithState<'needsReset'> + e: ContainerWithState<'needsReset'>, + stepOptions: StepOptions ): ContainerWithState<'done'> | ContainerWithState<'ready'> => { const newContainer = prioritizeExpressionContainer( - resetExpressionContainer(e) + resetExpressionContainer(e), + stepOptions.applicativeOrder ) const nextCallExpressionAndParent = findNextExecutableAndParent( - newContainer.expression + newContainer.expression, + stepOptions ) if (nextCallExpressionAndParent.expression) { return newContainer @@ -312,7 +316,7 @@ const runStep = ( callParentKey, binaryParentKey, binaryParent - } = findNextExecutableAndParent(e.expression) + } = findNextExecutableAndParent(e.expression, stepOptions) if (!expression) { // Special case - already done to begin with return { @@ -344,7 +348,7 @@ const runStep = ( const newContainer = { expression: previouslyChangedExpressionState === 'betaReducePreviewAfter' - ? prioritizeExpression(nextExpression) + ? prioritizeExpression(nextExpression, stepOptions.applicativeOrder) : nextExpression, previouslyChangedExpressionState, matchExists, @@ -413,7 +417,7 @@ const runStep = ( ...e, expression: previouslyChangedExpressionState === 'betaReducePreviewAfter' - ? prioritizeExpression(newExpression) + ? prioritizeExpression(newExpression, stepOptions.applicativeOrder) : newExpression, containerState: 'stepped', matchExists, @@ -434,7 +438,7 @@ export default function stepExpressionContainer( const result = runStep(e, stepOptions) if (isContainerWithState(result, 'needsReset')) { - return stepExpressionContainerReset(result) + return stepExpressionContainerReset(result, stepOptions) } else { return result } diff --git a/src/components/Alert.tsx b/src/components/Alert.tsx new file mode 100644 index 000000000..d982bcbeb --- /dev/null +++ b/src/components/Alert.tsx @@ -0,0 +1,51 @@ +/** @jsx jsx */ +import { css, jsx } from '@emotion/core' +import { ns, radii, colors, spaces } from 'src/lib/theme' +import { CardColorContext } from 'src/components/Card' + +export const alertSpacing = css` + padding: ${spaces(0.75)} ${spaces(0.75)}; + margin-bottom: ${spaces(1.25)}; + margin-top: ${spaces(1.25)}; + + ${ns} { + padding: ${spaces(1)} ${spaces(1.25)}; + } +` + +export interface AlertProps { + children: React.ReactNode + backgroundColor: 'yellow' | 'pink' | 'brown' | 'blue' | 'indigo' +} + +const Alert = ({ children, backgroundColor }: AlertProps) => ( + +
+ {children} +
+ +) + +Alert.defaultProps = { + backgroundColor: 'yellow' +} + +export default Alert diff --git a/src/components/Card.tsx b/src/components/Card.tsx index 0e96d84f7..ce9fa1654 100644 --- a/src/components/Card.tsx +++ b/src/components/Card.tsx @@ -12,7 +12,7 @@ interface CardColorContextProps { } const cardColorContextDefault: CardColorContextProps = { - color: 'grey' + color: 'white' } export const CardColorContext = React.createContext( @@ -24,12 +24,12 @@ export interface CardProps { color: | 'grey' | 'orange' - | 'yellow' | 'green' | 'blue' | 'indigo' | 'pink' | 'brown' + | 'white' slideNumber?: number slideCount?: number isLast?: boolean @@ -48,18 +48,16 @@ export interface CardState { overrideColor?: CardProps['color'] } -export const backgroundColor = (color: CardProps['color'] | 'white') => +export const backgroundColor = (color: CardProps['color']) => ({ green: colors('green50'), grey: colors('grey100'), orange: colors('deepOrange50'), - yellow: colors('yellow100'), purple: colors('deepPurple50'), blue: colors('blue50'), indigo: colors('indigo50'), pink: colors('pink50'), brown: colors('brown50'), - // For highlights in quotes white: colors('white') }[color]) @@ -68,8 +66,8 @@ const slideLabelBgColor = (color: CardProps['color']) => ({ green: colors('green600'), grey: colors('grey600'), + white: colors('grey600'), orange: colors('deepOrange600'), - yellow: colors('yellow900'), purple: colors('deepPurple300'), blue: colors('blue600'), indigo: colors('indigo300'), diff --git a/src/components/ContentTags/Headings.tsx b/src/components/ContentTags/Headings.tsx index ba50235c3..256b761f1 100644 --- a/src/components/ContentTags/Headings.tsx +++ b/src/components/ContentTags/Headings.tsx @@ -1,5 +1,5 @@ import styled from '@emotion/styled' -import { colors, fontSizes, spaces, ns } from 'src/lib/theme' +import { lineHeights, colors, fontSizes, spaces, ns } from 'src/lib/theme' export const H3 = styled.h3` color: ${colors('grey900')}; @@ -7,6 +7,7 @@ export const H3 = styled.h3` font-size: ${fontSizes(1.2)}; ${ns} { + line-height: ${lineHeights(1.4)}; font-size: ${fontSizes(1.4)}; } ` diff --git a/src/components/ContentTags/Inline.tsx b/src/components/ContentTags/Inline.tsx index 4a3919548..8bb781791 100644 --- a/src/components/ContentTags/Inline.tsx +++ b/src/components/ContentTags/Inline.tsx @@ -25,11 +25,11 @@ const HighlightContext = React.createContext( highlightContextDefault ) -const mix = (color: CardProps['color'] | 'white', base: string) => +const mix = (color: CardProps['color'], base: string) => Color(base) .mix( Color(backgroundColor(color)), - color === 'grey' || color === 'white' ? 0.45 : 0.55 + color === 'white' ? 0.35 : color === 'grey' ? 0.45 : 0.55 ) .hsl() .string() @@ -86,8 +86,6 @@ export const HighlightBold = ({ ? mix(baseColor, colors('blue50')) : highlightType === 'white' ? colors('white') - : baseColor === 'yellow' - ? mix(baseColor, colors('pink100')) : mix(baseColor, colors('yellow100'))}; `, inLink && @@ -138,8 +136,6 @@ export const Highlight = ({ ? mix(baseColor, colors('blue50')) : highlightType === 'white' ? colors('white') - : baseColor === 'yellow' - ? mix(baseColor, colors('pink100')) : mix(baseColor, colors('yellow100'))}; `, inLink && diff --git a/src/components/CustomEmoji/TwitterSvg.tsx b/src/components/CustomEmoji/TwitterSvg.tsx new file mode 100644 index 000000000..ff9363497 --- /dev/null +++ b/src/components/CustomEmoji/TwitterSvg.tsx @@ -0,0 +1,15 @@ +import * as React from 'react' + +const Twitter = (props: React.SVGProps) => ( + + + + + +) + +export default Twitter diff --git a/src/components/CustomEmoji/index.tsx b/src/components/CustomEmoji/index.tsx index f9a001c6b..d625185d1 100644 --- a/src/components/CustomEmoji/index.tsx +++ b/src/components/CustomEmoji/index.tsx @@ -31,6 +31,7 @@ import MultiplyWhiteSvg from 'src/components/CustomEmoji/MultiplyWhiteSvg' import TwentyFourSvg from 'src/components/CustomEmoji/TwentyFourSvg' import QuestionMinusOne from 'src/components/CustomEmoji/QuestionMinusOne' import TwentySvg from 'src/components/CustomEmoji/TwentySvg' +import TwitterSvg from 'src/components/CustomEmoji/TwitterSvg' import FourLunchboxesSvg from 'src/components/CustomEmoji/FourLunchboxesSvg' import Emoji, { EmojiProps } from 'src/components/Emoji' @@ -67,7 +68,8 @@ export const customEmojiToComponent = { zeroOne: ZeroOneSvg, fourLunchboxes: FourLunchboxesSvg, nodes: NodesSvg, - complexCalculations: ComplexCalculationsSvg + complexCalculations: ComplexCalculationsSvg, + twitter: TwitterSvg } const CustomEmoji = ({ diff --git a/src/components/EpisodePageInitialRenderWarning.tsx b/src/components/EpisodePageInitialRenderWarning.tsx index 56312fd5a..d26d38e66 100644 --- a/src/components/EpisodePageInitialRenderWarning.tsx +++ b/src/components/EpisodePageInitialRenderWarning.tsx @@ -1,16 +1,16 @@ import React, { useContext } from 'react' -import Card from 'src/components/Card' import EpisodeContext from 'src/components/EpisodeContext' import GlobalContext from 'src/components/GlobalContext' import H from 'src/components/H' +import Alert from 'src/components/Alert' const EpisodePageInitialRenderWarning = () => { const { episodeNumber } = useContext(EpisodeContext) const { initialRender } = useContext(GlobalContext) return !!episodeNumber && initialRender ? ( - + - + ) : null } diff --git a/src/components/ExpressionRunnerCaptionOnly.tsx b/src/components/ExpressionRunnerCaptionOnly.tsx index 049ae2f73..ddb557317 100644 --- a/src/components/ExpressionRunnerCaptionOnly.tsx +++ b/src/components/ExpressionRunnerCaptionOnly.tsx @@ -4,14 +4,12 @@ import { colors, spaces, fitWithinMobileWidth } from 'src/lib/theme' const ExpressionRunnerCaptionOnly = (props: JSX.IntrinsicElements['div']) => (
) diff --git a/src/components/ExpressionRunnerCaptionWrapper.tsx b/src/components/ExpressionRunnerCaptionWrapper.tsx index 0272dfdcc..d5b2753d2 100644 --- a/src/components/ExpressionRunnerCaptionWrapper.tsx +++ b/src/components/ExpressionRunnerCaptionWrapper.tsx @@ -6,14 +6,12 @@ const ExpressionRunnerCaptionWrapper = ( props: JSX.IntrinsicElements['div'] ) => (
) diff --git a/src/components/ExpressionRunnerConfigContext.ts b/src/components/ExpressionRunnerConfigContext.ts new file mode 100644 index 000000000..054187715 --- /dev/null +++ b/src/components/ExpressionRunnerConfigContext.ts @@ -0,0 +1,12 @@ +import React from 'react' + +export interface ExpressionRunnerConfigContextProps { + pointToRunButton?: true + churchNumerals?: true +} + +export const ExpressionRunnerConfigContextDefault: ExpressionRunnerConfigContextProps = {} + +export default React.createContext( + ExpressionRunnerConfigContextDefault +) diff --git a/src/components/ExpressionRunnerControls.tsx b/src/components/ExpressionRunnerControls.tsx index 1ada5b779..8d4f734f1 100644 --- a/src/components/ExpressionRunnerControls.tsx +++ b/src/components/ExpressionRunnerControls.tsx @@ -1,10 +1,12 @@ /** @jsx jsx */ import { css, jsx } from '@emotion/core' +import { useContext } from 'react' import H from 'src/components/H' import { colors, spaces, fontSizes } from 'src/lib/theme' import Emoji from 'src/components/Emoji' import { ExpressionRunnerProps } from 'src/types/ExpressionRunnerTypes' import ExpressionRunnerButton from 'src/components/ExpressionRunnerButton' +import ExpressionRunnerConfigContext from 'src/components/ExpressionRunnerConfigContext' import locale from 'src/lib/locale' interface ExpressionRunnerControlsProps { @@ -13,6 +15,7 @@ interface ExpressionRunnerControlsProps { isRunning: boolean showRunButton: boolean skipToTheEnd: boolean + hideForwardButton: boolean onNextClick: () => void onPreviousClick: () => void onAutoClick: () => void @@ -61,10 +64,12 @@ const ExpressionRunnerControls = ({ onPauseClick, onSkipToTheEndClick, skipToTheEnd, - convert + convert, + hideForwardButton }: ExpressionRunnerControlsProps) => { const centerButtonWidth = convert ? 66 : 48 const sideButtonsWidth = (100 - centerButtonWidth) / 2 - 2 + const { churchNumerals } = useContext(ExpressionRunnerConfigContext) return (
) : skipToTheEnd ? ( convert ? ( - + churchNumerals ? ( + + ) : ( + + ) ) : ( ) @@ -144,7 +156,14 @@ const ExpressionRunnerControls = ({ ) ) : convert ? ( - + churchNumerals ? ( + + ) : ( + + ) ) : ( )} @@ -152,7 +171,10 @@ const ExpressionRunnerControls = ({ )} {showRunButton ? ( <> - {!isRunning && canStepForward && !skipToTheEnd ? ( + {!isRunning && + canStepForward && + !skipToTheEnd && + !hideForwardButton ? ( ( - <> - { - <> - {isDone ? ( - convert ? ( - +}: ExpressionRunnerExplanationProps) => { + const { churchNumerals } = useContext(ExpressionRunnerConfigContext) + return ( + <> + { + <> + {isDone ? ( + convert ? ( + churchNumerals ? ( + + ) : ( + + ) + ) : ( + + ) ) : ( - - ) - ) : ( - !isRunning && ( - - ) - )} - - } - -) + !isRunning && ( + + ) + )} + + } + + ) +} export default ExpressionRunnerExplanation diff --git a/src/components/ExpressionRunnerPrecomputed.tsx b/src/components/ExpressionRunnerPrecomputed.tsx index b7612cab3..8f2be0030 100644 --- a/src/components/ExpressionRunnerPrecomputed.tsx +++ b/src/components/ExpressionRunnerPrecomputed.tsx @@ -28,6 +28,7 @@ import { p, variableExpressionBoxFontSize } from 'src/components/VariableExpressionBox' +import ExpressionRunnerConfigContext from 'src/components/ExpressionRunnerConfigContext' export interface ExpressionRunnerPrecomputedProps { expressionContainers: readonly SteppedExpressionContainer[] @@ -191,6 +192,8 @@ const ExpressionRunnerPrecomputed = ({ variableSize = forceVariableSize } + const { pointToRunButton } = useContext(ExpressionRunnerConfigContext) + return ( )} @@ -347,6 +351,37 @@ const ExpressionRunnerPrecomputed = ({ size={containerSize === 'xxs' ? 'xs' : 'sm'} horizontalPadding={0} > + {pointToRunButton && + !atLeastOneStepTaken && + !isRunning && + !resetClicked && ( + <> +
+ ↑ +
+ + )} {!hideRunButton && canStepForward && !skipToTheEnd && diff --git a/src/components/ExpressionRunnerSeparator.tsx b/src/components/ExpressionRunnerSeparator.tsx index 891f3898e..152aa25b2 100644 --- a/src/components/ExpressionRunnerSeparator.tsx +++ b/src/components/ExpressionRunnerSeparator.tsx @@ -3,11 +3,22 @@ import { css, jsx } from '@emotion/core' import { spaces } from 'src/lib/theme' import CustomEmoji from 'src/components/CustomEmoji' -const ExpressionRunnerSeparator = ({ blank }: { blank?: boolean }) => ( +const ExpressionRunnerSeparator = ({ + blank, + halfMargin, + halfMarginBottom, + halfMarginTop +}: { + blank?: boolean + halfMargin?: boolean + halfMarginBottom?: boolean + halfMarginTop?: boolean +}) => (
{!blank && } diff --git a/src/components/H.tsx b/src/components/H.tsx index 80383322a..7d27215ab 100644 --- a/src/components/H.tsx +++ b/src/components/H.tsx @@ -89,7 +89,7 @@ interface HProps { | { name: 'unmatch' } | { name: 'nextButtonNextPagePrimaryText' } | { name: 'nextButtonSecondaryText'; nextEpisodeNumber: number } - | { name: 'pressPlay'; capitalize?: true } + | { name: 'deprecatedPressRun'; capitalize?: true } | { name: 'indexPageLink' } | { name: 'titlePrefix' } | { name: 'titlePrefixColored'; addColon?: boolean } @@ -139,7 +139,10 @@ interface HProps { | { name: 'convertToMathbox'; lowerCase?: true } | { name: 'undoConvertToMathbox' } | { name: 'doneConvertToMathbox' } - | { name: 'canBeConverted' } + | { name: 'convertToChurchNumeral'; lowerCase?: true } + | { name: 'undoConvertToChurchNumeral' } + | { name: 'doneConvertToChurchNumeral' } + | { name: 'canBeConverted'; emojiPuzzle?: true } | { name: 'plusOneFeature'; capitalize?: true } | { name: 'minusOneFeature'; capitalize?: true; addNewline?: true } | { name: 'repeatFeature'; capitalize?: true; addNewline?: true } @@ -168,6 +171,7 @@ interface HProps { | { name: 'runAndShowAllSteps' } | { name: 'ignoreForNow' } | { name: 'aboutMe'; hideNextPageButton?: boolean } + | { name: 'pointToRunButton' } } const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { @@ -243,7 +247,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { if (args.name === 'newUser') { if (locale === 'en') { return ( -

+ <> Hello! This is page {episodeNumber + 1}{' '} of the course called “ {lessonTitle} @@ -252,21 +256,19 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { click here to read from the beginning . -

+ ) } else { return ( -

+ <> こんにちは！このページは「 {lessonTitle} - 」という記事の - {episodeNumber + 1}ページ目 - です。1ページ目から読むには + 」という記事の{episodeNumber + 1}ページ目です。1ページ目から読むには - こちらからどうぞ + こちらからどうぞ 。 -

+ ) } } @@ -600,7 +602,7 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { return <>{episodePrefix(args.nextEpisodeNumber)}へ } } - if (args.name === 'pressPlay') { + if (args.name === 'deprecatedPressRun') { if (locale === 'en') { return ( @@ -1415,9 +1417,49 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { ) } } + if (args.name === 'convertToChurchNumeral') { + if (locale === 'en') { + return ( + <> + {args.lowerCase ? 'c' : 'C'}onvert to a Number + + ) + } else { + return <> + } + } + if (args.name === 'undoConvertToChurchNumeral') { + if (locale === 'en') { + return ( + + Reset ↩ + + ) + } else { + return <> + } + } + if (args.name === 'doneConvertToChurchNumeral') { + if (locale === 'en') { + return ( + <> + + Converted to a number! + + + ) + } else { + return <> + } + } if (args.name === 'canBeConverted') { if (locale === 'en') { - return <>Lunchbox that can be converted to + return ( + <> + {args.emojiPuzzle ? 'Emoji puzzle' : 'Lunchbox'} that can be converted + to + + ) } else { return <>に変換できる弁当箱 } @@ -1781,6 +1823,13 @@ const H = ({ args, highlightType, episodeNumberOverrides }: HProps) => { ) } } + if (args.name === 'pointToRunButton') { + if (locale === 'en') { + return <>Press this button! + } else { + return <>押してみてください！ + } + } if (args.name === 'aboutMe') { if (locale === 'en') { return ( diff --git a/src/components/Runners/Ochk.tsx b/src/components/Runners/Afxj.tsx similarity index 63% rename from src/components/Runners/Ochk.tsx rename to src/components/Runners/Afxj.tsx index 0799bb617..79d66bdb2 100644 --- a/src/components/Runners/Ochk.tsx +++ b/src/components/Runners/Afxj.tsx @@ -1,12 +1,12 @@ import React from 'react' import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' -import config from 'src/lib/runners/ochk.json' +import config from 'src/lib/runners/afxj.json' -const Ochk = ({ children }: { children?: React.ReactNode }) => ( +const Afxj = ({ children }: { children?: React.ReactNode }) => ( // @ts-ignore {children} ) -export default Ochk +export default Afxj diff --git a/src/components/Runners/Bjny.tsx b/src/components/Runners/Bjny.tsx new file mode 100644 index 000000000..2dae1ddab --- /dev/null +++ b/src/components/Runners/Bjny.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/bjny.json' + +const Bjny = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Bjny diff --git a/src/components/Runners/Dvio.tsx b/src/components/Runners/Dvio.tsx new file mode 100644 index 000000000..36fe2cb2d --- /dev/null +++ b/src/components/Runners/Dvio.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/dvio.json' + +const Dvio = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Dvio diff --git a/src/components/Runners/Egka.tsx b/src/components/Runners/Egka.tsx new file mode 100644 index 000000000..b9f418191 --- /dev/null +++ b/src/components/Runners/Egka.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/egka.json' + +const Egka = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Egka diff --git a/src/components/Runners/Fgen.tsx b/src/components/Runners/Fgen.tsx new file mode 100644 index 000000000..212cb71b0 --- /dev/null +++ b/src/components/Runners/Fgen.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/fgen.json' + +const Fgen = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Fgen diff --git a/src/components/Runners/Fvii.tsx b/src/components/Runners/Fvii.tsx new file mode 100644 index 000000000..ba2ee613d --- /dev/null +++ b/src/components/Runners/Fvii.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/fvii.json' + +const Fvii = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Fvii diff --git a/src/components/Runners/Gogn.tsx b/src/components/Runners/Gogn.tsx new file mode 100644 index 000000000..b94493ff8 --- /dev/null +++ b/src/components/Runners/Gogn.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/gogn.json' + +const Gogn = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Gogn diff --git a/src/components/Runners/Gthd.tsx b/src/components/Runners/Gthd.tsx new file mode 100644 index 000000000..5c890ad82 --- /dev/null +++ b/src/components/Runners/Gthd.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/gthd.json' + +const Gthd = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Gthd diff --git a/src/components/Runners/Hfgh.tsx b/src/components/Runners/Hfgh.tsx new file mode 100644 index 000000000..b75d6bc6d --- /dev/null +++ b/src/components/Runners/Hfgh.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/hfgh.json' + +const Hfgh = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Hfgh diff --git a/src/components/Runners/Hyvj.tsx b/src/components/Runners/Hyvj.tsx new file mode 100644 index 000000000..73a1d8445 --- /dev/null +++ b/src/components/Runners/Hyvj.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/hyvj.json' + +const Hyvj = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Hyvj diff --git a/src/components/Runners/Itvv.tsx b/src/components/Runners/Itvv.tsx new file mode 100644 index 000000000..9ece647dd --- /dev/null +++ b/src/components/Runners/Itvv.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/itvv.json' + +const Itvv = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Itvv diff --git a/src/components/Runners/Iwxm.tsx b/src/components/Runners/Iwxm.tsx new file mode 100644 index 000000000..741198895 --- /dev/null +++ b/src/components/Runners/Iwxm.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/iwxm.json' + +const Iwxm = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Iwxm diff --git a/src/components/Runners/Kqtz.tsx b/src/components/Runners/Kqtz.tsx new file mode 100644 index 000000000..e9aeb4c18 --- /dev/null +++ b/src/components/Runners/Kqtz.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/kqtz.json' + +const Kqtz = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Kqtz diff --git a/src/components/Runners/Lngo.tsx b/src/components/Runners/Lngo.tsx new file mode 100644 index 000000000..b1ba43c1a --- /dev/null +++ b/src/components/Runners/Lngo.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/lngo.json' + +const Lngo = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Lngo diff --git a/src/components/Runners/Lxzn.tsx b/src/components/Runners/Lxzn.tsx new file mode 100644 index 000000000..3cf581e5c --- /dev/null +++ b/src/components/Runners/Lxzn.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/lxzn.json' + +const Lxzn = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Lxzn diff --git a/src/components/Runners/Nefh.tsx b/src/components/Runners/Nefh.tsx new file mode 100644 index 000000000..de402b20f --- /dev/null +++ b/src/components/Runners/Nefh.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/nefh.json' + +const Nefh = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Nefh diff --git a/src/components/Runners/Nsds.tsx b/src/components/Runners/Nsds.tsx new file mode 100644 index 000000000..fe4bfd4c7 --- /dev/null +++ b/src/components/Runners/Nsds.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/nsds.json' + +const Nsds = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Nsds diff --git a/src/components/Runners/Pebp.tsx b/src/components/Runners/Pebp.tsx new file mode 100644 index 000000000..37d14f9c2 --- /dev/null +++ b/src/components/Runners/Pebp.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/pebp.json' + +const Pebp = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Pebp diff --git a/src/components/Runners/Pjih.tsx b/src/components/Runners/Pjih.tsx new file mode 100644 index 000000000..96806f6f3 --- /dev/null +++ b/src/components/Runners/Pjih.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/pjih.json' + +const Pjih = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Pjih diff --git a/src/components/Runners/Qcme.tsx b/src/components/Runners/Qcme.tsx new file mode 100644 index 000000000..a1c3fc122 --- /dev/null +++ b/src/components/Runners/Qcme.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/qcme.json' + +const Qcme = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Qcme diff --git a/src/components/Runners/Qwtn.tsx b/src/components/Runners/Qwtn.tsx new file mode 100644 index 000000000..4ca031017 --- /dev/null +++ b/src/components/Runners/Qwtn.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/qwtn.json' + +const Qwtn = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Qwtn diff --git a/src/components/Runners/Qyhn.tsx b/src/components/Runners/Qyhn.tsx new file mode 100644 index 000000000..458234d55 --- /dev/null +++ b/src/components/Runners/Qyhn.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/qyhn.json' + +const Qyhn = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Qyhn diff --git a/src/components/Runners/Ujuq.tsx b/src/components/Runners/Ujuq.tsx new file mode 100644 index 000000000..c6f0c50d5 --- /dev/null +++ b/src/components/Runners/Ujuq.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/ujuq.json' + +const Ujuq = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Ujuq diff --git a/src/components/Runners/Ukzq.tsx b/src/components/Runners/Ukzq.tsx new file mode 100644 index 000000000..5cf0e97a5 --- /dev/null +++ b/src/components/Runners/Ukzq.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/ukzq.json' + +const Ukzq = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Ukzq diff --git a/src/components/Runners/Uxno.tsx b/src/components/Runners/Uxno.tsx new file mode 100644 index 000000000..688481b3b --- /dev/null +++ b/src/components/Runners/Uxno.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/uxno.json' + +const Uxno = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Uxno diff --git a/src/components/Runners/Xhje.tsx b/src/components/Runners/Xhje.tsx new file mode 100644 index 000000000..7664bcb04 --- /dev/null +++ b/src/components/Runners/Xhje.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/xhje.json' + +const Xhje = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Xhje diff --git a/src/components/Runners/Yfwq.tsx b/src/components/Runners/Yfwq.tsx new file mode 100644 index 000000000..a00316ec2 --- /dev/null +++ b/src/components/Runners/Yfwq.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/yfwq.json' + +const Yfwq = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Yfwq diff --git a/src/components/Runners/Zvpc.tsx b/src/components/Runners/Zvpc.tsx new file mode 100644 index 000000000..25ee9a581 --- /dev/null +++ b/src/components/Runners/Zvpc.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import ExpressionRunnerPrecomputed from 'src/components/ExpressionRunnerPrecomputed' +import config from 'src/lib/runners/zvpc.json' + +const Zvpc = ({ children }: { children?: React.ReactNode }) => ( + // @ts-ignore + + {children} + +) + +export default Zvpc diff --git a/src/components/Runners/fakeIndex.ts b/src/components/Runners/fakeIndex.ts index 35aa58b3c..21076f11e 100644 --- a/src/components/Runners/fakeIndex.ts +++ b/src/components/Runners/fakeIndex.ts @@ -2,6 +2,9 @@ export { default as Aaov } from 'src/components/FakeRunner' export { default as Qxob } from 'src/components/FakeRunner' export { default as Bcgp } from 'src/components/FakeRunner' export { default as Pbhg } from 'src/components/FakeRunner' +export { default as Itvv } from 'src/components/FakeRunner' +export { default as Nefh } from 'src/components/FakeRunner' +export { default as Qwtn } from 'src/components/FakeRunner' export { default as Wwtl } from 'src/components/FakeRunner' export { default as Vdhd } from 'src/components/FakeRunner' export { default as Ltpe } from 'src/components/FakeRunner' @@ -23,6 +26,8 @@ export { default as Mqvu } from 'src/components/FakeRunner' export { default as Bgfl } from 'src/components/FakeRunner' export { default as Cpkp } from 'src/components/FakeRunner' export { default as Cvtc } from 'src/components/FakeRunner' +export { default as Lxzn } from 'src/components/FakeRunner' +export { default as Ujuq } from 'src/components/FakeRunner' export { default as Oork } from 'src/components/FakeRunner' export { default as Diis } from 'src/components/FakeRunner' export { default as Dkiy } from 'src/components/FakeRunner' @@ -54,9 +59,12 @@ export { default as Uvmv } from 'src/components/FakeRunner' export { default as Mutg } from 'src/components/FakeRunner' export { default as Hvqh } from 'src/components/FakeRunner' export { default as Hdxc } from 'src/components/FakeRunner' +export { default as Xhje } from 'src/components/FakeRunner' +export { default as Hyvj } from 'src/components/FakeRunner' export { default as Hykj } from 'src/components/FakeRunner' export { default as Iatt } from 'src/components/FakeRunner' export { default as Ilpo } from 'src/components/FakeRunner' +export { default as Lngo } from 'src/components/FakeRunner' export { default as Elku } from 'src/components/FakeRunner' export { default as Vowa } from 'src/components/FakeRunner' export { default as Imyd } from 'src/components/FakeRunner' @@ -69,6 +77,7 @@ export { default as Jwzh } from 'src/components/FakeRunner' export { default as Keck } from 'src/components/FakeRunner' export { default as Knhw } from 'src/components/FakeRunner' export { default as Kvso } from 'src/components/FakeRunner' +export { default as Iwxm } from 'src/components/FakeRunner' export { default as Sgnp } from 'src/components/FakeRunner' export { default as Beiz } from 'src/components/FakeRunner' export { default as Laea } from 'src/components/FakeRunner' @@ -91,10 +100,20 @@ export { default as Rqjo } from 'src/components/FakeRunner' export { default as Sgfj } from 'src/components/FakeRunner' export { default as Hehx } from 'src/components/FakeRunner' export { default as Jarm } from 'src/components/FakeRunner' +export { default as Pjih } from 'src/components/FakeRunner' +export { default as Kqtz } from 'src/components/FakeRunner' +export { default as Afxj } from 'src/components/FakeRunner' +export { default as Egka } from 'src/components/FakeRunner' +export { default as Uxno } from 'src/components/FakeRunner' +export { default as Dvio } from 'src/components/FakeRunner' +export { default as Qyhn } from 'src/components/FakeRunner' +export { default as Hfgh } from 'src/components/FakeRunner' +export { default as Yfwq } from 'src/components/FakeRunner' export { default as Jjjh } from 'src/components/FakeRunner' export { default as Dwzy } from 'src/components/FakeRunner' export { default as Mifg } from 'src/components/FakeRunner' export { default as Epoi } from 'src/components/FakeRunner' +export { default as Fgen } from 'src/components/FakeRunner' export { default as Nlyu } from 'src/components/FakeRunner' export { default as Jyqf } from 'src/components/FakeRunner' export { default as Mzqc } from 'src/components/FakeRunner' @@ -111,6 +130,7 @@ export { default as Jwah } from 'src/components/FakeRunner' export { default as Nbck } from 'src/components/FakeRunner' export { default as Cawl } from 'src/components/FakeRunner' export { default as Vlob } from 'src/components/FakeRunner' +export { default as Pebp } from 'src/components/FakeRunner' export { default as Dubm } from 'src/components/FakeRunner' export { default as Rnug } from 'src/components/FakeRunner' export { default as Jzwg } from 'src/components/FakeRunner' @@ -230,6 +250,13 @@ export { default as Niwv } from 'src/components/FakeRunner' export { default as Fsgq } from 'src/components/FakeRunner' export { default as Gvxz } from 'src/components/FakeRunner' export { default as Xqjd } from 'src/components/FakeRunner' +export { default as Qcme } from 'src/components/FakeRunner' +export { default as Gthd } from 'src/components/FakeRunner' +export { default as Gogn } from 'src/components/FakeRunner' +export { default as Zvpc } from 'src/components/FakeRunner' +export { default as Nsds } from 'src/components/FakeRunner' +export { default as Bjny } from 'src/components/FakeRunner' +export { default as Ukzq } from 'src/components/FakeRunner' export { default as Cldb } from 'src/components/FakeRunner' export { default as Sldg } from 'src/components/FakeRunner' export { default as Dtle } from 'src/components/FakeRunner' @@ -341,12 +368,12 @@ export { default as Ugvz } from 'src/components/FakeRunner' export { default as Xkcm } from 'src/components/FakeRunner' export { default as Edzu } from 'src/components/FakeRunner' export { default as Mlnt } from 'src/components/FakeRunner' -export { default as Ochk } from 'src/components/FakeRunner' export { default as Ryqp } from 'src/components/FakeRunner' export { default as Vqyl } from 'src/components/FakeRunner' export { default as Yiet } from 'src/components/FakeRunner' export { default as Wzqv } from 'src/components/FakeRunner' export { default as Nvdn } from 'src/components/FakeRunner' +export { default as Fvii } from 'src/components/FakeRunner' export { default as Uhqo } from 'src/components/FakeRunner' export { default as Kzkg } from 'src/components/FakeRunner' export { default as Trwj } from 'src/components/FakeRunner' diff --git a/src/components/Runners/index.ts b/src/components/Runners/index.ts index 68eff993f..3bdd43770 100644 --- a/src/components/Runners/index.ts +++ b/src/components/Runners/index.ts @@ -2,6 +2,9 @@ export { default as Aaov } from 'src/components/Runners/Aaov' export { default as Qxob } from 'src/components/Runners/Qxob' export { default as Bcgp } from 'src/components/Runners/Bcgp' export { default as Pbhg } from 'src/components/Runners/Pbhg' +export { default as Itvv } from 'src/components/Runners/Itvv' +export { default as Nefh } from 'src/components/Runners/Nefh' +export { default as Qwtn } from 'src/components/Runners/Qwtn' export { default as Wwtl } from 'src/components/Runners/Wwtl' export { default as Vdhd } from 'src/components/Runners/Vdhd' export { default as Ltpe } from 'src/components/Runners/Ltpe' @@ -23,6 +26,8 @@ export { default as Mqvu } from 'src/components/Runners/Mqvu' export { default as Bgfl } from 'src/components/Runners/Bgfl' export { default as Cpkp } from 'src/components/Runners/Cpkp' export { default as Cvtc } from 'src/components/Runners/Cvtc' +export { default as Lxzn } from 'src/components/Runners/Lxzn' +export { default as Ujuq } from 'src/components/Runners/Ujuq' export { default as Oork } from 'src/components/Runners/Oork' export { default as Diis } from 'src/components/Runners/Diis' export { default as Dkiy } from 'src/components/Runners/Dkiy' @@ -54,9 +59,12 @@ export { default as Uvmv } from 'src/components/Runners/Uvmv' export { default as Mutg } from 'src/components/Runners/Mutg' export { default as Hvqh } from 'src/components/Runners/Hvqh' export { default as Hdxc } from 'src/components/Runners/Hdxc' +export { default as Xhje } from 'src/components/Runners/Xhje' +export { default as Hyvj } from 'src/components/Runners/Hyvj' export { default as Hykj } from 'src/components/Runners/Hykj' export { default as Iatt } from 'src/components/Runners/Iatt' export { default as Ilpo } from 'src/components/Runners/Ilpo' +export { default as Lngo } from 'src/components/Runners/Lngo' export { default as Elku } from 'src/components/Runners/Elku' export { default as Vowa } from 'src/components/Runners/Vowa' export { default as Imyd } from 'src/components/Runners/Imyd' @@ -69,6 +77,7 @@ export { default as Jwzh } from 'src/components/Runners/Jwzh' export { default as Keck } from 'src/components/Runners/Keck' export { default as Knhw } from 'src/components/Runners/Knhw' export { default as Kvso } from 'src/components/Runners/Kvso' +export { default as Iwxm } from 'src/components/Runners/Iwxm' export { default as Sgnp } from 'src/components/Runners/Sgnp' export { default as Beiz } from 'src/components/Runners/Beiz' export { default as Laea } from 'src/components/Runners/Laea' @@ -91,10 +100,20 @@ export { default as Rqjo } from 'src/components/Runners/Rqjo' export { default as Sgfj } from 'src/components/Runners/Sgfj' export { default as Hehx } from 'src/components/Runners/Hehx' export { default as Jarm } from 'src/components/Runners/Jarm' +export { default as Pjih } from 'src/components/Runners/Pjih' +export { default as Kqtz } from 'src/components/Runners/Kqtz' +export { default as Afxj } from 'src/components/Runners/Afxj' +export { default as Egka } from 'src/components/Runners/Egka' +export { default as Uxno } from 'src/components/Runners/Uxno' +export { default as Dvio } from 'src/components/Runners/Dvio' +export { default as Qyhn } from 'src/components/Runners/Qyhn' +export { default as Hfgh } from 'src/components/Runners/Hfgh' +export { default as Yfwq } from 'src/components/Runners/Yfwq' export { default as Jjjh } from 'src/components/Runners/Jjjh' export { default as Dwzy } from 'src/components/Runners/Dwzy' export { default as Mifg } from 'src/components/Runners/Mifg' export { default as Epoi } from 'src/components/Runners/Epoi' +export { default as Fgen } from 'src/components/Runners/Fgen' export { default as Nlyu } from 'src/components/Runners/Nlyu' export { default as Jyqf } from 'src/components/Runners/Jyqf' export { default as Mzqc } from 'src/components/Runners/Mzqc' @@ -111,6 +130,7 @@ export { default as Jwah } from 'src/components/Runners/Jwah' export { default as Nbck } from 'src/components/Runners/Nbck' export { default as Cawl } from 'src/components/Runners/Cawl' export { default as Vlob } from 'src/components/Runners/Vlob' +export { default as Pebp } from 'src/components/Runners/Pebp' export { default as Dubm } from 'src/components/Runners/Dubm' export { default as Rnug } from 'src/components/Runners/Rnug' export { default as Jzwg } from 'src/components/Runners/Jzwg' @@ -230,6 +250,13 @@ export { default as Niwv } from 'src/components/Runners/Niwv' export { default as Fsgq } from 'src/components/Runners/Fsgq' export { default as Gvxz } from 'src/components/Runners/Gvxz' export { default as Xqjd } from 'src/components/Runners/Xqjd' +export { default as Qcme } from 'src/components/Runners/Qcme' +export { default as Gthd } from 'src/components/Runners/Gthd' +export { default as Gogn } from 'src/components/Runners/Gogn' +export { default as Zvpc } from 'src/components/Runners/Zvpc' +export { default as Nsds } from 'src/components/Runners/Nsds' +export { default as Bjny } from 'src/components/Runners/Bjny' +export { default as Ukzq } from 'src/components/Runners/Ukzq' export { default as Cldb } from 'src/components/Runners/Cldb' export { default as Sldg } from 'src/components/Runners/Sldg' export { default as Dtle } from 'src/components/Runners/Dtle' @@ -341,12 +368,12 @@ export { default as Ugvz } from 'src/components/Runners/Ugvz' export { default as Xkcm } from 'src/components/Runners/Xkcm' export { default as Edzu } from 'src/components/Runners/Edzu' export { default as Mlnt } from 'src/components/Runners/Mlnt' -export { default as Ochk } from 'src/components/Runners/Ochk' export { default as Ryqp } from 'src/components/Runners/Ryqp' export { default as Vqyl } from 'src/components/Runners/Vqyl' export { default as Yiet } from 'src/components/Runners/Yiet' export { default as Wzqv } from 'src/components/Runners/Wzqv' export { default as Nvdn } from 'src/components/Runners/Nvdn' +export { default as Fvii } from 'src/components/Runners/Fvii' export { default as Uhqo } from 'src/components/Runners/Uhqo' export { default as Kzkg } from 'src/components/Runners/Kzkg' export { default as Trwj } from 'src/components/Runners/Trwj' diff --git a/src/components/VariableExpressionBox.tsx b/src/components/VariableExpressionBox.tsx index 4e34e27f0..6f72a42c1 100644 --- a/src/components/VariableExpressionBox.tsx +++ b/src/components/VariableExpressionBox.tsx @@ -18,6 +18,7 @@ import { ExpressionRunnerContextProps } from 'src/types/ExpressionRunnerTypes' import CustomEmoji, { customEmojiToComponent } from 'src/components/CustomEmoji' import locale from 'src/lib/locale' import VariableShadeContext from 'src/components/VariableShadeContext' +import ExpressionRunnerConfigContext from './ExpressionRunnerConfigContext' interface VariableExpressionBoxProps { expression: VariableExpression @@ -48,10 +49,12 @@ export const variableExpressionBoxFontSize = ( }[size]) const VariableEmoji = ({ expression }: VariableExpressionBoxProps) => { - const { variableSize } = useContext(ExpressionRunnerContext) - const { hideBottomRightBadges, bottomRightBadgeOverrides } = useContext( - ExpressionRunnerContext - ) + const { + hideBottomRightBadges, + bottomRightBadgeOverrides, + variableSize + } = useContext(ExpressionRunnerContext) + const { churchNumerals } = useContext(ExpressionRunnerConfigContext) if (expression.shorthandNumberAfterConvert) { return ( @@ -72,7 +75,8 @@ const VariableEmoji = ({ expression }: VariableExpressionBoxProps) => { > @@ -401,13 +405,16 @@ const VariableEmoji = ({ expression }: VariableExpressionBoxProps) => { } const VariableExpressionBox = ({ expression }: VariableExpressionBoxProps) => { - const { hidePriorities, variableSize } = useContext(ExpressionRunnerContext) + const { hidePriorities, variableSize, highlightOverrides } = useContext( + ExpressionRunnerContext + ) const { conditionalState } = useContext(ConditionalContext) const { binaryState } = useContext(BinaryContext) const { shadeNonNumbers, shadeNonHighlightedFunc, - shadeNonFactorial + shadeNonFactorial, + shadeNonHighlighted } = useContext(VariableShadeContext) return ( @@ -423,7 +430,9 @@ const VariableExpressionBox = ({ expression }: VariableExpressionBoxProps) => { expression.shorthandNumber !== 3 && expression.shorthandNumber !== 4 && expression.shorthandNumber !== 5 && - expression.name !== 'blankNumber')) && ( + expression.name !== 'blankNumber') || + (shadeNonHighlighted && + highlightOverrides[expression.name] !== 'highlighted')) && ( ( solving puzzles—no coding required - . Here’s a quick demo. I’ll explain how this puzzle works on the - next page, but for now,{' '} + . Here’s a quick demo. I’ll explain how this puzzle works later, + but for now,{' '} try pressing and see what happens:

- + You’ll see puzzles like this:
Try pressing . - + ) }, diff --git a/src/contents/1.en.tsx b/src/contents/1.en.tsx index 08f8e62fc..008f68f09 100644 --- a/src/contents/1.en.tsx +++ b/src/contents/1.en.tsx @@ -127,7 +127,7 @@ export default () => ( button . If you press it, the mathbox calculates the result.{' '} - on the + on the mathbox below.

@@ -139,7 +139,7 @@ export default () => (

Let’s look at other mathboxes.{' '} - on this one: + on this one:

@@ -234,7 +234,7 @@ export default () => ( <>

Mathboxes can also subtract 1 from a number.{' '} - below: + below:

@@ -325,7 +325,7 @@ export default () => (

Here’s an example.{' '} - : + :

diff --git a/src/contents/1.jp.tsx b/src/contents/1.jp.tsx index 367f1b887..583f13c3c 100644 --- a/src/contents/1.jp.tsx +++ b/src/contents/1.jp.tsx @@ -139,7 +139,7 @@ export default () => ( がついており、それを押すと計算が実行されます。試しに、下の計算箱で - +

@@ -155,7 +155,7 @@ export default () => (

他の計算箱も見てみましょう！たとえばこちらをご覧になり、 - +

@@ -364,7 +364,7 @@ export default () => (

こちらに {' '} を2回使った計算箱を用意したので、実際に試してみましょう。 - +

diff --git a/src/contents/11.en.tsx b/src/contents/11.en.tsx index cb5a2639e..920784baa 100644 --- a/src/contents/11.en.tsx +++ b/src/contents/11.en.tsx @@ -174,8 +174,8 @@ export default () => ( } />

- Take a look at this mathbox and - : + Take a look at this mathbox and{' '} + :

@@ -512,7 +512,13 @@ export default () => ( mathbox and see what happens.

- . + + .

) @@ -735,7 +741,13 @@ export default () => ( .

- : + + :

) diff --git a/src/contents/11.jp.tsx b/src/contents/11.jp.tsx index 4a12772d9..86dcad557 100644 --- a/src/contents/11.jp.tsx +++ b/src/contents/11.jp.tsx @@ -157,7 +157,7 @@ export default () => ( />

まず、こちらの計算箱をご覧になり、 - +

@@ -483,7 +483,7 @@ export default () => ( にそれぞれどんな効果があるか説明する前に、この計算箱を実行してみましょう。

- +

) @@ -698,7 +698,7 @@ export default () => ( になります。

- +

) diff --git a/src/contents/15.en.tsx b/src/contents/15.en.tsx index c04eb3bb1..4f99ace2c 100644 --- a/src/contents/15.en.tsx +++ b/src/contents/15.en.tsx @@ -1207,10 +1207,10 @@ export default () => ( } ]} /> - + A lunchbox that calculates {' '} ✖️ - + ( } ]} /> - + ✖️{' '} を計算できる弁当箱 - + ( <>

- . : + . :

@@ -416,7 +416,7 @@ export default () => ( ➖{' '} and the result is{' '} .{' '} - : + :

@@ -445,7 +445,7 @@ export default () => ( ’s . Take a look at this mathbox, and{' '} - : + :

diff --git a/src/contents/2.jp.tsx b/src/contents/2.jp.tsx index 6bb687764..c957f4f2a 100644 --- a/src/contents/2.jp.tsx +++ b/src/contents/2.jp.tsx @@ -184,7 +184,7 @@ export default () => ( <>

- +

@@ -407,7 +407,7 @@ export default () => ( ということは ➖{' '} を計算してくれるので、結果は{' '} になります。 - +

@@ -436,7 +436,7 @@ export default () => ( を繰り返すこともできます。 こちらの計算箱をご覧になり、 - +

diff --git a/src/contents/3.en.tsx b/src/contents/3.en.tsx index 750610036..b9978e902 100644 --- a/src/contents/3.en.tsx +++ b/src/contents/3.en.tsx @@ -22,6 +22,8 @@ import H from 'src/components/H' import BubbleQuotes from 'src/components/BubbleQuotes' import * as R from 'src/components/Runners' import NextLessonButton from 'src/components/NextLessonButton' +import VariableShadeContext from 'src/components/VariableShadeContext' +import ExpressionRunnerConfigContext from 'src/components/ExpressionRunnerConfigContext' export default () => ( ( Explanation: In this example, the top section has a{' '} :

- - The top section has a - + + + The top section has a + +

And each of the bottom two sections has{' '} , a traditional Japanese food:

- - Each of the bottom two sections has - + + + Each of the bottom two sections has + + ( We can {' '} , just like how we can run a mathbox.{' '} - below: -

- + {' '} + below: +

+ + + ( This one has on the top row and a{' '} and on the bottom row.{' '} - : + :

@@ -652,7 +671,7 @@ export default () => ( This one has and{' '} on the top row and two slices of{' '} on the bottom row.{' '} - : + :

@@ -665,7 +684,7 @@ export default () => ( on the top row and{' '} and a on the bottom row.{' '} - : + :

diff --git a/src/contents/3.jp.tsx b/src/contents/3.jp.tsx index 090d333bd..9b8114b28 100644 --- a/src/contents/3.jp.tsx +++ b/src/contents/3.jp.tsx @@ -19,6 +19,8 @@ import H from 'src/components/H' import BubbleQuotes from 'src/components/BubbleQuotes' import * as R from 'src/components/Runners' import NextLessonButton from 'src/components/NextLessonButton' +import ExpressionRunnerConfigContext from 'src/components/ExpressionRunnerConfigContext' +import VariableShadeContext from 'src/components/VariableShadeContext' export default () => ( ( が入っており、

- - 上段には - - + + + 上段には + + +

下段には がふたつ入っています。

- - 下段には - - + + + 下段には + + + ( 試しに、 - +

- + + + ( と が入っています。 - +

@@ -562,7 +580,7 @@ export default () => ( が、下段には がふたつ入っています。 - +

@@ -578,7 +596,7 @@ export default () => ( と が入っています。 - +

diff --git a/src/contents/4.en.tsx b/src/contents/4.en.tsx index 7e8357145..4eea215f4 100644 --- a/src/contents/4.en.tsx +++ b/src/contents/4.en.tsx @@ -24,6 +24,51 @@ import ExpressionRunnerSeparator from 'src/components/ExpressionRunnerSeparator' import H from 'src/components/H' import NextLessonButton from 'src/components/NextLessonButton' +export const StepOne = ({ + includeFuncUnbound +}: { + includeFuncUnbound?: boolean +}) => ( + <> + Label:{' '} + {' '} + {' '} + {includeFuncUnbound && ( + <> + {' '} + + )} + + +) + +export const StepTwo = () => ( + <> + Match:{' '} + {' '} + {' '} + ✅ + +) + +export const StepThree = () => ( + <> + Copy:{' '} + ↘️{' '} + + + + +) + +export const StepFour = () => ( + <> + Remove: 💥{' '} + {' '} + + +) + export const BasicRules = ({ includeFuncUnbound }: { @@ -31,64 +76,28 @@ export const BasicRules = ({ }) => ( <>

- 1. Label:{' '} - {' '} - {' '} - {includeFuncUnbound && ( - <> - {' '} - - )} - + 1.

- Label:{' '} - {' '} - {' '} - {includeFuncUnbound && ( - <> - {' '} - - )} - +

- 2. Match:{' '} - {' '} - {' '} - ✅ + 2.

- Match:{' '} - {' '} - {' '} - ✅ +

- 3. Copy:{' '} - {' '} - ↘️{' '} - - - + 3.

- Copy:{' '} - {' '} - ↘️{' '} - - - +

- 4. Remove: 💥{' '} - {' '} - + 4.

- Remove: 💥{' '} - {' '} - + @@ -125,10 +134,10 @@ export const Unmatched = () => ( ) -export const InstructionTwo = () => ( +export const InstructionTwo = ({ lowerCase }: { lowerCase?: boolean }) => ( <> - We check to see if some of{' '} + {lowerCase ? 'w' : 'W'}e check to see if some of{' '} ’s and ’s match.{' '} @@ -139,10 +148,10 @@ export const InstructionTwo = () => ( ) -export const InstructionThree = () => ( +export const InstructionThree = ({ lowerCase }: { lowerCase?: boolean }) => ( <> - We copy{' '} + {lowerCase ? 'w' : 'W'}e copy{' '} ’s to where the matched{' '} @@ -151,10 +160,10 @@ export const InstructionThree = () => ( ) -export const InstructionFour = () => ( +export const InstructionFour = ({ lowerCase }: { lowerCase?: boolean }) => ( <> - We remove{' '} + {lowerCase ? 'w' : 'W'}e remove{' '} ’s and ’s. @@ -963,7 +972,8 @@ export default () => ( We’ll be using the button with the{' '} “Show every step” functionality - , which automatically goes through each step. + , which automatically shows every step that happens between the + beginning and the end.

If you use this button… diff --git a/src/contents/5.en.tsx b/src/contents/5.en.tsx index 76da27cae..15dcbeb72 100644 --- a/src/contents/5.en.tsx +++ b/src/contents/5.en.tsx @@ -422,8 +422,8 @@ export default () => ( Focus on{' '} - the bottom 2 rows, which correspond - to the pair of{' '} + the bottom two rows, which + correspond to the pair of{' '} 1 @@ -444,7 +444,7 @@ export default () => ( ]} /> - Focus on the bottom 2 rows, and + Focus on the bottom two rows, and
Ignore the top row for now diff --git a/src/contents/6.en.tsx b/src/contents/6.en.tsx index ea379c70c..6cf72637d 100644 --- a/src/contents/6.en.tsx +++ b/src/contents/6.en.tsx @@ -703,7 +703,7 @@ export default () => ( children: ( <>

- Next, there’s a in the + Next, there’s in the middle, so we label all{' '} as{' '} 🅱️. diff --git a/src/lib/date.tsx b/src/lib/date.ts similarity index 100% rename from src/lib/date.tsx rename to src/lib/date.ts diff --git a/src/lib/meta.ts b/src/lib/meta.ts index 5c448f4c2..421987cf6 100644 --- a/src/lib/meta.ts +++ b/src/lib/meta.ts @@ -12,4 +12,4 @@ export const ogImageUrl = : `${baseUrl}/static/images/og-image-jp-v5.png` export const ogUrl = (episodeNumber: number) => - `${baseUrl}${episodeNumber > 0 ? `/${episodeNumber}/` : ''}` + `${baseUrl}${episodeNumber > 0 ? `/${episodeNumber}` : ''}` diff --git a/src/lib/runners/afxj.json b/src/lib/runners/afxj.json new file mode 100644 index 000000000..adf1a28e9 --- /dev/null +++ b/src/lib/runners/afxj.json @@ -0,0 +1,2644 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 5, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "active", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 5 + }, + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "showFuncUnbound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "showFuncUnbound", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 5 + }, + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": true, + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 5 + }, + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "type": "function", + "maxNestedFunctionDepth": 5 + }, + "state": "betaReducePreviewAfter", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 5 + }, + "previouslyChangedExpressionState": "betaReducePreviewAfter", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 5 + }, + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "type": "function", + "maxNestedFunctionDepth": 5 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 5 + }, + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 5 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "ready", + "numLeafNodes": 4 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "previouslyChangedExpressionState": "active", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 4 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "showFuncUnbound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "previouslyChangedExpressionState": "showFuncUnbound", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 4 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": false, + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 4 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 4 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "ready", + "numLeafNodes": 3 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "active", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 3 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "showFuncBound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "showFuncBound", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 3 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": true, + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 3 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewAfter", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "betaReducePreviewAfter", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 3 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 3 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "done", + "numLeafNodes": 2 + } + ], + "speed": 1.25, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": true, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/ancc.json b/src/lib/runners/ancc.json index ab4c4111c..dd89fb782 100644 --- a/src/lib/runners/ancc.json +++ b/src/lib/runners/ancc.json @@ -14,8 +14,8 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 2, - 1 + 1, + 2 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -80,8 +80,8 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 2, - 1 + 1, + 2 ], "funcPriorityAgg": [], "emphasizePriority": false, diff --git a/src/lib/runners/bjny.json b/src/lib/runners/bjny.json new file mode 100644 index 000000000..cc0d5b242 --- /dev/null +++ b/src/lib/runners/bjny.json @@ -0,0 +1,73 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "numLeafNodes": 2, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": true, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/dvio.json b/src/lib/runners/dvio.json new file mode 100644 index 000000000..303b62571 --- /dev/null +++ b/src/lib/runners/dvio.json @@ -0,0 +1,129 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 2, + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 1, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": true, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "convert": "toMathBox", + "showBottomProgressBar": false +} diff --git a/src/lib/runners/egka.json b/src/lib/runners/egka.json new file mode 100644 index 000000000..69eb8fccc --- /dev/null +++ b/src/lib/runners/egka.json @@ -0,0 +1,3251 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 6, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "active", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 6 + }, + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "showFuncUnbound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "showFuncUnbound", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 6 + }, + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": true, + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 6 + }, + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "type": "function", + "maxNestedFunctionDepth": 5 + }, + "state": "betaReducePreviewAfter", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 5 + }, + "previouslyChangedExpressionState": "betaReducePreviewAfter", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 7 + }, + { + "expression": { + "arg": { + "arg": { + "name": "d", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "type": "function", + "maxNestedFunctionDepth": 5 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 5 + }, + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 7 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "ready", + "numLeafNodes": 5 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "previouslyChangedExpressionState": "active", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 5 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "showFuncUnbound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "previouslyChangedExpressionState": "showFuncUnbound", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 5 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": true, + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 5 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewAfter", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "previouslyChangedExpressionState": "betaReducePreviewAfter", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 5 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "d", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "type": "function", + "maxNestedFunctionDepth": 4 + }, + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 5 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "ready", + "numLeafNodes": 4 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "active", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 4 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "showFuncBound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "showFuncBound", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 4 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": true, + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 4 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewAfter", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "betaReducePreviewAfter", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 4 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "h", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 4 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "done", + "numLeafNodes": 3 + } + ], + "speed": 1.25, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": true, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/fgen.json b/src/lib/runners/fgen.json new file mode 100644 index 000000000..ada838969 --- /dev/null +++ b/src/lib/runners/fgen.json @@ -0,0 +1,129 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 2, + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 1, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": true, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "convert": "toMathBox", + "showBottomProgressBar": false +} diff --git a/src/lib/runners/ochk.json b/src/lib/runners/fvii.json similarity index 81% rename from src/lib/runners/ochk.json rename to src/lib/runners/fvii.json index 6c94d5d64..8209e25bd 100644 --- a/src/lib/runners/ochk.json +++ b/src/lib/runners/fvii.json @@ -92,22 +92,21 @@ }, "body": { "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { "arg": { - "name": "d", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 2, - 4 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, - "maxNestedFunctionDepth": 0 - }, - "func": { "arg": { "name": "c", "highlightType": "default", @@ -115,7 +114,8 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 3 + 1, + 2 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -130,8 +130,7 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 3, - 4 + 2 ], "emphasizePriority": false, "bound": true, @@ -139,27 +138,7 @@ }, "state": "default", "type": "call", - "priority": 3, - "maxNestedFunctionDepth": 0 - }, - "state": "default", - "type": "call", - "priority": 4, - "maxNestedFunctionDepth": 0 - }, - "func": { - "arg": { - "name": "c", - "highlightType": "default", - "topLeftBadgeType": "none", - "bottomRightBadgeType": "none", - "type": "variable", - "argPriorityAgg": [ - 1 - ], - "funcPriorityAgg": [], - "emphasizePriority": false, - "bound": true, + "priority": 2, "maxNestedFunctionDepth": 0 }, "func": { @@ -171,7 +150,7 @@ "argPriorityAgg": [], "funcPriorityAgg": [ 1, - 2 + 3 ], "emphasizePriority": false, "bound": true, @@ -184,7 +163,7 @@ }, "state": "default", "type": "call", - "priority": 2, + "priority": 3, "maxNestedFunctionDepth": 0 }, "type": "function", @@ -209,7 +188,7 @@ "priority": 2, "maxNestedFunctionDepth": 4 }, - "numLeafNodes": 9, + "numLeafNodes": 8, "containerState": "ready", "previouslyChangedExpressionState": "default" } diff --git a/src/lib/runners/gogn.json b/src/lib/runners/gogn.json new file mode 100644 index 000000000..6e14e0819 --- /dev/null +++ b/src/lib/runners/gogn.json @@ -0,0 +1,74 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "showFuncBound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "showFuncBound", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": true, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/gthd.json b/src/lib/runners/gthd.json new file mode 100644 index 000000000..1652de5ff --- /dev/null +++ b/src/lib/runners/gthd.json @@ -0,0 +1,316 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "numLeafNodes": 2, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "active", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "showFuncBound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "showFuncBound", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": false, + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "b", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "done", + "numLeafNodes": 1 + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": true, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": true, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/hfgh.json b/src/lib/runners/hfgh.json new file mode 100644 index 000000000..289df6f87 --- /dev/null +++ b/src/lib/runners/hfgh.json @@ -0,0 +1,86 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 1, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 0, + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 1, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": true, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "convert": "toMathBox", + "showBottomProgressBar": false +} diff --git a/src/lib/runners/hyvj.json b/src/lib/runners/hyvj.json new file mode 100644 index 000000000..3431077b3 --- /dev/null +++ b/src/lib/runners/hyvj.json @@ -0,0 +1,1067 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "arg": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "active", + "activePriority": 1 + }, + { + "expression": { + "arg": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "showFuncBound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "showFuncBound", + "activePriority": 1 + }, + { + "expression": { + "arg": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "g", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "g", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": true, + "activePriority": 1 + }, + { + "expression": { + "arg": { + "arg": { + "name": "h", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewAfter", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "betaReducePreviewAfter", + "activePriority": 1 + }, + { + "expression": { + "arg": { + "arg": { + "name": "h", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1, + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "g", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 2, + "containerState": "ready", + "previouslyChangedExpressionState": "default", + "activePriority": 1 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "previouslyChangedExpressionState": "active", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "showFuncUnbound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "previouslyChangedExpressionState": "showFuncUnbound", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": false, + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "done", + "numLeafNodes": 1 + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": true, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/itvv.json b/src/lib/runners/itvv.json new file mode 100644 index 000000000..b5015f367 --- /dev/null +++ b/src/lib/runners/itvv.json @@ -0,0 +1,112 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "c", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "a", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": true, + "activePriority": 1 + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "visible", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/iwxm.json b/src/lib/runners/iwxm.json new file mode 100644 index 000000000..265f99298 --- /dev/null +++ b/src/lib/runners/iwxm.json @@ -0,0 +1,261 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "c", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "active", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "c", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "showFuncBound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "showFuncBound", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "d", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "c", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": false, + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "d", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "c", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "done", + "numLeafNodes": 1 + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": true, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/kmgw.json b/src/lib/runners/kmgw.json index 030d2f2cd..2736dfd92 100644 --- a/src/lib/runners/kmgw.json +++ b/src/lib/runners/kmgw.json @@ -112,9 +112,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, diff --git a/src/lib/runners/kqtz.json b/src/lib/runners/kqtz.json new file mode 100644 index 000000000..45a1a2d98 --- /dev/null +++ b/src/lib/runners/kqtz.json @@ -0,0 +1,171 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 1, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 6, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/lngo.json b/src/lib/runners/lngo.json new file mode 100644 index 000000000..6868e95ea --- /dev/null +++ b/src/lib/runners/lngo.json @@ -0,0 +1,36 @@ +{ + "expressionContainers": [ + { + "expression": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "done", + "numLeafNodes": 1 + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": true, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/lxzn.json b/src/lib/runners/lxzn.json new file mode 100644 index 000000000..9dd0f0431 --- /dev/null +++ b/src/lib/runners/lxzn.json @@ -0,0 +1,113 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": { + "a": "highlighted", + "b": "highlighted" + }, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/nefh.json b/src/lib/runners/nefh.json new file mode 100644 index 000000000..02afa3cb2 --- /dev/null +++ b/src/lib/runners/nefh.json @@ -0,0 +1,111 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "c", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "c", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewAfter", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "betaReducePreviewAfter", + "activePriority": 1 + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "visible", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/nsds.json b/src/lib/runners/nsds.json new file mode 100644 index 000000000..0af4bbe16 --- /dev/null +++ b/src/lib/runners/nsds.json @@ -0,0 +1,74 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "b", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": true, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/olqy.json b/src/lib/runners/olqy.json index f6df81394..0ab8ad7ef 100644 --- a/src/lib/runners/olqy.json +++ b/src/lib/runners/olqy.json @@ -112,9 +112,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, diff --git a/src/lib/runners/pebp.json b/src/lib/runners/pebp.json new file mode 100644 index 000000000..86ed84d1d --- /dev/null +++ b/src/lib/runners/pebp.json @@ -0,0 +1,150 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1, + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 4, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 3, + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 1, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": true, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "convert": "toMathBox", + "showBottomProgressBar": false +} diff --git a/src/lib/runners/pjih.json b/src/lib/runners/pjih.json new file mode 100644 index 000000000..f6c2450d0 --- /dev/null +++ b/src/lib/runners/pjih.json @@ -0,0 +1,171 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 0, + "shorthandNumberAfterConvert": "number", + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 6, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/qcme.json b/src/lib/runners/qcme.json new file mode 100644 index 000000000..0bf2ed8da --- /dev/null +++ b/src/lib/runners/qcme.json @@ -0,0 +1,91 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "numLeafNodes": 2, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "done", + "numLeafNodes": 1 + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": true, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": true, + "hideFuncUnboundBadgeOnExplanation": true, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/qurt.json b/src/lib/runners/qurt.json index e53e1b804..76b9e4f81 100644 --- a/src/lib/runners/qurt.json +++ b/src/lib/runners/qurt.json @@ -14,8 +14,8 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 2, - 1 + 1, + 2 ], "funcPriorityAgg": [], "emphasizePriority": false, diff --git a/src/lib/runners/qwtn.json b/src/lib/runners/qwtn.json new file mode 100644 index 000000000..e6bb2f8a0 --- /dev/null +++ b/src/lib/runners/qwtn.json @@ -0,0 +1,111 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "c", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "c", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1 + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "visible", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/qyhn.json b/src/lib/runners/qyhn.json new file mode 100644 index 000000000..80b629fab --- /dev/null +++ b/src/lib/runners/qyhn.json @@ -0,0 +1,147 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2, + 3 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 3 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 3, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "type": "function", + "maxNestedFunctionDepth": 3 + }, + "numLeafNodes": 4, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/rrmc.json b/src/lib/runners/rrmc.json index 0d804d04a..ae5a1f4f6 100644 --- a/src/lib/runners/rrmc.json +++ b/src/lib/runners/rrmc.json @@ -113,9 +113,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -486,9 +486,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -911,9 +911,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -1141,9 +1141,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -1403,9 +1403,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -1633,9 +1633,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -1897,9 +1897,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -2126,9 +2126,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -2310,9 +2310,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -2566,9 +2566,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -2795,9 +2795,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -2979,9 +2979,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -3168,9 +3168,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -3344,9 +3344,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -3574,9 +3574,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -3800,9 +3800,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -3976,9 +3976,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -4206,9 +4206,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -4402,9 +4402,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -4579,9 +4579,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -4809,9 +4809,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -4998,9 +4998,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -5175,9 +5175,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -5405,9 +5405,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -5571,9 +5571,9 @@ "type": "variable", "argPriorityAgg": [ 1, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -5748,9 +5748,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -5978,9 +5978,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -6144,9 +6144,9 @@ "type": "variable", "argPriorityAgg": [ 1, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -6321,9 +6321,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -6551,9 +6551,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -6684,9 +6684,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 4, 2, - 3 + 3, + 4 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -6861,9 +6861,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7091,9 +7091,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7221,9 +7221,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 4, 2, - 3 + 3, + 4 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7398,9 +7398,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7628,9 +7628,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7758,9 +7758,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7937,9 +7937,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -8166,9 +8166,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -8350,9 +8350,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -8472,9 +8472,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -8651,9 +8651,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -8880,9 +8880,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9064,9 +9064,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9186,9 +9186,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 3, 1, - 2 + 2, + 3 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9298,9 +9298,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9474,9 +9474,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9704,9 +9704,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9863,9 +9863,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 3, 1, - 2 + 2, + 3 ], "funcPriorityAgg": [], "emphasizePriority": true, @@ -9975,9 +9975,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -10151,9 +10151,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -10381,9 +10381,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -10621,12 +10621,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 10, 3, - 8, 5, 6, - 7 + 7, + 8, + 10 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -10821,9 +10821,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -11051,9 +11051,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -11168,8 +11168,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -11306,12 +11306,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 10, 3, - 8, 5, 6, - 7 + 7, + 8, + 10 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -11506,9 +11506,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -11736,9 +11736,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -11853,8 +11853,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -11969,12 +11969,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 9, 2, - 7, 4, 5, - 6 + 6, + 7, + 9 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -12169,9 +12169,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -12399,9 +12399,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -12516,8 +12516,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 8, - 7 + 7, + 8 ], "emphasizePriority": false, "bound": true, @@ -12632,12 +12632,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 9, 2, - 7, 4, 5, - 6 + 6, + 7, + 9 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -12832,9 +12832,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -13062,9 +13062,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -13179,8 +13179,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 8, - 7 + 7, + 8 ], "emphasizePriority": false, "bound": true, @@ -13272,12 +13272,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 8, 1, - 6, 3, 4, - 5 + 5, + 6, + 8 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -13472,9 +13472,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -13702,9 +13702,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -13819,8 +13819,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 7, - 6 + 6, + 7 ], "emphasizePriority": false, "bound": true, @@ -13912,12 +13912,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 8, 1, - 6, 3, 4, - 5 + 5, + 6, + 8 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -14112,9 +14112,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -14342,9 +14342,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -14459,8 +14459,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 7, - 6 + 6, + 7 ], "emphasizePriority": false, "bound": true, @@ -14520,11 +14520,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 7, - 5, 2, 3, - 4 + 4, + 5, + 7 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -14719,9 +14719,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -14949,9 +14949,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -15066,8 +15066,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 6, - 5 + 5, + 6 ], "emphasizePriority": false, "bound": true, @@ -15124,11 +15124,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 7, - 5, 2, 3, - 4 + 4, + 5, + 7 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -15323,9 +15323,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -15553,9 +15553,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -15670,8 +15670,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 6, - 5 + 5, + 6 ], "emphasizePriority": false, "bound": true, @@ -15728,11 +15728,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 8, - 6, 3, 4, - 5 + 5, + 6, + 8 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -15929,9 +15929,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -16158,9 +16158,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -16342,9 +16342,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -16451,8 +16451,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 7, - 6 + 6, + 7 ], "emphasizePriority": false, "bound": true, @@ -16509,11 +16509,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 8, - 6, 3, 4, - 5 + 5, + 6, + 8 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -16710,9 +16710,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -16939,9 +16939,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17123,9 +17123,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17232,8 +17232,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 7, - 6 + 6, + 7 ], "emphasizePriority": false, "bound": true, @@ -17290,11 +17290,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 6, - 4, 1, 2, - 3 + 3, + 4, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17424,9 +17424,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17600,9 +17600,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17830,9 +17830,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17976,8 +17976,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 5, - 4 + 4, + 5 ], "emphasizePriority": false, "bound": true, @@ -18034,11 +18034,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 6, - 4, 1, 2, - 3 + 3, + 4, + 6 ], "funcPriorityAgg": [], "emphasizePriority": true, @@ -18168,9 +18168,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -18344,9 +18344,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -18574,9 +18574,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -18720,8 +18720,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 5, - 4 + 4, + 5 ], "emphasizePriority": false, "bound": true, @@ -18881,14 +18881,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 15, - 13, 4, - 10, 6, 7, 8, - 9 + 9, + 10, + 13, + 15 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -19103,9 +19103,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -19333,9 +19333,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -19472,8 +19472,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -19516,8 +19516,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 14, - 13 + 13, + 14 ], "emphasizePriority": false, "bound": true, @@ -19677,14 +19677,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 15, - 13, 4, - 10, 6, 7, 8, - 9 + 9, + 10, + 13, + 15 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -19899,9 +19899,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -20129,9 +20129,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -20268,8 +20268,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -20312,8 +20312,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 14, - 13 + 13, + 14 ], "emphasizePriority": false, "bound": true, @@ -20451,14 +20451,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 14, - 12, 3, - 9, 5, 6, 7, - 8 + 8, + 9, + 12, + 14 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -20673,9 +20673,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -20903,9 +20903,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -21042,8 +21042,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 10, - 9 + 9, + 10 ], "emphasizePriority": false, "bound": true, @@ -21086,8 +21086,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 13, - 12 + 12, + 13 ], "emphasizePriority": false, "bound": true, @@ -21225,14 +21225,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 14, - 12, 3, - 9, 5, 6, 7, - 8 + 8, + 9, + 12, + 14 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -21447,9 +21447,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -21677,9 +21677,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -21816,8 +21816,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 10, - 9 + 9, + 10 ], "emphasizePriority": false, "bound": true, @@ -21860,8 +21860,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 13, - 12 + 12, + 13 ], "emphasizePriority": false, "bound": true, @@ -21977,14 +21977,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 13, - 11, 2, - 8, 4, 5, 6, - 7 + 7, + 8, + 11, + 13 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -22199,9 +22199,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -22429,9 +22429,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -22568,8 +22568,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -22612,8 +22612,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 12, - 11 + 11, + 12 ], "emphasizePriority": false, "bound": true, @@ -22729,14 +22729,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 13, - 11, 2, - 8, 4, 5, 6, - 7 + 7, + 8, + 11, + 13 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -22951,9 +22951,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -23181,9 +23181,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -23320,8 +23320,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -23364,8 +23364,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 12, - 11 + 11, + 12 ], "emphasizePriority": false, "bound": true, @@ -23458,14 +23458,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 12, - 10, 1, - 7, 3, 4, 5, - 6 + 6, + 7, + 10, + 12 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -23680,9 +23680,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -23910,9 +23910,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -24049,8 +24049,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 8, - 7 + 7, + 8 ], "emphasizePriority": false, "bound": true, @@ -24093,8 +24093,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -24187,14 +24187,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 12, - 10, 1, - 7, 3, 4, 5, - 6 + 6, + 7, + 10, + 12 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -24409,9 +24409,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -24639,9 +24639,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -24778,8 +24778,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 8, - 7 + 7, + 8 ], "emphasizePriority": false, "bound": true, @@ -24822,8 +24822,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -24877,8 +24877,8 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 3, - 1 + 1, + 3 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -24910,8 +24910,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 2, - 1 + 1, + 2 ], "emphasizePriority": false, "bound": true, @@ -24965,8 +24965,8 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 3, - 1 + 1, + 3 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -24998,8 +24998,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 2, - 1 + 1, + 2 ], "emphasizePriority": true, "bound": true, @@ -25053,8 +25053,8 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 2, - 1 + 1, + 2 ], "funcPriorityAgg": [], "emphasizePriority": false, diff --git a/src/lib/runners/txxw.json b/src/lib/runners/txxw.json index 3d05c0772..66efbe00f 100644 --- a/src/lib/runners/txxw.json +++ b/src/lib/runners/txxw.json @@ -113,9 +113,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, diff --git a/src/lib/runners/ujuq.json b/src/lib/runners/ujuq.json new file mode 100644 index 000000000..3e6ee1730 --- /dev/null +++ b/src/lib/runners/ujuq.json @@ -0,0 +1,113 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "c", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "a", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": { + "c": "highlighted", + "d": "highlighted" + }, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/ukzq.json b/src/lib/runners/ukzq.json new file mode 100644 index 000000000..abc3154f6 --- /dev/null +++ b/src/lib/runners/ukzq.json @@ -0,0 +1,36 @@ +{ + "expressionContainers": [ + { + "expression": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "done", + "numLeafNodes": 1 + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": true, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/uxno.json b/src/lib/runners/uxno.json new file mode 100644 index 000000000..02aef1254 --- /dev/null +++ b/src/lib/runners/uxno.json @@ -0,0 +1,108 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "b", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 2, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 1, + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 1, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": true, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "convert": "toMathBox", + "showBottomProgressBar": false +} diff --git a/src/lib/runners/xbki.json b/src/lib/runners/xbki.json index c3ed312f8..b44fafbb2 100644 --- a/src/lib/runners/xbki.json +++ b/src/lib/runners/xbki.json @@ -113,9 +113,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -486,9 +486,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -911,9 +911,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -1141,9 +1141,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -1403,9 +1403,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -1633,9 +1633,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -1897,9 +1897,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -2126,9 +2126,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -2310,9 +2310,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -2566,9 +2566,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -2795,9 +2795,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -2979,9 +2979,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -3168,9 +3168,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -3344,9 +3344,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -3574,9 +3574,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -3800,9 +3800,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -3976,9 +3976,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -4206,9 +4206,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -4402,9 +4402,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -4579,9 +4579,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -4809,9 +4809,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -4998,9 +4998,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -5175,9 +5175,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -5405,9 +5405,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -5571,9 +5571,9 @@ "type": "variable", "argPriorityAgg": [ 1, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -5748,9 +5748,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -5978,9 +5978,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -6144,9 +6144,9 @@ "type": "variable", "argPriorityAgg": [ 1, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -6321,9 +6321,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -6551,9 +6551,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -6684,9 +6684,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 4, 2, - 3 + 3, + 4 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -6861,9 +6861,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7091,9 +7091,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7221,9 +7221,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 4, 2, - 3 + 3, + 4 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7398,9 +7398,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7628,9 +7628,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7758,9 +7758,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -7937,9 +7937,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -8166,9 +8166,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -8350,9 +8350,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -8472,9 +8472,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -8651,9 +8651,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -8880,9 +8880,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9064,9 +9064,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9186,9 +9186,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 3, 1, - 2 + 2, + 3 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9298,9 +9298,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9474,9 +9474,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9704,9 +9704,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -9863,9 +9863,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 3, 1, - 2 + 2, + 3 ], "funcPriorityAgg": [], "emphasizePriority": true, @@ -9975,9 +9975,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -10151,9 +10151,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -10381,9 +10381,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -10621,12 +10621,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 10, 3, - 8, 5, 6, - 7 + 7, + 8, + 10 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -10821,9 +10821,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -11051,9 +11051,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -11168,8 +11168,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -11306,12 +11306,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 10, 3, - 8, 5, 6, - 7 + 7, + 8, + 10 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -11506,9 +11506,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -11736,9 +11736,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -11853,8 +11853,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -11969,12 +11969,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 9, 2, - 7, 4, 5, - 6 + 6, + 7, + 9 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -12169,9 +12169,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -12399,9 +12399,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -12516,8 +12516,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 8, - 7 + 7, + 8 ], "emphasizePriority": false, "bound": true, @@ -12632,12 +12632,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 9, 2, - 7, 4, 5, - 6 + 6, + 7, + 9 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -12832,9 +12832,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -13062,9 +13062,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -13179,8 +13179,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 8, - 7 + 7, + 8 ], "emphasizePriority": false, "bound": true, @@ -13272,12 +13272,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 8, 1, - 6, 3, 4, - 5 + 5, + 6, + 8 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -13472,9 +13472,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -13702,9 +13702,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -13819,8 +13819,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 7, - 6 + 6, + 7 ], "emphasizePriority": false, "bound": true, @@ -13912,12 +13912,12 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 8, 1, - 6, 3, 4, - 5 + 5, + 6, + 8 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -14112,9 +14112,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -14342,9 +14342,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -14459,8 +14459,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 7, - 6 + 6, + 7 ], "emphasizePriority": false, "bound": true, @@ -14520,11 +14520,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 7, - 5, 2, 3, - 4 + 4, + 5, + 7 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -14719,9 +14719,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -14949,9 +14949,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -15066,8 +15066,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 6, - 5 + 5, + 6 ], "emphasizePriority": false, "bound": true, @@ -15124,11 +15124,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 7, - 5, 2, 3, - 4 + 4, + 5, + 7 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -15323,9 +15323,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -15553,9 +15553,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -15670,8 +15670,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 6, - 5 + 5, + 6 ], "emphasizePriority": false, "bound": true, @@ -15728,11 +15728,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 8, - 6, 3, 4, - 5 + 5, + 6, + 8 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -15929,9 +15929,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -16158,9 +16158,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -16342,9 +16342,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -16451,8 +16451,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 7, - 6 + 6, + 7 ], "emphasizePriority": false, "bound": true, @@ -16509,11 +16509,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 8, - 6, 3, 4, - 5 + 5, + 6, + 8 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -16710,9 +16710,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -16939,9 +16939,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17123,9 +17123,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17232,8 +17232,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 7, - 6 + 6, + 7 ], "emphasizePriority": false, "bound": true, @@ -17290,11 +17290,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 6, - 4, 1, 2, - 3 + 3, + 4, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17424,9 +17424,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17600,9 +17600,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17830,9 +17830,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -17976,8 +17976,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 5, - 4 + 4, + 5 ], "emphasizePriority": false, "bound": true, @@ -18034,11 +18034,11 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 6, - 4, 1, 2, - 3 + 3, + 4, + 6 ], "funcPriorityAgg": [], "emphasizePriority": true, @@ -18168,9 +18168,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -18344,9 +18344,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -18574,9 +18574,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -18720,8 +18720,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 5, - 4 + 4, + 5 ], "emphasizePriority": false, "bound": true, @@ -18881,14 +18881,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 15, - 13, 4, - 10, 6, 7, 8, - 9 + 9, + 10, + 13, + 15 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -19103,9 +19103,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -19333,9 +19333,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -19472,8 +19472,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -19516,8 +19516,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 14, - 13 + 13, + 14 ], "emphasizePriority": false, "bound": true, @@ -19677,14 +19677,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 15, - 13, 4, - 10, 6, 7, 8, - 9 + 9, + 10, + 13, + 15 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -19899,9 +19899,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -20129,9 +20129,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -20268,8 +20268,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -20312,8 +20312,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 14, - 13 + 13, + 14 ], "emphasizePriority": false, "bound": true, @@ -20451,14 +20451,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 14, - 12, 3, - 9, 5, 6, 7, - 8 + 8, + 9, + 12, + 14 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -20673,9 +20673,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -20903,9 +20903,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -21042,8 +21042,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 10, - 9 + 9, + 10 ], "emphasizePriority": false, "bound": true, @@ -21086,8 +21086,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 13, - 12 + 12, + 13 ], "emphasizePriority": false, "bound": true, @@ -21225,14 +21225,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 14, - 12, 3, - 9, 5, 6, 7, - 8 + 8, + 9, + 12, + 14 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -21447,9 +21447,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -21677,9 +21677,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -21816,8 +21816,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 10, - 9 + 9, + 10 ], "emphasizePriority": false, "bound": true, @@ -21860,8 +21860,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 13, - 12 + 12, + 13 ], "emphasizePriority": false, "bound": true, @@ -21977,14 +21977,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 13, - 11, 2, - 8, 4, 5, 6, - 7 + 7, + 8, + 11, + 13 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -22199,9 +22199,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -22429,9 +22429,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -22568,8 +22568,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -22612,8 +22612,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 12, - 11 + 11, + 12 ], "emphasizePriority": false, "bound": true, @@ -22729,14 +22729,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 13, - 11, 2, - 8, 4, 5, 6, - 7 + 7, + 8, + 11, + 13 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -22951,9 +22951,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -23181,9 +23181,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -23320,8 +23320,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -23364,8 +23364,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 12, - 11 + 11, + 12 ], "emphasizePriority": false, "bound": true, @@ -23458,14 +23458,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 12, - 10, 1, - 7, 3, 4, 5, - 6 + 6, + 7, + 10, + 12 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -23680,9 +23680,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -23910,9 +23910,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -24049,8 +24049,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 8, - 7 + 7, + 8 ], "emphasizePriority": false, "bound": true, @@ -24093,8 +24093,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -24187,14 +24187,14 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 12, - 10, 1, - 7, 3, 4, 5, - 6 + 6, + 7, + 10, + 12 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -24409,9 +24409,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -24639,9 +24639,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -24778,8 +24778,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 8, - 7 + 7, + 8 ], "emphasizePriority": false, "bound": true, @@ -24822,8 +24822,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -24884,13 +24884,13 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 11, - 9, - 6, 2, 3, 4, - 5 + 5, + 6, + 9, + 11 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -25105,9 +25105,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -25335,9 +25335,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -25474,8 +25474,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 7, - 6 + 6, + 7 ], "emphasizePriority": false, "bound": true, @@ -25515,8 +25515,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 10, - 9 + 9, + 10 ], "emphasizePriority": false, "bound": true, @@ -25577,13 +25577,13 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 11, - 9, - 6, 2, 3, 4, - 5 + 5, + 6, + 9, + 11 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -25798,9 +25798,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -26028,9 +26028,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -26167,8 +26167,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 7, - 6 + 6, + 7 ], "emphasizePriority": false, "bound": true, @@ -26208,8 +26208,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 10, - 9 + 9, + 10 ], "emphasizePriority": false, "bound": true, @@ -26270,13 +26270,13 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 12, - 10, - 7, 3, 4, 5, - 6 + 6, + 7, + 10, + 12 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -26493,9 +26493,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -26722,9 +26722,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -26906,9 +26906,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -27037,8 +27037,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 8, - 7 + 7, + 8 ], "emphasizePriority": false, "bound": true, @@ -27078,8 +27078,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -27140,13 +27140,13 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 12, - 10, - 7, 3, 4, 5, - 6 + 6, + 7, + 10, + 12 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -27363,9 +27363,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -27592,9 +27592,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -27776,9 +27776,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -27907,8 +27907,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 8, - 7 + 7, + 8 ], "emphasizePriority": false, "bound": true, @@ -27948,8 +27948,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -28010,13 +28010,13 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 10, - 8, - 5, 1, 2, 3, - 4 + 4, + 5, + 8, + 10 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -28166,9 +28166,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -28342,9 +28342,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -28572,9 +28572,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -28740,8 +28740,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 6, - 5 + 5, + 6 ], "emphasizePriority": false, "bound": true, @@ -28781,8 +28781,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -28843,13 +28843,13 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 10, - 8, - 5, 1, 2, 3, - 4 + 4, + 5, + 8, + 10 ], "funcPriorityAgg": [], "emphasizePriority": true, @@ -28999,9 +28999,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 6, 4, - 5 + 5, + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -29175,9 +29175,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -29405,9 +29405,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -29573,8 +29573,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 6, - 5 + 5, + 6 ], "emphasizePriority": false, "bound": true, @@ -29614,8 +29614,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -29801,16 +29801,16 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 21, - 19, - 16, 5, - 12, 7, 8, 9, 10, - 11 + 11, + 12, + 16, + 19, + 21 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -30045,9 +30045,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -30275,9 +30275,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -30436,8 +30436,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 13, - 12 + 12, + 13 ], "emphasizePriority": false, "bound": true, @@ -30502,8 +30502,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 17, - 16 + 16, + 17 ], "emphasizePriority": false, "bound": true, @@ -30543,8 +30543,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 20, - 19 + 19, + 20 ], "emphasizePriority": false, "bound": true, @@ -30730,16 +30730,16 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 21, - 19, - 16, 5, - 12, 7, 8, 9, 10, - 11 + 11, + 12, + 16, + 19, + 21 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -30974,9 +30974,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -31204,9 +31204,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -31365,8 +31365,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 13, - 12 + 12, + 13 ], "emphasizePriority": false, "bound": true, @@ -31431,8 +31431,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 17, - 16 + 16, + 17 ], "emphasizePriority": false, "bound": true, @@ -31472,8 +31472,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 20, - 19 + 19, + 20 ], "emphasizePriority": false, "bound": true, @@ -31637,16 +31637,16 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 20, - 18, - 15, 4, - 11, 6, 7, 8, 9, - 10 + 10, + 11, + 15, + 18, + 20 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -31881,9 +31881,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -32111,9 +32111,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -32272,8 +32272,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 12, - 11 + 11, + 12 ], "emphasizePriority": false, "bound": true, @@ -32338,8 +32338,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 16, - 15 + 15, + 16 ], "emphasizePriority": false, "bound": true, @@ -32379,8 +32379,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 19, - 18 + 18, + 19 ], "emphasizePriority": false, "bound": true, @@ -32544,16 +32544,16 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 20, - 18, - 15, 4, - 11, 6, 7, 8, 9, - 10 + 10, + 11, + 15, + 18, + 20 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -32788,9 +32788,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -33018,9 +33018,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -33179,8 +33179,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 12, - 11 + 11, + 12 ], "emphasizePriority": false, "bound": true, @@ -33245,8 +33245,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 16, - 15 + 15, + 16 ], "emphasizePriority": false, "bound": true, @@ -33286,8 +33286,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 19, - 18 + 18, + 19 ], "emphasizePriority": false, "bound": true, @@ -33429,16 +33429,16 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 19, - 17, - 14, 3, - 10, 5, 6, 7, 8, - 9 + 9, + 10, + 14, + 17, + 19 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -33673,9 +33673,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -33903,9 +33903,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -34064,8 +34064,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -34130,8 +34130,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 15, - 14 + 14, + 15 ], "emphasizePriority": false, "bound": true, @@ -34171,8 +34171,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 18, - 17 + 17, + 18 ], "emphasizePriority": false, "bound": true, @@ -34314,16 +34314,16 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 19, - 17, - 14, 3, - 10, 5, 6, 7, 8, - 9 + 9, + 10, + 14, + 17, + 19 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -34558,9 +34558,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -34788,9 +34788,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -34949,8 +34949,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 11, - 10 + 10, + 11 ], "emphasizePriority": false, "bound": true, @@ -35015,8 +35015,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 15, - 14 + 14, + 15 ], "emphasizePriority": false, "bound": true, @@ -35056,8 +35056,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 18, - 17 + 17, + 18 ], "emphasizePriority": false, "bound": true, @@ -35177,16 +35177,16 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 18, - 16, - 13, 2, - 9, 4, 5, 6, 7, - 8 + 8, + 9, + 13, + 16, + 18 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -35421,9 +35421,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -35651,9 +35651,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -35812,8 +35812,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 10, - 9 + 9, + 10 ], "emphasizePriority": false, "bound": true, @@ -35878,8 +35878,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 14, - 13 + 13, + 14 ], "emphasizePriority": false, "bound": true, @@ -35919,8 +35919,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 17, - 16 + 16, + 17 ], "emphasizePriority": false, "bound": true, @@ -36040,16 +36040,16 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 18, - 16, - 13, 2, - 9, 4, 5, 6, 7, - 8 + 8, + 9, + 13, + 16, + 18 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -36284,9 +36284,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -36514,9 +36514,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -36675,8 +36675,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 10, - 9 + 9, + 10 ], "emphasizePriority": false, "bound": true, @@ -36741,8 +36741,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 14, - 13 + 13, + 14 ], "emphasizePriority": false, "bound": true, @@ -36782,8 +36782,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 17, - 16 + 16, + 17 ], "emphasizePriority": false, "bound": true, @@ -36880,16 +36880,16 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 17, - 15, - 12, 1, - 8, 3, 4, 5, 6, - 7 + 7, + 8, + 12, + 15, + 17 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -37124,9 +37124,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -37354,9 +37354,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -37515,8 +37515,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -37581,8 +37581,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 13, - 12 + 12, + 13 ], "emphasizePriority": false, "bound": true, @@ -37622,8 +37622,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 16, - 15 + 15, + 16 ], "emphasizePriority": false, "bound": true, @@ -37720,16 +37720,16 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 17, - 15, - 12, 1, - 8, 3, 4, 5, 6, - 7 + 7, + 8, + 12, + 15, + 17 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -37964,9 +37964,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -38194,9 +38194,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -38355,8 +38355,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 9, - 8 + 8, + 9 ], "emphasizePriority": false, "bound": true, @@ -38421,8 +38421,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 13, - 12 + 12, + 13 ], "emphasizePriority": false, "bound": true, @@ -38462,8 +38462,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 16, - 15 + 15, + 16 ], "emphasizePriority": false, "bound": true, @@ -38520,9 +38520,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 6, + 1, 4, - 1 + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -38576,8 +38576,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 2, - 1 + 1, + 2 ], "emphasizePriority": false, "bound": true, @@ -38617,8 +38617,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 5, - 4 + 4, + 5 ], "emphasizePriority": false, "bound": true, @@ -38675,9 +38675,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 6, + 1, 4, - 1 + 6 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -38731,8 +38731,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 2, - 1 + 1, + 2 ], "emphasizePriority": false, "bound": true, @@ -38772,8 +38772,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 5, - 4 + 4, + 5 ], "emphasizePriority": false, "bound": true, @@ -38830,9 +38830,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 5, + 1, 3, - 1 + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -38864,8 +38864,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 2, - 1 + 1, + 2 ], "emphasizePriority": false, "bound": true, @@ -38905,8 +38905,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 4, - 3 + 3, + 4 ], "emphasizePriority": false, "bound": true, @@ -38963,9 +38963,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 5, + 1, 3, - 1 + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -38997,8 +38997,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 2, - 1 + 1, + 2 ], "emphasizePriority": true, "bound": true, @@ -39038,8 +39038,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 4, - 3 + 3, + 4 ], "emphasizePriority": false, "bound": true, @@ -39096,9 +39096,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 4, + 1, 2, - 1 + 4 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -39149,8 +39149,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 3, - 2 + 2, + 3 ], "emphasizePriority": false, "bound": true, @@ -39207,9 +39207,9 @@ "bottomRightBadgeType": "none", "type": "variable", "argPriorityAgg": [ - 4, + 1, 2, - 1 + 4 ], "funcPriorityAgg": [], "emphasizePriority": false, @@ -39260,8 +39260,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 3, - 2 + 2, + 3 ], "emphasizePriority": false, "bound": true, @@ -39317,8 +39317,8 @@ "bottomRightBadgeType": "none", "emphasizePriority": false, "argPriorityAgg": [ - 3, - 1 + 1, + 3 ], "funcPriorityAgg": [], "shorthandNumber": 2, @@ -39348,8 +39348,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 2, - 1 + 1, + 2 ], "emphasizePriority": false, "bound": true, @@ -39405,8 +39405,8 @@ "bottomRightBadgeType": "none", "emphasizePriority": false, "argPriorityAgg": [ - 3, - 1 + 1, + 3 ], "funcPriorityAgg": [], "shorthandNumber": 2, @@ -39436,8 +39436,8 @@ "type": "variable", "argPriorityAgg": [], "funcPriorityAgg": [ - 2, - 1 + 1, + 2 ], "emphasizePriority": true, "bound": true, @@ -39493,8 +39493,8 @@ "bottomRightBadgeType": "none", "emphasizePriority": false, "argPriorityAgg": [ - 2, - 1 + 1, + 2 ], "funcPriorityAgg": [], "shorthandNumber": 2, @@ -39559,8 +39559,8 @@ "bottomRightBadgeType": "none", "emphasizePriority": false, "argPriorityAgg": [ - 2, - 1 + 1, + 2 ], "funcPriorityAgg": [], "shorthandNumber": 2, diff --git a/src/lib/runners/xhje.json b/src/lib/runners/xhje.json new file mode 100644 index 000000000..ec01b50d7 --- /dev/null +++ b/src/lib/runners/xhje.json @@ -0,0 +1,918 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "arg": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "g", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "arg": { + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "active", + "activePriority": 1 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "arg": { + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "showFuncUnbound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "showFuncUnbound", + "activePriority": 1 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "arg": { + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "g", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcUnbound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": false, + "activePriority": 1 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 2 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "arg": { + "name": "g", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "g", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "func": { + "arg": { + "name": "e", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1, + 2 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 2 + }, + "state": "default", + "type": "call", + "priority": 2, + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 3, + "containerState": "stepped", + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "numLeafNodes": 2, + "containerState": "ready", + "previouslyChangedExpressionState": "default", + "activePriority": 1 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "active", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "active", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "showFuncBound", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "showFuncBound", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "f", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "highlighted", + "topLeftBadgeType": "match", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": true, + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "betaReduceCallArgHighlighted", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "f", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "highlighted", + "topLeftBadgeType": "betaReduced", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewAfter", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "betaReducePreviewAfter", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "arg": { + "name": "h", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "f", + "highlightType": "removed", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "h", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewCrossed", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "betaReducePreviewCrossed", + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + }, + { + "expression": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "previouslyChangedExpressionState": "default", + "activePriority": 1, + "containerState": "done", + "numLeafNodes": 1 + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": true, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/runners/yfwq.json b/src/lib/runners/yfwq.json new file mode 100644 index 000000000..6274c7da3 --- /dev/null +++ b/src/lib/runners/yfwq.json @@ -0,0 +1,108 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "arg": { + "name": "h", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "name": "d", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "state": "default", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "type": "function", + "maxNestedFunctionDepth": 2 + }, + "numLeafNodes": 2, + "containerState": "ready", + "previouslyChangedExpressionState": "default" + }, + { + "expression": { + "name": "shorthandNumber", + "highlightType": "default", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "none", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "shorthandNumber": 1, + "maxNestedFunctionDepth": 0 + }, + "numLeafNodes": 1, + "containerState": "done", + "previouslyChangedExpressionState": "default" + } + ], + "speed": 1, + "hideControls": false, + "explanationsVisibility": "hiddenInitialPausedOnly", + "hidePriorities": false, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": true, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "convert": "toMathBox", + "showBottomProgressBar": false +} diff --git a/src/lib/runners/zick.json b/src/lib/runners/zick.json index 3225004ef..a9e6ec947 100644 --- a/src/lib/runners/zick.json +++ b/src/lib/runners/zick.json @@ -68,9 +68,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, diff --git a/src/lib/runners/zlfx.json b/src/lib/runners/zlfx.json index ec8ac4abc..db498d635 100644 --- a/src/lib/runners/zlfx.json +++ b/src/lib/runners/zlfx.json @@ -113,9 +113,9 @@ "type": "variable", "argPriorityAgg": [ 2, - 5, 3, - 4 + 4, + 5 ], "funcPriorityAgg": [], "emphasizePriority": false, diff --git a/src/lib/runners/zvpc.json b/src/lib/runners/zvpc.json new file mode 100644 index 000000000..b570fb5e4 --- /dev/null +++ b/src/lib/runners/zvpc.json @@ -0,0 +1,75 @@ +{ + "expressionContainers": [ + { + "expression": { + "arg": { + "name": "b", + "highlightType": "active", + "topLeftBadgeType": "none", + "bottomRightBadgeType": "callArg", + "type": "variable", + "argPriorityAgg": [ + 1 + ], + "funcPriorityAgg": [], + "emphasizePriority": true, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "func": { + "arg": { + "name": "a", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcArg", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [ + 1 + ], + "emphasizePriority": true, + "bound": false, + "maxNestedFunctionDepth": 0 + }, + "body": { + "name": "f", + "highlightType": "highlighted", + "topLeftBadgeType": "unmatch", + "bottomRightBadgeType": "funcBound", + "type": "variable", + "argPriorityAgg": [], + "funcPriorityAgg": [], + "emphasizePriority": false, + "bound": true, + "maxNestedFunctionDepth": 0 + }, + "type": "function", + "maxNestedFunctionDepth": 1 + }, + "state": "betaReducePreviewBefore", + "type": "call", + "priority": 1, + "maxNestedFunctionDepth": 1 + }, + "previouslyChangedExpressionState": "betaReducePreviewBefore", + "matchExists": false, + "activePriority": 1, + "containerState": "stepped", + "numLeafNodes": 2 + } + ], + "speed": 1, + "hideControls": true, + "explanationsVisibility": "hidden", + "hidePriorities": true, + "hideRunButton": false, + "hideBottomRightBadges": false, + "skipToTheEnd": false, + "hideFuncUnboundBadgeOnExplanation": false, + "highlightOverridesCallArgAndFuncUnboundOnly": false, + "bottomRightBadgeOverrides": {}, + "highlightOverrides": {}, + "highlightOverrideActiveAfterStart": false, + "highlightFunctions": false, + "showBottomProgressBar": false +} diff --git a/src/lib/theme/colors.ts b/src/lib/theme/colors.ts index 481ca6a70..d80cbd20f 100644 --- a/src/lib/theme/colors.ts +++ b/src/lib/theme/colors.ts @@ -16,7 +16,6 @@ import Color from 'color' // https://material.io/design/color/the-color-system.html export const allColors = { - secretCode: '#3B88C3', grey100: grey[100], grey300: grey[300], grey600: grey[600], @@ -65,15 +64,19 @@ export const allColors = { blue400: blue[400], blue600: blue[600], yellow100: yellow[100], + yellow200: yellow[200], yellow400: yellow[400], yellow900: yellow[900], deepOrange50: deepOrange[50], + deepOrange200: deepOrange[200], deepOrange400: deepOrange[400], deepOrange600: deepOrange[600], deepOrange800: deepOrange[800], cyan100: cyan[100], red100: red[100], - orange100: orange[100] + orange100: orange[100], + codeBg: '#f2f4ff', + codeButtonBg: '#d9ddff' } const colors = (x: keyof typeof allColors) => allColors[x] diff --git a/src/lib/theme/lineHeights.ts b/src/lib/theme/lineHeights.ts index 712e51f5e..ae6e09314 100644 --- a/src/lib/theme/lineHeights.ts +++ b/src/lib/theme/lineHeights.ts @@ -5,6 +5,7 @@ export const allLineHeights = { 1.1: 1.1, 1.2: 1.2, 1.3: 1.3, + 1.4: 1.4, 1.55: 1.55, 2: 2 } diff --git a/src/types/ExpressionRunnerTypes.ts b/src/types/ExpressionRunnerTypes.ts index 9150c4078..b9662ba2a 100644 --- a/src/types/ExpressionRunnerTypes.ts +++ b/src/types/ExpressionRunnerTypes.ts @@ -47,6 +47,7 @@ export interface ExpressionRunnerProps { speed: number showAllShowSteps?: boolean skipAlphaConvert?: boolean + applicativeOrder?: boolean skipToTheEnd: boolean hideFuncUnboundBadgeOnExplanation: boolean highlightOverridesCallArgAndFuncUnboundOnly: boolean diff --git a/yarn.lock b/yarn.lock index 46bfdd7a5..f593c1d2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,31 +2,37 @@ # yarn lockfile v1 -"@ampproject/toolbox-core@^1.0.1", "@ampproject/toolbox-core@^1.1.1": +"@ampproject/toolbox-core@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@ampproject/toolbox-core/-/toolbox-core-1.1.1.tgz#540c8f3ab0f5d1faa1ba35282cd5f5f3f0e16a76" integrity sha512-jcuVJUnGDRUEJgMYO6QVdf1dBy/oLZX3NjN2hYG48biFcPCvXevuv4xYFZMJsnsHSvXKg8y0qB8rANNyhTUN/A== dependencies: node-fetch "2.6.0" -"@ampproject/toolbox-optimizer@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@ampproject/toolbox-optimizer/-/toolbox-optimizer-1.0.1.tgz#5eeda7bc84c23237479c35442d4696c4bdbeb1d3" - integrity sha512-zz1cJsQWBvfg2h1ce2/bbgNdSkTjIY7PaF7QhWMzYVcfvdxGSAykA+Ajt+F13H6adNAtIn09s96z/+6pn7XiXQ== +"@ampproject/toolbox-optimizer@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@ampproject/toolbox-optimizer/-/toolbox-optimizer-1.1.1.tgz#be66245c966ba9b0f5e3020109f87fea90ea377d" + integrity sha512-LTtTM5FSOrWuTJ6mOwPfZmpUDI6polrNz3tX2EmDmDkjDK+43vSpq1OHtukivIFHafdixJuoeki5dF3PC/ZoWw== dependencies: - "@ampproject/toolbox-core" "^1.0.1" - "@ampproject/toolbox-runtime-version" "^1.0.1" + "@ampproject/toolbox-core" "^1.1.1" + "@ampproject/toolbox-runtime-version" "^1.1.1" + "@ampproject/toolbox-script-csp" "^1.1.1" css "2.2.4" parse5 "5.1.0" parse5-htmlparser2-tree-adapter "5.1.0" -"@ampproject/toolbox-runtime-version@^1.0.1": +"@ampproject/toolbox-runtime-version@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-1.1.1.tgz#628fe5091db4f90b68960620e22ad64f9f2563bd" integrity sha512-ibmw5p+0Sz+wingbX/Dyboe8a0+XDkMfFGSM7KFE0h2z3Op9MADup8ZPLeHT54Z7cYKmB6ob60FVHtQQDhEXNw== dependencies: "@ampproject/toolbox-core" "^1.1.1" +"@ampproject/toolbox-script-csp@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@ampproject/toolbox-script-csp/-/toolbox-script-csp-1.1.1.tgz#0b049a1c86c99f300162a10e1b9ce83c6e354a45" + integrity sha512-gACGfsVKinCy/977FSrlVgo6jxTZ0lcTCvCnRlNwvSOcxJVm+jJR3sP7/F43fpak9Gsq/EwFaatfnNMbunPc+w== + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d" @@ -34,27 +40,7 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@7.4.5": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.5.tgz#081f97e8ffca65a9b4b0fdc7e274e703f000c06a" - integrity sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.4.4" - "@babel/helpers" "^7.4.4" - "@babel/parser" "^7.4.5" - "@babel/template" "^7.4.4" - "@babel/traverse" "^7.4.5" - "@babel/types" "^7.4.4" - convert-source-map "^1.1.0" - debug "^4.1.0" - json5 "^2.1.0" - lodash "^4.17.11" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.4.5": +"@babel/core@7.6.4", "@babel/core@^7.4.5": version "7.6.4" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff" integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ== @@ -74,7 +60,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.4.4", "@babel/generator@^7.6.3", "@babel/generator@^7.6.4": +"@babel/generator@^7.6.3", "@babel/generator@^7.6.4": version "7.6.4" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz#a4f8437287bf9671b07f483b76e3bb731bc97671" integrity sha512-jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w== @@ -84,6 +70,16 @@ lodash "^4.17.13" source-map "^0.5.0" +"@babel/generator@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.2.tgz#2f4852d04131a5e17ea4f6645488b5da66ebf3af" + integrity sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ== + dependencies: + "@babel/types" "^7.7.2" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + "@babel/helper-annotate-as-pure@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32" @@ -91,6 +87,13 @@ dependencies: "@babel/types" "^7.0.0" +"@babel/helper-annotate-as-pure@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz#efc54032d43891fe267679e63f6860aa7dbf4a5e" + integrity sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f" @@ -116,25 +119,33 @@ "@babel/traverse" "^7.4.4" "@babel/types" "^7.4.4" -"@babel/helper-create-class-features-plugin@^7.4.4", "@babel/helper-create-class-features-plugin@^7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz#769711acca889be371e9bc2eb68641d55218021f" - integrity sha512-O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng== +"@babel/helper-create-class-features-plugin@^7.5.5", "@babel/helper-create-class-features-plugin@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.0.tgz#bcdc223abbfdd386f94196ae2544987f8df775e8" + integrity sha512-MZiB5qvTWoyiFOgootmRSDV1udjIqJW/8lmxgzKq6oDqxdmHUjeP2ZUOmgHdYjmUVNABqRrHjYAYRvj8Eox/UA== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-member-expression-to-functions" "^7.5.5" - "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-function-name" "^7.7.0" + "@babel/helper-member-expression-to-functions" "^7.7.0" + "@babel/helper-optimise-call-expression" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.5.5" - "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/helper-replace-supers" "^7.7.0" + "@babel/helper-split-export-declaration" "^7.7.0" -"@babel/helper-define-map@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369" - integrity sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg== +"@babel/helper-create-regexp-features-plugin@^7.7.0": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz#6f20443778c8fce2af2ff4206284afc0ced65db6" + integrity sha512-pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ== dependencies: - "@babel/helper-function-name" "^7.1.0" - "@babel/types" "^7.5.5" + "@babel/helper-regex" "^7.4.4" + regexpu-core "^4.6.0" + +"@babel/helper-define-map@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz#60b0e9fd60def9de5054c38afde8c8ee409c7529" + integrity sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA== + dependencies: + "@babel/helper-function-name" "^7.7.0" + "@babel/types" "^7.7.0" lodash "^4.17.13" "@babel/helper-explode-assignable-expression@^7.1.0": @@ -154,6 +165,15 @@ "@babel/template" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-function-name@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz#44a5ad151cfff8ed2599c91682dda2ec2c8430a3" + integrity sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q== + dependencies: + "@babel/helper-get-function-arity" "^7.7.0" + "@babel/template" "^7.7.0" + "@babel/types" "^7.7.0" + "@babel/helper-get-function-arity@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" @@ -161,6 +181,13 @@ dependencies: "@babel/types" "^7.0.0" +"@babel/helper-get-function-arity@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz#c604886bc97287a1d1398092bc666bc3d7d7aa2d" + integrity sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-hoist-variables@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a" @@ -168,6 +195,13 @@ dependencies: "@babel/types" "^7.4.4" +"@babel/helper-hoist-variables@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz#b4552e4cfe5577d7de7b183e193e84e4ec538c81" + integrity sha512-LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-member-expression-to-functions@^7.5.5": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590" @@ -175,6 +209,13 @@ dependencies: "@babel/types" "^7.5.5" +"@babel/helper-member-expression-to-functions@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz#472b93003a57071f95a541ea6c2b098398bcad8a" + integrity sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-module-imports@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d" @@ -182,6 +223,13 @@ dependencies: "@babel/types" "^7.0.0" +"@babel/helper-module-imports@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz#99c095889466e5f7b6d66d98dffc58baaf42654d" + integrity sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz#f84ff8a09038dcbca1fd4355661a500937165b4a" @@ -194,6 +242,18 @@ "@babel/types" "^7.5.5" lodash "^4.17.13" +"@babel/helper-module-transforms@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz#154a69f0c5b8fd4d39e49750ff7ac4faa3f36786" + integrity sha512-rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ== + dependencies: + "@babel/helper-module-imports" "^7.7.0" + "@babel/helper-simple-access" "^7.7.0" + "@babel/helper-split-export-declaration" "^7.7.0" + "@babel/template" "^7.7.0" + "@babel/types" "^7.7.0" + lodash "^4.17.13" + "@babel/helper-optimise-call-expression@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5" @@ -201,6 +261,13 @@ dependencies: "@babel/types" "^7.0.0" +"@babel/helper-optimise-call-expression@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz#4f66a216116a66164135dc618c5d8b7a959f9365" + integrity sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-plugin-utils@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250" @@ -224,6 +291,17 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-remap-async-to-generator@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz#4d69ec653e8bff5bce62f5d33fc1508f223c75a7" + integrity sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.7.0" + "@babel/helper-wrap-function" "^7.7.0" + "@babel/template" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" + "@babel/helper-replace-supers@^7.5.5": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2" @@ -234,6 +312,16 @@ "@babel/traverse" "^7.5.5" "@babel/types" "^7.5.5" +"@babel/helper-replace-supers@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz#d5365c8667fe7cbd13b8ddddceb9bd7f2b387512" + integrity sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.7.0" + "@babel/helper-optimise-call-expression" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" + "@babel/helper-simple-access@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c" @@ -242,6 +330,14 @@ "@babel/template" "^7.1.0" "@babel/types" "^7.0.0" +"@babel/helper-simple-access@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz#97a8b6c52105d76031b86237dc1852b44837243d" + integrity sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g== + dependencies: + "@babel/template" "^7.7.0" + "@babel/types" "^7.7.0" + "@babel/helper-split-export-declaration@^7.4.4": version "7.4.4" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677" @@ -249,6 +345,13 @@ dependencies: "@babel/types" "^7.4.4" +"@babel/helper-split-export-declaration@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz#1365e74ea6c614deeb56ebffabd71006a0eb2300" + integrity sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA== + dependencies: + "@babel/types" "^7.7.0" + "@babel/helper-wrap-function@^7.1.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa" @@ -259,7 +362,17 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.2.0" -"@babel/helpers@^7.4.4", "@babel/helpers@^7.6.2": +"@babel/helper-wrap-function@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz#15af3d3e98f8417a60554acbb6c14e75e0b33b74" + integrity sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w== + dependencies: + "@babel/helper-function-name" "^7.7.0" + "@babel/template" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" + +"@babel/helpers@^7.6.2": version "7.6.2" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz#681ffe489ea4dcc55f23ce469e58e59c1c045153" integrity sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA== @@ -277,11 +390,16 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.4.5", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4": +"@babel/parser@^7.0.0", "@babel/parser@^7.6.0", "@babel/parser@^7.6.3", "@babel/parser@^7.6.4": version "7.6.4" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz#cb9b36a7482110282d5cb6dd424ec9262b473d81" integrity sha512-D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A== +"@babel/parser@^7.7.0", "@babel/parser@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.2.tgz#ea8334dc77416bfd9473eb470fd00d8245b3943b" + integrity sha512-DDaR5e0g4ZTb9aP7cpSZLkACEBdoLGwJDWgHtBhrGX7Q1RjhdoMOfexICj5cqTAtpowjGQWfcvfnQG7G2kAB5w== + "@babel/plugin-proposal-async-generator-functions@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" @@ -291,13 +409,21 @@ "@babel/helper-remap-async-to-generator" "^7.1.0" "@babel/plugin-syntax-async-generators" "^7.2.0" -"@babel/plugin-proposal-class-properties@7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz#93a6486eed86d53452ab9bab35e368e9461198ce" - integrity sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg== +"@babel/plugin-proposal-class-properties@7.5.5": + version "7.5.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4" + integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.5.5" + "@babel/helper-plugin-utils" "^7.0.0" + +"@babel/plugin-proposal-dynamic-import@^7.5.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz#dc02a8bad8d653fb59daf085516fa416edd2aa7f" + integrity sha512-7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.4.4" "@babel/helper-plugin-utils" "^7.0.0" + "@babel/plugin-syntax-dynamic-import" "^7.2.0" "@babel/plugin-proposal-json-strings@^7.2.0": version "7.2.0" @@ -307,15 +433,7 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-json-strings" "^7.2.0" -"@babel/plugin-proposal-object-rest-spread@7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz#1ef173fcf24b3e2df92a678f027673b55e7e3005" - integrity sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-object-rest-spread" "^7.2.0" - -"@babel/plugin-proposal-object-rest-spread@^7.4.4": +"@babel/plugin-proposal-object-rest-spread@7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.6.2": version "7.6.2" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz#8ffccc8f3a6545e9f78988b6bf4fe881b88e8096" integrity sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw== @@ -331,14 +449,13 @@ "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" -"@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz#05413762894f41bfe42b9a5e80919bd575dcc802" - integrity sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw== +"@babel/plugin-proposal-unicode-property-regex@^7.6.2": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz#549fe1717a1bd0a2a7e63163841cb37e78179d5d" + integrity sha512-mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.6.0" "@babel/plugin-syntax-async-generators@^7.2.0": version "7.2.0" @@ -347,7 +464,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-dynamic-import@7.2.0": +"@babel/plugin-syntax-dynamic-import@7.2.0", "@babel/plugin-syntax-dynamic-import@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612" integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w== @@ -396,14 +513,14 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-async-to-generator@^7.4.4": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e" - integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg== +"@babel/plugin-transform-async-to-generator@^7.5.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz#e2b84f11952cf5913fe3438b7d2585042772f492" + integrity sha512-vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw== dependencies: - "@babel/helper-module-imports" "^7.0.0" + "@babel/helper-module-imports" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-remap-async-to-generator" "^7.1.0" + "@babel/helper-remap-async-to-generator" "^7.7.0" "@babel/plugin-transform-block-scoped-functions@^7.2.0": version "7.2.0" @@ -412,7 +529,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-block-scoping@^7.4.4": +"@babel/plugin-transform-block-scoping@^7.6.3": version "7.6.3" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz#6e854e51fbbaa84351b15d4ddafe342f3a5d542a" integrity sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw== @@ -420,18 +537,18 @@ "@babel/helper-plugin-utils" "^7.0.0" lodash "^4.17.13" -"@babel/plugin-transform-classes@^7.4.4": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9" - integrity sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg== +"@babel/plugin-transform-classes@^7.5.5": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz#b411ecc1b8822d24b81e5d184f24149136eddd4a" + integrity sha512-/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA== dependencies: - "@babel/helper-annotate-as-pure" "^7.0.0" - "@babel/helper-define-map" "^7.5.5" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-optimise-call-expression" "^7.0.0" + "@babel/helper-annotate-as-pure" "^7.7.0" + "@babel/helper-define-map" "^7.7.0" + "@babel/helper-function-name" "^7.7.0" + "@babel/helper-optimise-call-expression" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.5.5" - "@babel/helper-split-export-declaration" "^7.4.4" + "@babel/helper-replace-supers" "^7.7.0" + "@babel/helper-split-export-declaration" "^7.7.0" globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.2.0": @@ -441,23 +558,22 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-destructuring@^7.4.4": +"@babel/plugin-transform-destructuring@^7.6.0": version "7.6.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz#44bbe08b57f4480094d57d9ffbcd96d309075ba6" integrity sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ== dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz#44abb948b88f0199a627024e1508acaf8dc9b2f9" - integrity sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA== +"@babel/plugin-transform-dotall-regex@^7.6.2": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz#c5c9ecacab3a5e0c11db6981610f0c32fd698b3b" + integrity sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.6.0" -"@babel/plugin-transform-duplicate-keys@^7.2.0": +"@babel/plugin-transform-duplicate-keys@^7.5.0": version "7.5.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853" integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ== @@ -501,7 +617,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-modules-amd@^7.2.0": +"@babel/plugin-transform-modules-amd@^7.5.0": version "7.5.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91" integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg== @@ -510,16 +626,7 @@ "@babel/helper-plugin-utils" "^7.0.0" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-commonjs@7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz#0bef4713d30f1d78c2e59b3d6db40e60192cac1e" - integrity sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw== - dependencies: - "@babel/helper-module-transforms" "^7.4.4" - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-simple-access" "^7.1.0" - -"@babel/plugin-transform-modules-commonjs@^7.4.4": +"@babel/plugin-transform-modules-commonjs@7.6.0": version "7.6.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz#39dfe957de4420445f1fcf88b68a2e4aa4515486" integrity sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g== @@ -529,12 +636,22 @@ "@babel/helper-simple-access" "^7.1.0" babel-plugin-dynamic-import-node "^2.3.0" -"@babel/plugin-transform-modules-systemjs@^7.4.4": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249" - integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg== +"@babel/plugin-transform-modules-commonjs@^7.6.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz#3e5ffb4fd8c947feede69cbe24c9554ab4113fe3" + integrity sha512-KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg== dependencies: - "@babel/helper-hoist-variables" "^7.4.4" + "@babel/helper-module-transforms" "^7.7.0" + "@babel/helper-plugin-utils" "^7.0.0" + "@babel/helper-simple-access" "^7.7.0" + babel-plugin-dynamic-import-node "^2.3.0" + +"@babel/plugin-transform-modules-systemjs@^7.5.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz#9baf471213af9761c1617bb12fd278e629041417" + integrity sha512-ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg== + dependencies: + "@babel/helper-hoist-variables" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" babel-plugin-dynamic-import-node "^2.3.0" @@ -546,12 +663,12 @@ "@babel/helper-module-transforms" "^7.1.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz#aaa6e409dd4fb2e50b6e2a91f7e3a3149dbce0cf" - integrity sha512-jTkk7/uE6H2s5w6VlMHeWuH+Pcy2lmdwFoeWCVnvIrDUnB5gQqTVI8WfmEAhF2CDEarGrknZcmSFg1+bkfCoSw== +"@babel/plugin-transform-named-capturing-groups-regex@^7.6.3": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz#358e6fd869b9a4d8f5cbc79e4ed4fc340e60dcaf" + integrity sha512-+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg== dependencies: - regexpu-core "^4.6.0" + "@babel/helper-create-regexp-features-plugin" "^7.7.0" "@babel/plugin-transform-new-target@^7.4.4": version "7.4.4" @@ -560,7 +677,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-object-super@^7.2.0": +"@babel/plugin-transform-object-super@^7.5.5": version "7.5.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9" integrity sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ== @@ -630,10 +747,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-runtime@7.4.4": - version "7.4.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.4.tgz#a50f5d16e9c3a4ac18a1a9f9803c107c380bce08" - integrity sha512-aMVojEjPszvau3NRg+TIH14ynZLvPewH4xhlCW1w6A3rkxTS1m4uwzRclYR9oS+rl/dr+kT+pzbfHuAWP/lc7Q== +"@babel/plugin-transform-runtime@7.6.2": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.2.tgz#2669f67c1fae0ae8d8bf696e4263ad52cb98b6f8" + integrity sha512-cqULw/QB4yl73cS5Y0TZlQSjDvNkzDbu0FurTZyHlJpWE5T3PCMdnyV+xXoH1opr1ldyHODe3QAX3OMAii5NxA== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" @@ -647,7 +764,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-spread@^7.2.0": +"@babel/plugin-transform-spread@^7.6.2": version "7.6.2" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz#fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd" integrity sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg== @@ -677,82 +794,83 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-typescript@^7.3.2": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.3.tgz#dddb50cf3b8b2ef70b22e5326e9a91f05a1db13b" - integrity sha512-aiWINBrPMSC3xTXRNM/dfmyYuPNKY/aexYqBgh0HBI5Y+WO5oRAqW/oROYeYHrF4Zw12r9rK4fMk/ZlAmqx/FQ== +"@babel/plugin-transform-typescript@^7.6.0": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.2.tgz#eb9f14c516b5d36f4d6f3a9d7badae6d0fc313d4" + integrity sha512-UWhDaJRqdPUtdK1s0sKYdoRuqK0NepjZto2UZltvuCgMoMZmdjhgz5hcRokie/3aYEaSz3xvusyoayVaq4PjRg== dependencies: - "@babel/helper-create-class-features-plugin" "^7.6.0" + "@babel/helper-create-class-features-plugin" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-typescript" "^7.2.0" -"@babel/plugin-transform-unicode-regex@^7.4.4": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz#b692aad888a7e8d8b1b214be6b9dc03d5031f698" - integrity sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw== +"@babel/plugin-transform-unicode-regex@^7.6.2": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz#743d9bcc44080e3cc7d49259a066efa30f9187a3" + integrity sha512-RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA== dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.7.0" "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-regex" "^7.4.4" - regexpu-core "^4.6.0" -"@babel/preset-env@7.4.5": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.5.tgz#2fad7f62983d5af563b5f3139242755884998a58" - integrity sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w== +"@babel/preset-env@7.6.3": + version "7.6.3" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271" + integrity sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-proposal-async-generator-functions" "^7.2.0" + "@babel/plugin-proposal-dynamic-import" "^7.5.0" "@babel/plugin-proposal-json-strings" "^7.2.0" - "@babel/plugin-proposal-object-rest-spread" "^7.4.4" + "@babel/plugin-proposal-object-rest-spread" "^7.6.2" "@babel/plugin-proposal-optional-catch-binding" "^7.2.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" + "@babel/plugin-proposal-unicode-property-regex" "^7.6.2" "@babel/plugin-syntax-async-generators" "^7.2.0" + "@babel/plugin-syntax-dynamic-import" "^7.2.0" "@babel/plugin-syntax-json-strings" "^7.2.0" "@babel/plugin-syntax-object-rest-spread" "^7.2.0" "@babel/plugin-syntax-optional-catch-binding" "^7.2.0" "@babel/plugin-transform-arrow-functions" "^7.2.0" - "@babel/plugin-transform-async-to-generator" "^7.4.4" + "@babel/plugin-transform-async-to-generator" "^7.5.0" "@babel/plugin-transform-block-scoped-functions" "^7.2.0" - "@babel/plugin-transform-block-scoping" "^7.4.4" - "@babel/plugin-transform-classes" "^7.4.4" + "@babel/plugin-transform-block-scoping" "^7.6.3" + "@babel/plugin-transform-classes" "^7.5.5" "@babel/plugin-transform-computed-properties" "^7.2.0" - "@babel/plugin-transform-destructuring" "^7.4.4" - "@babel/plugin-transform-dotall-regex" "^7.4.4" - "@babel/plugin-transform-duplicate-keys" "^7.2.0" + "@babel/plugin-transform-destructuring" "^7.6.0" + "@babel/plugin-transform-dotall-regex" "^7.6.2" + "@babel/plugin-transform-duplicate-keys" "^7.5.0" "@babel/plugin-transform-exponentiation-operator" "^7.2.0" "@babel/plugin-transform-for-of" "^7.4.4" "@babel/plugin-transform-function-name" "^7.4.4" "@babel/plugin-transform-literals" "^7.2.0" "@babel/plugin-transform-member-expression-literals" "^7.2.0" - "@babel/plugin-transform-modules-amd" "^7.2.0" - "@babel/plugin-transform-modules-commonjs" "^7.4.4" - "@babel/plugin-transform-modules-systemjs" "^7.4.4" + "@babel/plugin-transform-modules-amd" "^7.5.0" + "@babel/plugin-transform-modules-commonjs" "^7.6.0" + "@babel/plugin-transform-modules-systemjs" "^7.5.0" "@babel/plugin-transform-modules-umd" "^7.2.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.5" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.6.3" "@babel/plugin-transform-new-target" "^7.4.4" - "@babel/plugin-transform-object-super" "^7.2.0" + "@babel/plugin-transform-object-super" "^7.5.5" "@babel/plugin-transform-parameters" "^7.4.4" "@babel/plugin-transform-property-literals" "^7.2.0" "@babel/plugin-transform-regenerator" "^7.4.5" "@babel/plugin-transform-reserved-words" "^7.2.0" "@babel/plugin-transform-shorthand-properties" "^7.2.0" - "@babel/plugin-transform-spread" "^7.2.0" + "@babel/plugin-transform-spread" "^7.6.2" "@babel/plugin-transform-sticky-regex" "^7.2.0" "@babel/plugin-transform-template-literals" "^7.4.4" "@babel/plugin-transform-typeof-symbol" "^7.2.0" - "@babel/plugin-transform-unicode-regex" "^7.4.4" - "@babel/types" "^7.4.4" + "@babel/plugin-transform-unicode-regex" "^7.6.2" + "@babel/types" "^7.6.3" browserslist "^4.6.0" core-js-compat "^3.1.1" invariant "^2.2.2" js-levenshtein "^1.1.3" semver "^5.5.0" -"@babel/preset-react@7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0" - integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w== +"@babel/preset-react@7.6.3": + version "7.6.3" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.6.3.tgz#d5242c828322520205ae4eda5d4f4f618964e2f6" + integrity sha512-07yQhmkZmRAfwREYIQgW0HEwMY9GBJVuPY4Q12UC72AbfaawuupVWa8zQs2tlL+yun45Nv/1KreII/0PLfEsgA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-transform-react-display-name" "^7.0.0" @@ -760,30 +878,23 @@ "@babel/plugin-transform-react-jsx-self" "^7.0.0" "@babel/plugin-transform-react-jsx-source" "^7.0.0" -"@babel/preset-typescript@7.3.3": - version "7.3.3" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz#88669911053fa16b2b276ea2ede2ca603b3f307a" - integrity sha512-mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg== +"@babel/preset-typescript@7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.6.0.tgz#25768cb8830280baf47c45ab1a519a9977498c98" + integrity sha512-4xKw3tTcCm0qApyT6PqM9qniseCE79xGHiUnNdKGdxNsGUc2X7WwZybqIpnTmoukg3nhPceI5KPNzNqLNeIJww== dependencies: "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-transform-typescript" "^7.3.2" + "@babel/plugin-transform-typescript" "^7.6.0" -"@babel/runtime-corejs2@7.4.5": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.4.5.tgz#3d892f0560df21bafb384dd7727e33853e95d3c9" - integrity sha512-5yLuwzvIDecKwYMzJtiarky4Fb5643H3Ao5jwX0HrMR5oM5mn2iHH9wSZonxwNK0oAjAFUQAiOd4jT7/9Y2jMQ== +"@babel/runtime-corejs2@7.6.3": + version "7.6.3" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.6.3.tgz#de3f446b3fb688b98cbd220474d1a7cad909bcb8" + integrity sha512-nuA2o+rgX2+PrNTZ063ehncVcg7sn+tU71BB81SaWRVUbGwCOlb0+yQA1e0QqmzOfRSYOxfvf8cosYqFbJEiwQ== dependencies: core-js "^2.6.5" regenerator-runtime "^0.13.2" -"@babel/runtime@7.4.5": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12" - integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ== - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/runtime@^7.3.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3": +"@babel/runtime@7.6.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3": version "7.6.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz#935122c74c73d2240cafd32ddb5fc2a6cd35cf1f" integrity sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA== @@ -799,7 +910,16 @@ "@babel/parser" "^7.6.0" "@babel/types" "^7.6.0" -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2", "@babel/traverse@^7.6.3": +"@babel/template@^7.7.0": + version "7.7.0" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.0.tgz#4fadc1b8e734d97f56de39c77de76f2562e597d0" + integrity sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/parser" "^7.7.0" + "@babel/types" "^7.7.0" + +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5", "@babel/traverse@^7.6.2", "@babel/traverse@^7.6.3": version "7.6.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.3.tgz#66d7dba146b086703c0fb10dd588b7364cec47f9" integrity sha512-unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw== @@ -814,6 +934,21 @@ globals "^11.1.0" lodash "^4.17.13" +"@babel/traverse@^7.7.0": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09" + integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw== + dependencies: + "@babel/code-frame" "^7.5.5" + "@babel/generator" "^7.7.2" + "@babel/helper-function-name" "^7.7.0" + "@babel/helper-split-export-declaration" "^7.7.0" + "@babel/parser" "^7.7.2" + "@babel/types" "^7.7.2" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.13" + "@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0", "@babel/types@^7.6.3": version "7.6.3" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.3.tgz#3f07d96f854f98e2fbd45c64b0cb942d11e8ba09" @@ -823,6 +958,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@babel/types@^7.7.0", "@babel/types@^7.7.2": + version "7.7.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.2.tgz#550b82e5571dcd174af576e23f0adba7ffc683f7" + integrity sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA== + dependencies: + esutils "^2.0.2" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + "@csstools/convert-colors@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" @@ -864,10 +1008,10 @@ resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.3.tgz#a166882c81c0c6040975dd30df24fae8549bd96f" integrity sha512-14ZVlsB9akwvydAdaEnVnvqu6J2P6ySv39hYyl/aoB6w/V+bXX0tay8cF6paqbgZsN2n5Xh15uF4pE+GvE+itw== -"@emotion/is-prop-valid@0.8.3": - version "0.8.3" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.3.tgz#cbe62ddbea08aa022cdf72da3971570a33190d29" - integrity sha512-We7VBiltAJ70KQA0dWkdPMXnYoizlxOXpvtjmu5/MBnExd+u0PGgV27WCYanmLAbCwAU30Le/xA0CQs/F/Otig== +"@emotion/is-prop-valid@0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.5.tgz#2dda0791f0eafa12b7a0a5b39858405cc7bde983" + integrity sha512-6ZODuZSFofbxSbcxwsFz+6ioPjb0ISJRRPLZ+WIbjcU2IMU0Io+RGQjjaTgOvNQl007KICBm7zXQaYQEC1r6Bg== dependencies: "@emotion/memoize" "0.7.3" @@ -887,28 +1031,39 @@ "@emotion/utils" "0.11.2" csstype "^2.5.7" +"@emotion/serialize@^0.11.14": + version "0.11.14" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.14.tgz#56a6d8d04d837cc5b0126788b2134c51353c6488" + integrity sha512-6hTsySIuQTbDbv00AnUO6O6Xafdwo5GswRlMZ5hHqiFx+4pZ7uGWXUQFW46Kc2taGhP89uXMXn/lWQkdyTosPA== + dependencies: + "@emotion/hash" "0.7.3" + "@emotion/memoize" "0.7.3" + "@emotion/unitless" "0.7.4" + "@emotion/utils" "0.11.2" + csstype "^2.5.7" + "@emotion/sheet@0.9.3": version "0.9.3" resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.3.tgz#689f135ecf87d3c650ed0c4f5ddcbe579883564a" integrity sha512-c3Q6V7Df7jfwSq5AzQWbXHa5soeE4F5cbqi40xn0CzXxWW9/6Mxq48WJEtqfWzbZtW9odZdnRAkwCQwN12ob4A== -"@emotion/styled-base@^10.0.22": - version "10.0.22" - resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.22.tgz#2b6e86e477ed81bd74aa6cef5f403d500503df5b" - integrity sha512-ikSuAcz86BcmlZM5EysqCH0EUssYm5ardrWNVM3Ri5ODpOlKPrT//jVozJU2uK3q5GRcqZHLqagP/nd9beNUfQ== +"@emotion/styled-base@^10.0.23": + version "10.0.24" + resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.24.tgz#9497efd8902dfeddee89d24b0eeb26b0665bfe8b" + integrity sha512-AnBImerf0h4dGAJVo0p0VE8KoAns71F28ErGFK474zbNAHX6yqSWQUasb+1jvg/VPwZjCp19+tAr6oOB0pwmLQ== dependencies: "@babel/runtime" "^7.5.5" - "@emotion/is-prop-valid" "0.8.3" - "@emotion/serialize" "^0.11.12" + "@emotion/is-prop-valid" "0.8.5" + "@emotion/serialize" "^0.11.14" "@emotion/utils" "0.11.2" -"@emotion/styled@^10.0.22": - version "10.0.22" - resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.22.tgz#ee398710876ebda5a418f84359516c6a1c5c41b1" - integrity sha512-3+dnBk8NjXnddI8Gi2VJLMmup0bCG8HQkZLaeNky+GSLl8VyxQfuaK5I5aDVvgQ3UzkxrcZrFB3vHYU/iUakBA== +"@emotion/styled@^10.0.23": + version "10.0.23" + resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-10.0.23.tgz#2f8279bd59b99d82deade76d1046249ddfab7c1b" + integrity sha512-gNr04eqBQ2iYUx8wFLZDfm3N8/QUOODu/ReDXa693uyQGy2OqA+IhPJk+kA7id8aOfwAsMuvZ0pJImEXXKtaVQ== dependencies: - "@emotion/styled-base" "^10.0.22" - babel-plugin-emotion "^10.0.22" + "@emotion/styled-base" "^10.0.23" + babel-plugin-emotion "^10.0.23" "@emotion/stylis@0.8.4": version "0.8.4" @@ -930,39 +1085,36 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.4.tgz#622a72bebd1e3f48d921563b4b60a762295a81fc" integrity sha512-6PYY5DVdAY1ifaQW6XYTnOMihmBVT27elqSjEoodchsGjzYlEsTQMcEhSud99kVawatyTZRTiVkJ/c6lwbQ7nA== -"@material-ui/core@^4.5.0": - version "4.5.1" - resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.5.1.tgz#6f1bbb298cc2893b29169ab9398a00ca5a6ac971" - integrity sha512-6pyk7diT7bflf4qUpqgPCpKYqjhRHPFwsgEV2Gv71lMqwxuRygFGHE2TdZ+l5T249H66Doj2P/j6fW7yzgxTWw== +"@material-ui/core@^4.6.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.6.0.tgz#098a61d2af1778433d2d9a76de95be5f6aa87922" + integrity sha512-nzD0oO3R2dcX/+hmi5FUFSddMKySK76Ryuno3J/iOotbKvzXwbf9szzhL8KPNmsj+vizVNfkEfhzOuuCHRBKKQ== dependencies: "@babel/runtime" "^7.4.4" - "@material-ui/styles" "^4.5.0" - "@material-ui/system" "^4.5.0" + "@material-ui/styles" "^4.6.0" + "@material-ui/system" "^4.5.2" "@material-ui/types" "^4.1.1" - "@material-ui/utils" "^4.4.0" + "@material-ui/utils" "^4.5.2" "@types/react-transition-group" "^4.2.0" clsx "^1.0.2" convert-css-length "^2.0.1" - deepmerge "^4.0.0" hoist-non-react-statics "^3.2.1" - is-plain-object "^3.0.0" normalize-scroll-left "^0.2.0" popper.js "^1.14.1" prop-types "^15.7.2" react-transition-group "^4.3.0" -"@material-ui/styles@^4.5.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.5.0.tgz#4e591b8d44c7ecce318634bd8ac652499b6c277a" - integrity sha512-O0NSAECHK9f3DZK6wy56PZzp8b/7KSdfpJs8DSC7vnXUAoMPCTtchBKLzMtUsNlijiJFeJjSxNdQfjWXgyur5A== +"@material-ui/styles@^4.6.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.6.0.tgz#15679fab6dcbe0cc2416f01a22966f3ea26607c5" + integrity sha512-lqqh4UEMdIYcU1Yth4pQyMTah02uAkg3NOT3MirN9FUexdL8pNA6zCHigEgDSfwmvnXyxHhxTkphfy0DRfnt9w== dependencies: "@babel/runtime" "^7.4.4" "@emotion/hash" "^0.7.1" "@material-ui/types" "^4.1.1" - "@material-ui/utils" "^4.1.0" + "@material-ui/utils" "^4.5.2" clsx "^1.0.2" csstype "^2.5.2" - deepmerge "^4.0.0" hoist-non-react-statics "^3.2.1" jss "^10.0.0" jss-plugin-camel-case "^10.0.0" @@ -974,13 +1126,13 @@ jss-plugin-vendor-prefixer "^10.0.0" prop-types "^15.7.2" -"@material-ui/system@^4.5.0": - version "4.5.1" - resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.5.1.tgz#d2d249667ca7ee8ff9f93517c06ee41eb89729de" - integrity sha512-M72CGz3MYxXTFLet2qWmQDBXZdtF7JKGqYaf7t9MPDYD6WYG6wKM2hUbgUtRKOwls8ZBXQGKsiAX8K4v5pXSPw== +"@material-ui/system@^4.5.2": + version "4.5.2" + resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.5.2.tgz#7143bd8422a3f33f435c23f378136254004bbd60" + integrity sha512-h9RWvdM9XKlHHqwiuhyvWdobptQkHli+m2jJFs7i1AI/hmGsIc4reDmS7fInhETgt/Txx7uiAIznfRNIIVHmQw== dependencies: "@babel/runtime" "^7.4.4" - deepmerge "^4.0.0" + "@material-ui/utils" "^4.5.2" prop-types "^15.7.2" "@material-ui/types@^4.1.1": @@ -990,10 +1142,10 @@ dependencies: "@types/react" "*" -"@material-ui/utils@^4.1.0", "@material-ui/utils@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.4.0.tgz#9275421e2798a067850d201212d46f12725828ad" - integrity sha512-UXoQVwArQEQWXxf2FPs0iJGT+MePQpKr0Qh0CPoLc1OdF0GSMTmQczcqCzwZkeHxHAOq/NkIKM1Pb/ih1Avicg== +"@material-ui/utils@^4.5.2": + version "4.5.2" + resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.5.2.tgz#4c2fb531d357cf0da8cece53b588dff9b0bde934" + integrity sha512-zhbNfHd1gLa8At6RPDG7uMZubHxbY+LtM6IkSfeWi6Lo4Ax80l62YaN1QmUpO1IvGCkn/j62tQX3yObiQZrJsQ== dependencies: "@babel/runtime" "^7.4.4" prop-types "^15.7.2" @@ -1181,11 +1333,16 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node@*", "@types/node@^12.11.7": +"@types/node@*": version "12.11.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a" integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA== +"@types/node@^12.12.6": + version "12.12.6" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.6.tgz#a47240c10d86a9a57bb0c633f0b2e0aea9ce9253" + integrity sha512-FjsYUPzEJdGXjwKqSpE0/9QEh6kzhTAeObA54rn6j3rR4C/mzpI9L0KNfoeASSPMMdxIsoJuCLDWcM/rVjIsSA== + "@types/nprogress@^0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@types/nprogress/-/nprogress-0.2.0.tgz#86c593682d4199212a0509cc3c4d562bbbd6e45f" @@ -1213,10 +1370,10 @@ dependencies: "@types/react" "*" -"@types/react-dom@^16.9.1": - version "16.9.3" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.3.tgz#4006ff0e13958af91313869077c04cb20d9b9d04" - integrity sha512-FUuZKXPr9qlzUT9lhuzrZgLjH63TvNn28Ch3MvKG4B+F52zQtO8DtE0Opbncy3xaucNZM2WIPfuNTgkbKx5Brg== +"@types/react-dom@^16.9.4": + version "16.9.4" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.4.tgz#0b58df09a60961dcb77f62d4f1832427513420df" + integrity sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw== dependencies: "@types/react" "*" @@ -1240,46 +1397,47 @@ resolved "https://registry.yarnpkg.com/@types/smoothscroll-polyfill/-/smoothscroll-polyfill-0.3.1.tgz#77fb3a6e116bdab4a5959122e3b8e201224dcd49" integrity sha512-+KkHw4y+EyeCtVXET7woHUhIbfWFCflc0E0mZnSV+ZdjPQeHt/9KPEuT7gSW/kFQ8O3EG30PLO++YhChDt8+Ag== -"@typescript-eslint/eslint-plugin@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.5.0.tgz#101d96743ce3365b3223df73d641078c9b775903" - integrity sha512-ddrJZxp5ns1Lh5ofZQYk3P8RyvKfyz/VcRR4ZiJLHO/ljnQAO8YvTfj268+WJOOadn99mvDiqJA65+HAKoeSPA== +"@typescript-eslint/eslint-plugin@^2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.6.1.tgz#e34972a24f8aba0861f9ccf7130acd74fd11e079" + integrity sha512-Z0rddsGqioKbvqfohg7BwkFC3PuNLsB+GE9QkFza7tiDzuHoy0y823Y+oGNDzxNZrYyLjqkZtCTl4vCqOmEN4g== dependencies: - "@typescript-eslint/experimental-utils" "2.5.0" + "@typescript-eslint/experimental-utils" "2.6.1" eslint-utils "^1.4.2" functional-red-black-tree "^1.0.1" regexpp "^2.0.1" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.5.0.tgz#383a97ded9a7940e5053449f6d73995e782b8fb1" - integrity sha512-UgcQGE0GKJVChyRuN1CWqDW8Pnu7+mVst0aWrhiyuUD1J9c+h8woBdT4XddCvhcXDodTDVIfE3DzGHVjp7tUeQ== +"@typescript-eslint/experimental-utils@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.6.1.tgz#eddaca17a399ebf93a8628923233b4f93793acfd" + integrity sha512-EVrrUhl5yBt7fC7c62lWmriq4MIc49zpN3JmrKqfiFXPXCM5ErfEcZYfKOhZXkW6MBjFcJ5kGZqu1b+lyyExUw== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.5.0" + "@typescript-eslint/typescript-estree" "2.6.1" eslint-scope "^5.0.0" -"@typescript-eslint/parser@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.5.0.tgz#858030ddd808fbbe88e03f42e5971efaccb8218a" - integrity sha512-9UBMiAwIDWSl79UyogaBdj3hidzv6exjKUx60OuZuFnJf56tq/UMpdPcX09YmGqE8f4AnAueYtBxV8IcAT3jdQ== +"@typescript-eslint/parser@^2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.6.1.tgz#3c00116baa0d696bc334ca18ac5286b34793993c" + integrity sha512-PDPkUkZ4c7yA+FWqigjwf3ngPUgoLaGjMlFh6TRtbjhqxFBnkElDfckSjm98q9cMr4xRzZ15VrS/xKm6QHYf0w== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.5.0" - "@typescript-eslint/typescript-estree" "2.5.0" + "@typescript-eslint/experimental-utils" "2.6.1" + "@typescript-eslint/typescript-estree" "2.6.1" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.5.0.tgz#40ada624d6217ef092a3a79ed30d947ad4f212ce" - integrity sha512-AXURyF8NcA3IsnbjNX1v9qbwa0dDoY9YPcKYR2utvMHoUcu3636zrz0gRWtVAyxbPCkhyKuGg6WZIyi2Fc79CA== +"@typescript-eslint/typescript-estree@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.6.1.tgz#fb363dd4ca23384745c5ea4b7f4c867432b00d31" + integrity sha512-+sTnssW6bcbDZKE8Ce7VV6LdzkQz2Bxk7jzk1J8H1rovoTxnm6iXvYIyncvNsaB/kBCOM63j/LNJfm27bNdUoA== dependencies: debug "^4.1.1" glob "^7.1.4" is-glob "^4.0.1" lodash.unescape "4.0.1" semver "^6.3.0" + tsutils "^3.17.1" "@webassemblyjs/ast@1.8.5": version "1.8.5" @@ -1768,6 +1926,22 @@ babel-plugin-emotion@^10.0.22: find-root "^1.1.0" source-map "^0.5.7" +babel-plugin-emotion@^10.0.23: + version "10.0.23" + resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.23.tgz#040d40bf61dcab6d31dd6043d10e180240b8515b" + integrity sha512-1JiCyXU0t5S2xCbItejCduLGGcKmF3POT0Ujbexog2MI4IlRcIn/kWjkYwCUZlxpON0O5FC635yPl/3slr7cKQ== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@emotion/hash" "0.7.3" + "@emotion/memoize" "0.7.3" + "@emotion/serialize" "^0.11.14" + 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-macros@^2.0.0: version "2.6.1" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz#41f7ead616fc36f6a93180e89697f69f51671181" @@ -2695,11 +2869,6 @@ deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= -deepmerge@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.1.tgz#018a3e5dfe82b95e35e36a9a29ba15ddb194e40f" - integrity sha512-32P7FIV6JKt0hPMFNlWFytzVGpppYHFKdnhFUEMXheWc8Lw4HnHEzJa5yxhaQedDAXv2SI6zD7+UbqnC5k9g9Q== - defaults@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" @@ -3557,7 +3726,7 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.5: +glob@^7.0.3, glob@^7.1.3, glob@^7.1.4: version "7.1.5" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0" integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ== @@ -3569,6 +3738,18 @@ glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.5: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + globals@^11.1.0, globals@^11.7.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -4063,13 +4244,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-plain-object@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz#47bfc5da1b5d50d64110806c199359482e75a928" - integrity sha512-tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg== - dependencies: - isobject "^4.0.0" - is-promise@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" @@ -4104,6 +4278,11 @@ is-windows@^1.0.2: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== +is-wsl@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d" + integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog== + is-wsl@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" @@ -4131,11 +4310,6 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -isobject@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0" - integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA== - jest-worker@24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5" @@ -4466,10 +4640,10 @@ lru-cache@5.1.1, lru-cache@^5.1.1: dependencies: yallist "^3.0.2" -luxon@^1.19.3: - version "1.19.3" - resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.19.3.tgz#86c04a1395529b4386ae235a8fe16d0a82a0695b" - integrity sha512-YwTDjGRQC0QC9Iya2g2eKZfgEFqRId4ZoLHORQcfTMB/5xrTx427V7ZPjQJ1vzvhA2vJfG2bh1Kv8V8IFMWCUA== +luxon@^1.21.1: + version "1.21.1" + resolved "https://registry.yarnpkg.com/luxon/-/luxon-1.21.1.tgz#00c9c9e624e66cfef745a8476c4ead14a3966a61" + integrity sha512-3zxaKX7mj7eA80TU0sm4CfNEtiUZ2QXGjMc80rfG4d1dOnnOOWz63U9j4nYR7+1w716DYtWfdOeVhDXYlH+D4w== make-dir@^1.0.0: version "1.3.0" @@ -4818,23 +4992,23 @@ neo-async@^2.5.0, neo-async@^2.6.1: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== -next@9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/next/-/next-9.1.1.tgz#bede2e834548020bc4d3be0c46e3ed7edaac6d14" - integrity sha512-++jiUA1GN/dOqe6+oLT78rdrRnPmf5yHUbug1tdZBYeQ6HE+ypDIeVelmCmyGx+JDNB3TcxNx5R2+D/Cbrwnng== +next@9.1.2: + version "9.1.2" + resolved "https://registry.yarnpkg.com/next/-/next-9.1.2.tgz#ed708301c8265c36006f28672904715e5c592420" + integrity sha512-AQoyCOYMPyttZl7Qvyfnku3SkG6c/jJe7fvTEsYGJ3CJFj0fQALoDZg7Wv+nMvzQR+h2MZUUWyaoFURPBxEd4A== dependencies: - "@ampproject/toolbox-optimizer" "1.0.1" - "@babel/core" "7.4.5" - "@babel/plugin-proposal-class-properties" "7.4.4" - "@babel/plugin-proposal-object-rest-spread" "7.4.4" + "@ampproject/toolbox-optimizer" "1.1.1" + "@babel/core" "7.6.4" + "@babel/plugin-proposal-class-properties" "7.5.5" + "@babel/plugin-proposal-object-rest-spread" "7.6.2" "@babel/plugin-syntax-dynamic-import" "7.2.0" - "@babel/plugin-transform-modules-commonjs" "7.4.4" - "@babel/plugin-transform-runtime" "7.4.4" - "@babel/preset-env" "7.4.5" - "@babel/preset-react" "7.0.0" - "@babel/preset-typescript" "7.3.3" - "@babel/runtime" "7.4.5" - "@babel/runtime-corejs2" "7.4.5" + "@babel/plugin-transform-modules-commonjs" "7.6.0" + "@babel/plugin-transform-runtime" "7.6.2" + "@babel/preset-env" "7.6.3" + "@babel/preset-react" "7.6.3" + "@babel/preset-typescript" "7.6.0" + "@babel/runtime" "7.6.3" + "@babel/runtime-corejs2" "7.6.3" amphtml-validator "1.0.23" async-retry "1.2.3" async-sema "3.0.0" @@ -4860,6 +5034,7 @@ next@9.1.1: fresh "0.5.2" ignore-loader "0.1.2" is-docker "2.0.0" + is-wsl "2.1.1" jest-worker "24.9.0" launch-editor "2.2.1" loader-utils "1.2.3" @@ -4887,6 +5062,7 @@ next@9.1.1: terser "4.0.0" unfetch "4.1.0" url "0.11.0" + use-subscription "1.1.1" watchpack "2.0.0-beta.5" webpack "4.39.0" webpack-dev-middleware "3.7.0" @@ -5877,6 +6053,11 @@ prettier@^1.17.1, prettier@^1.18.2: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== +prism-react-renderer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.0.2.tgz#3bb9a6a42f76fc049b03266298c7068fdd4b7ea9" + integrity sha512-0++pJyRfu4v2OxI/Us/5RLui9ESDkTiLkVCtKuPZYdpB8UQWJpnJQhPrWab053XtsKW3oM0sD69uJ6N9exm1Ag== + private@^0.1.6: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" @@ -7106,10 +7287,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^3.7.1-rc: - version "3.7.1-rc" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.1-rc.tgz#2054b872d67f8dc732e36c1df397f9327f37ada0" - integrity sha512-2rMtWppLsaPvmpXsoIAXWDBQVnJMw1ITGGSnidMuayLj9iCmMRT69ncKZw/Mk5rXfJkilApKucWQZxproALoRw== +typescript@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb" + integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ== unfetch@4.1.0: version "4.1.0" @@ -7216,6 +7397,11 @@ url@0.11.0, url@^0.11.0: punycode "1.3.2" querystring "0.2.0" +use-subscription@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.1.1.tgz#5509363e9bb152c4fb334151d4dceb943beaa7bb" + integrity sha512-gk4fPTYvNhs6Ia7u8/+K7bM7sZ7O7AMfWtS+zPO8luH+zWuiGgGcrW0hL4MRWZSzXo+4ofNorf87wZwBKz2YdQ== + use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"