Merge pull request #399 from netux/feat/editor-compile-subroutines-in…

…-actions Include subroutines used in actions in the compiled output of the Editor
Mitcheljager · Jan 22, 2024 · 0ef2288 · 0ef2288
2 parents 475a01b + 000373a
commit 0ef2288
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/app/javascript/src/utils/compiler/subroutines.js b/app/javascript/src/utils/compiler/subroutines.js
@@ -10,7 +10,9 @@ ${ subroutines.map((v, i) => `    ${ i }: ${ v }`).join("\n") }
 }
 
 export function getSubroutines(joinedItems) {
-  let subroutines = joinedItems.match(/Subroutine;[\r\n]+([^\r\n;]+)/g) || []
-  subroutines = subroutines.map(s => s.replace("Subroutine;\n", "").replace("Call Subroutine", "").replace(/[\())\s]/g, ""))
-  return [...new Set(subroutines)]
+  const declaredSubroutines = Array.from(joinedItems.matchAll(/Subroutine;[\r\n]+([^\r\n;]+)/g))
+    .map((match) => match[1].trim())
+  const usedSubroutines = Array.from(joinedItems.matchAll(/(?:Call Subroutine|Start Rule)\s*\(([^,\)]+)/g))
+    .map((match) => match[1].trim())
+  return [...new Set([...declaredSubroutines, ...usedSubroutines])]
 }
diff --git a/spec/javascript/utils/compiler/subroutines.test.js b/spec/javascript/utils/compiler/subroutines.test.js
@@ -3,7 +3,7 @@ import { disregardWhitespace } from "../../helpers/text"
 
 describe("subroutines.js", () => {
   describe("getSubroutines", () => {
-    test("Should extract subroutines", () => {
+    test("Should extract subroutines declared from rules", () => {
       const input = `
         Subroutine;
         someSubroutine1;
@@ -15,13 +15,27 @@ describe("subroutines.js", () => {
       expect(getSubroutines(input)).toEqual(expectedOutput)
     })
 
+    test("Should extract subroutines used in actions", () => {
+      const input = `
+        Call Subroutine(someSubroutine1);
+
+        Start Rule(someSubroutine2, OtherParamIdk);
+      `
+      const expectedOutput = ["someSubroutine1", "someSubroutine2"]
+      expect(getSubroutines(input)).toEqual(expectedOutput)
+    })
+
     test("Should handle duplicate subroutines", () => {
       const input = `
         Subroutine;
         someSubroutine;
 
         Subroutine;
         someSubroutine;
+
+        Call Subroutine(someSubroutine);
+
+        Start Rule(someSubroutine, OtherParamIdk);
       `
       const expectedOutput = ["someSubroutine"]
       expect(getSubroutines(input)).toEqual(expectedOutput)
@@ -32,11 +46,14 @@ describe("subroutines.js", () => {
     test("Should compile subroutines", () => {
       const input = `
         Subroutine;
-        someSubroutine;
+        someSubroutine1;
+
+        Call Subroutine(someSubroutine2);
       `
       const expectedOutput = `
         subroutines {
-          0: someSubroutine
+          0: someSubroutine1
+          1: someSubroutine2
         }\n\n
       `
       expect(disregardWhitespace(compileSubroutines(input))).toBe(disregardWhitespace(expectedOutput))