cleanup

Author: Natoandro

src/typegraph/optimize/src/dedup.rs

@@ -158,9 +158,6 @@ impl DedupEngine {
                 "function".hash(&mut hasher);
                 // TODO do we need to deduplication functions??
                 idx.hash(&mut hasher);
-                // self.hash_type(data.input.into()).hash(&mut hasher);
-                // self.hash_type(data.output.into()).hash(&mut hasher);
-                // if let Some(pt) = data.
             }
 
             N::Any { .. } => unreachable!(),

src/typegraph/optimize/src/kosaraju.rs

@@ -34,8 +34,7 @@ impl KosarajuOne {
     }
 
     fn visit(&mut self, idx: TypeIdx) {
-        if self.is_visited(idx) {
-        } else {
+        if !self.is_visited(idx) {
             self.set_visited(idx);
             for v in self.tg.out_neighbours(&idx) {
                 self.visit(v);

tools/tree-view-web.ts

@@ -81,19 +81,25 @@ if (tgs.length === 0) {
 const byName: Map<string, TypeGraphDS> = new Map();
 
 for (const tg of tgs) {
+  const name = tg.types[0].title;
+  if (byName.has(name)) {
+    console.log(
+      `[warn] Duplicate typegraph name '${name}'. The older one will be dropped`,
+    );
+  }
   byName.set(tg.types[0].title, tg);
 }
 
 const router = new Router();
 
-const fsCache: Map<string, string> = new Map();
+const fsCache: Map<string, Uint8Array> = new Map();
 
 async function getDistFile(path: string) {
   const cached = fsCache.get(path);
   if (cached != null) {
     return cached;
   }
-  const value = await Deno.readTextFile(
+  const value = await Deno.readFile(
     `${projectDir}/tools/tree/dist/${path}`,
   );
   fsCache.set(path, value);
@@ -139,8 +145,19 @@ router.get("/api/typegraphs/:tgName/types/:typeIdx", (ctx) => {
     ctx.response.body = `typegraph "${ctx.params.tgName}" not found`;
     ctx.response.status = Status.NotFound;
   } else {
-    ctx.response.body = tg.types[+ctx.params.typeIdx];
-    ctx.response.type = "json";
+    const typeIdx = +ctx.params.typeIdx;
+    if (Number.isNaN(typeIdx)) {
+      ctx.response.body = `invalid type index "${ctx.params.typeIdx}"`;
+      ctx.response.status = Status.BadRequest;
+    }
+    const typeNode = tg.types[typeIdx];
+    if (typeNode == null) {
+      ctx.response.body = `type index out of bounds #${typeIdx}`;
+      ctx.response.status = Status.NotFound;
+    } else {
+      ctx.response.body = tg.types[+ctx.params.typeIdx];
+      ctx.response.type = "json";
+    }
   }
 });