iss1757 - Add regex extractors

Author: EJMFarrow

corsscripts/ascii/extractors/regexall.js

@@ -0,0 +1,21 @@
+// Extractor: regexall
+// [[extractor targetinput="ans2" type="regexall" regex="^f\\(x\\)\\s*=\\s*" /]]
+// Searches the entire raw input for all lines matching entry.regex and returns
+// a JSON object of the form {"matches":[...]} set as answerEl.value.
+export default function regexall(raw, answerEl, blocks, entry) {
+    if (!entry || !entry.regex) {
+        return;
+    }
+    const pattern = new RegExp(entry.regex);
+    const matches = [];
+
+    for (const line of raw.split('\n')) {
+        const trimmed = line.trim();
+        if (trimmed && pattern.test(trimmed)) {
+            matches.push(trimmed);
+        }
+    }
+
+    answerEl.value = JSON.stringify({ matches });
+    answerEl.dispatchEvent(new Event('change'));
+}

corsscripts/ascii/extractors/regexmatch.js

@@ -1,4 +1,7 @@
 // Extractor: regexmatch
+// [[extractor targetinput="ans2" type="regexmatch" regex="^f\\(x\\)\\s*=\\s*" /]]
+// Note the scaped backslashes. Searches for a trimmed line beginning 'f(x) = ' where
+// there can be any amount of whitespace around the equals. Returns 'f(x) = expr'.
 // Scans blocks (bottom-up) for the last code_inline or asciimath_block line
 // matching entry.regex, then sets answerEl.value to the matched string.
 export default function regexmatch(raw, answerEl, blocks, entry) {
@@ -13,7 +16,7 @@ export default function regexmatch(raw, answerEl, blocks, entry) {
             if (block.type === 'code_inline') {
                 const trimmed = block.raw.trim();
                 if (pattern.test(trimmed)) {
-                    answerEl.value = trimmed.match(pattern)[0];
+                    answerEl.value = trimmed;
                     answerEl.dispatchEvent(new Event('change'));
                     return;
                 }
@@ -23,7 +26,7 @@ export default function regexmatch(raw, answerEl, blocks, entry) {
                 for (let j = lines.length - 1; j >= 0; j--) {
                     const trimmed = lines[j].trim();
                     if (pattern.test(trimmed)) {
-                        answerEl.value = trimmed.match(pattern)[0];
+                        answerEl.value = trimmed;
                         answerEl.dispatchEvent(new Event('change'));
                         return;
                     }
@@ -39,7 +42,7 @@ export default function regexmatch(raw, answerEl, blocks, entry) {
     for (const line of lines) {
         const trimmed = line.trim();
         if (pattern.test(trimmed)) {
-            answerEl.value = trimmed.match(pattern)[0];
+            answerEl.value = trimmed;
             answerEl.dispatchEvent(new Event('change'));
             return;
         }

corsscripts/ascii/stackascii.bundle.js

@@ -18,13 +18,13 @@ import finalfunction from './extractors/finalfunction.js';
 import lastexpr from './extractors/lastexpr.js';
 import lastblock from './extractors/lastblock.js';
 import regexmatch from './extractors/regexmatch.js';
+import regexall from './extractors/regexall.js';
 
-const extractorlib = { finalfunction, lastexpr, lastblock, regexmatch };
+const extractorlib = { finalfunction, lastexpr, lastblock, regexmatch, regexall };
 
-export default function init(inputIds, filters, operatorsjson) {
+export default function init(inputIds, filters, operations) {
     const markdownContainerId = inputIds[0];
     // inputIds[1..N] correspond to each parsed answer entry in order.
-    const operations = JSON.parse(operatorsjson);
     const extractors = operations.filter(operator => operator.operation === 'extractor');
     const inputFilters = filters ? filters : 'latexwrap,boldfilter';
 

corsscripts/ascii/stackascii.bundle.js.map

@@ -113,7 +113,7 @@ public function compile($format, $options): ?MP_Node {
             return 'stack_js.request_access_to_input("' . $item . '"' . $extra . ')';
         }, $inputs, array_keys($inputs)));
         $linkcode = 'Promise.all([' . $answercalls . '])';
-        $linkcode .= ".then((inputIds) => {init(inputIds,'" . $xpars['filters'] . "','" . json_encode($operations) . "');});";
+        $linkcode .= ".then((inputIds) => {init(inputIds,'" . $xpars['filters'] . "'," . json_encode($operations) . ");});";
 
         $r->items[] = new MP_String($linkcode);
         $r->items[] = new MP_String("\n</script>");