X-Git-Url: https://dreyeck.freedombox.rocks/gitweb/idiomatic.git/blobdiff_plain/7d3a9854e6d5e13961db099f73efc29cda4d68bb..da0744c9c33ae9440765aecde2faf00f7187032f:/index.js?ds=sidebyside

diff --git a/index.js b/index.js
index b8d5a57..76c9158 100644
--- a/index.js
+++ b/index.js
@@ -37,7 +37,7 @@ app.get('/index', async (req,res,next) => {
   console.log(new Date().toLocaleTimeString(), 'index')
   const reductions = counter()
   const doit = branch => {reductions.count(branch.type)}
-  visitor.wander(mods,doit)
+  visitor.walk(mods,doit)
   const result = `
     <p>${reductions.size()} non-terminals
     <br>${reductions.total()} reductions
@@ -59,7 +59,7 @@ app.get('/terminal', (req,res) => {
   const {type,field} = req.query
   const lits = counter()
   const doit = branch => {if(branch.type==type) lits.count(branch[field])}
-  visitor.wander(mods,doit)
+  visitor.walk(mods,doit)
   const result = style('terminal',type)+`
     <p>${lits.size()} uniques
     <br>${lits.total()} total
@@ -75,12 +75,11 @@ app.get('/usage', (req,res) => {
   const files = counter()
   const doit = (branch,stack) => {
     if(branch.type==type && branch[field]==key)list.push(`
-      <tr><td><a href="/nesting/?file=${files.count(stack.at(-1))}&type=${type}&start=${branch.start}&end=${branch.end}">
+      <tr><td><a href="/nesting/?file=${files.count(stack.at(-1))}&type=${type}&key=${key}&start=${branch.start}&end=${branch.end}">
       ${stack.at(-1)}</a>
       <td>${sxpr(stack[width ?? 2], depth ?? 3)}`)
   }
-  visitor.wander(mods,doit)
-  const vis = row => row.split(/\n/)[3].trim().replaceAll(/<.*?>/g,'').replaceAll(/\.\.+/g,'..')
+  visitor.walk(mods,doit)
   list.sort((a,b) => vis(a)>vis(b) ? 1 : -1)
   const q = (id,delta) => Object.entries(req.query)
     .map(([k,v]) => k == id ? `${k}=${+v+delta}` : `${k}=${v}`)
@@ -89,20 +88,20 @@ app.get('/usage', (req,res) => {
   const m = id => `<a href=/usage?${q(id,-1)} style="background-color:#ddd;">&nbsp;&minus;&nbsp;</a>`
   const d = id => `<span title=${req.query[id]}>${id} ${p(id)} ${m(id)}</span>`
   res.send(style('usage',key)+`
-    <p><table>${files.tally().map(([k,v]) => `<tr><td>${v}<td>${k}`).join("\n")}</table>
+    <p><details><summary>${files.total()} uses in ${files.size()} files</summary>
+      <table>${files.tally().map(([k,v]) => `<tr><td>${v}<td>${k}`).join("\n")}</table></details>
     <p><section>— ${d('width')} ${d('depth')} —</section>
     <p><table>${list.join("\n")}</table>`)
 })
 
 app.get('/nesting', (req,res) => {
-  const {file,type,start,end} = req.query
+  const {file,type,key,start,end} = req.query
   const result = []
   const doit = (branch,stack) => {
     if(stack.at(-1)==file && branch.type==type && branch.start==start && branch.end==end) {
-      const file = stack.at(-1)
       const path = stack.slice(0,-1).map((n,i) => `
         <tr>
-        <td><a title=${file} href=/similar?pos=${`${file}-${start}-${end}`}&depth=${i}>${n.type}</a>:
+        <td><a title=${file} href=/similar?${query(req.query)}&nest=${i}>${n.type}</a>:
         <td>${sxpr(n,3,null,stack[i-1])}`).reverse()
       const hit = stack[1]
       result.push(`
@@ -110,8 +109,28 @@ app.get('/nesting', (req,res) => {
         <p><pre>${escape(JSON.stringify(hit,omit,2))}</pre>`)
     }
   }
-  visitor.wander(mods,doit)
-  res.send(style('nesting')+`${result.join("<hr>")}`)
+  visitor.walk(mods,doit)
+  res.send(style('nesting',key)+`${result.join("<hr>")}`)
+})
+
+app.get('/similar', (req,res) => {
+  const {file,type,key,start,end,nest} = req.query
+  let nested
+  visitor.walk(mods,(branch,stack) => {
+    if(stack.at(-1)==file && branch.type==type && branch.start==start && branch.end==end)
+      nested = stack[nest]
+  })
+  const norm = node => vis(`\n\n\n${sxpr(node,3,null)}`)
+  const source = (file,node) => mods.find(mod => mod.file == file).text.substring(+node.start,+node.end)
+  const want = norm(nested)
+  const result = []
+  visitor.walk(mods,(branch,stack) => {
+    if(norm(branch) == want) result.push(`<pre>${escape(source(stack.at(-1),branch))}</pre><hr>`)
+  })
+  res.send(style('similar',key)+
+    `<p>${want}<hr>` +
+    result.join("\n")
+    )
 })
 
 
@@ -185,4 +204,17 @@ function elipsis(obj) {
   return `(<span title="${bytes} bytes">${dots}</span>)`
 }
 
+function vis(row) {
+  return row.split(/\n/)[3].trim()
+    .replaceAll(/<.*?>/g,'')
+    .replaceAll(/\.\.+/g,'..')
+}
+
+
+function query(obj,adj={}) {
+  return Object.entries(obj)
+    .map(([k,v]) => k in adj ? `${k}=${adj[k](v)}` : `${k}=${v}`)
+    .join('&')
+}
+
 app.listen(1954)
\ No newline at end of file