@khanacademy/perseus 0.2.6 → 0.2.7

package/package.json

@@ -3,7 +3,7 @@
     "description": "Core Perseus API (includes renderers and widgets)",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "0.2.6",
+    "version": "0.2.7",
     "publishConfig": {
         "access": "public"
     },
@@ -24,7 +24,7 @@
         "@khanacademy/kmath": "^0.0.5",
         "@khanacademy/math-input": "^0.5.2",
         "@khanacademy/kas": "^0.2.4",
-        "@khanacademy/simple-markdown": "^0.8.2",
+        "@khanacademy/simple-markdown": "^0.8.3",
         "mathquill": "git+https://git@github.com/Khan/mathquill.git#a9ae54e057c5c1acc8244a5627acbff29901d992"
     },
     "devDependencies": {

package/src/__tests__/jipt-paragraphs_test.js

@@ -0,0 +1,34 @@
+// @flow
+
+import JiptParagraphs from "../jipt-paragraphs.js";
+
+const {parseToArray} = JiptParagraphs;
+
+describe("jipt-paragraphs", () => {
+    it("should split paragraphs using custom JIPT SimpleMarkdown rules", () => {
+        expect(parseToArray("  \n\nhello\n\n")).toMatchInlineSnapshot(`
+            Array [
+              "  ",
+              "hello",
+            ]
+        `);
+    });
+
+    it("should recognize code fences using custom JIPT SimpleMarkdown rules", () => {
+        expect(
+            parseToArray(
+                "Let's write the canonical Hello World in Javascript\n\n" +
+                    '```js\nconst x = "hello world";\nconsole.log(x);```\n\n' +
+                    "**Congratulations, you are on your way to becoming a " +
+                    "computer programmer!",
+            ),
+        ).toMatchInlineSnapshot(`
+            Array [
+              "Let's write the canonical Hello World in Javascript",
+              "const x = \\"hello world\\";
+            console.log(x);",
+              "**Congratulations, you are on your way to becoming a computer programmer!",
+            ]
+        `);
+    });
+});

package/src/jipt-paragraphs.js

@@ -11,28 +11,36 @@ const arrayRules: ParserRules = {
     fence: {
         match: SimpleMarkdown.defaultRules.fence.match,
         order: 1,
-        // $FlowFixMe[incompatible-type]
-        parse: (capture, state, parse) => capture[3],
+        parse: (capture, state, parse) => ({
+            type: "codeBlock",
+            lang: capture[2] || undefined,
+            content: capture[3],
+        }),
     },
     paragraph: {
         match: SimpleMarkdown.defaultRules.paragraph.match,
         order: 2,
-        // $FlowFixMe[incompatible-type]
-        parse: (capture, state, parse) => capture[1],
+        parse: (capture, state, parse) => ({
+            content: capture[1],
+        }),
     },
 };
 
-// $FlowFixMe[prop-missing]
-const builtArrayParser = SimpleMarkdown.parserFor(arrayRules);
+const builtArrayParser: $Call<
+    typeof SimpleMarkdown.parserFor,
+    typeof arrayRules,
+> = SimpleMarkdown.parserFor(arrayRules);
 
 // This should just return an array of strings! magick!
-const parseToArray = (source: string): $FlowFixMe => {
+const parseToArray = (source: string): Array<string> => {
     // Remove any leading newlines to avoid splitting weirdness
     // (simple-markdown has the `newline` rule for this, and i have
     // no idea how this will handle leading newlines without that rule),
     // and add \n\n to let it parse at a block/paragraph level
     const paragraphedSource = source.replace(/^\n\s*\n/, "") + "\n\n";
-    return builtArrayParser(paragraphedSource, {inline: false});
+    return builtArrayParser(paragraphedSource, {inline: false}).map((c) => {
+        return c["content"];
+    });
 };
 
 const joinFromArray = (paragraphs: $ReadOnlyArray<string>): string =>