url param for starting function

Author: whyboris

bin/cascade.js

@@ -60,15 +60,16 @@ function generateNextLevel(parents, stackDepth) {
 /**
  * Convert the call map to format D3 wants
  * @param calledFunctions
+ * @param startFunction -- string of the function name we want to use as start of call graph
  */
-function convertForCascade(calledFunctions) {
+function convertForCascade(calledFunctions, startFunction) {
     myMap = calledFunctions;
     final = [];
     calledAlready = [];
     // 1st case -- handle manually
-    final.push([{ id: 'proceed' }]);
+    final.push([{ id: startFunction }]);
     // all next cases generate automatically
-    generateNextLevel(['proceed'], 10);
+    generateNextLevel([startFunction], 10);
     return final;
 }
 exports.convertForCascade = convertForCascade;

bin/index.js

@@ -52,7 +52,9 @@ function startServer(allFunctions, functionMap) {
     app.use('/mermaid', express.static(path.join(__dirname, '..', 'graphing/mermaid')));
     app.use('/vendor', express.static(path.join(__dirname, '..', 'graphing/vendor')));
     app.get('/arcAPI', function (req, res) { res.json(arc_1.convertForArc(allFunctions, functionMap)); });
-    app.get('/cascadeAPI', function (req, res) { res.json(cascade_1.convertForCascade(functionMap)); });
+    app.get('/cascadeAPI/:startFunc', function (req, res) {
+        res.json(cascade_1.convertForCascade(functionMap, req.params.startFunc));
+    });
     app.get('/graphvizAPI', function (req, res) { res.json(graphviz_1.convertForGraphViz(functionMap)); });
     app.get('/mermaidAPI', function (req, res) { res.json(mermaid_1.convertForMermaid(functionMap)); });
     app.listen(3000);

cascade.ts

@@ -69,16 +69,17 @@ function generateNextLevel(parents: string[], stackDepth: number): void {
 /**
  * Convert the call map to format D3 wants
  * @param calledFunctions
+ * @param startFunction -- string of the function name we want to use as start of call graph
  */
-export function convertForCascade(calledFunctions: Map<string, string[]>) {
+export function convertForCascade(calledFunctions: Map<string, string[]>, startFunction: string) {
   myMap = calledFunctions;
   final = [];
   calledAlready = [];
 
   // 1st case -- handle manually
-  final.push([{ id: 'proceed' }]);
+  final.push([{ id: startFunction }]);
   // all next cases generate automatically
-  generateNextLevel(['proceed'], 10);
+  generateNextLevel([startFunction], 10);
 
   return final;
 }

graphing/cascade/graph.js

@@ -2,7 +2,20 @@
 export default function define(runtime, observer) {
   const main = runtime.module();
 
-  main.builtin("FileAttachment", runtime.fileAttachments(() => new URL("http://localhost:3000/cascadeAPI", import.meta.url)));
+  let graphData;
+
+  const queryString = window.location.search;
+  const urlParams = new URLSearchParams(queryString);
+  const startFunction = urlParams.get('start')
+
+  fetch('http://localhost:3000/cascadeAPI/' + startFunction)
+    .then((response) => {
+      return response.json();
+    })
+    .then((data) => {
+      graphData = data;
+    });
+
 
   main.variable(observer()).define(["html"], function(html) {
     return (
@@ -64,13 +77,7 @@ export default function define(runtime, observer) {
 
   main.variable(observer("data")).define("data", ["d3"], function (d3) {
 
-    // console.log(main);
-    // console.log(main._scope.get('temporaryHackName')._value);
-    // levels = JSON.parse('[[{"id":"abc"}],[{"id":"abc2","parents":["abc"]},{"id":"abc3"}],[{"id": "lol", "parents": ["abc3", "abc2"]}]]');
-
-    let levels = main._scope.get('temporaryHackName')._value;
-
-    // console.log(levels);
+    let levels = graphData;
 
     // precompute level depth
     levels.forEach((l, i) => l.forEach((n) => (n.level = i)));
@@ -242,9 +249,5 @@ export default function define(runtime, observer) {
     return require("d3-scale", "d3-scale-chromatic", "d3-array");
   });
 
-  main.variable(observer()).define("temporaryHackName", ["FileAttachment"], function (lol) {
-    return lol().json()
-  });
-
   return main;
 }

graphing/index.html

@@ -13,7 +13,7 @@ <h2>
     WELCOME !!!
   </h2>
 
-  <a href="cascade/index.html">Cascade</a>
+  <a href="cascade/index.html?start=proceed">Cascade</a>
 
   <br>
 

index.ts

@@ -68,8 +68,13 @@ function startServer(allFunctions: string[], functionMap: Map<string, string[]>)
   app.use('/vendor',   express.static(path.join(__dirname, '..', 'graphing/vendor')));
 
   app.get('/arcAPI',      function (req, res) { res.json(convertForArc(allFunctions, functionMap)) });
-  app.get('/cascadeAPI',  function (req, res) { res.json(convertForCascade(functionMap))  });
+
+  app.get('/cascadeAPI/:startFunc',  function (req, res) {
+    res.json(convertForCascade(functionMap, req.params.startFunc))
+  });
+
   app.get('/graphvizAPI', function (req, res) { res.json(convertForGraphViz(functionMap)) });
+
   app.get('/mermaidAPI',  function (req, res) { res.json(convertForMermaid(functionMap)) });
 
   app.listen(3000)