wiki-plugin-mech 0.1.13 → 0.1.15

package/client/mech.js

@@ -83,7 +83,7 @@
     }
   }
 
-  function run (nest,state={},mock) {
+  async function run (nest,state={},mock) {
     const scope = nest.slice()
     while (scope.length) {
       const code = scope.shift()
@@ -96,14 +96,15 @@
         const stuff = {command,op,args,body,elem,state}
         if(state.debug) console.log(stuff)
         if (blocks[op])
-          blocks[op].emit.apply(null,[stuff])
+          await blocks[op].emit.apply(null,[stuff])
         else
           if (op.match(/^[A-Z]+$/))
             trouble(elem,`${op} doesn't name a block we know.`)
           else if (code.command.match(/\S/))
             trouble(elem, `Expected line to begin with all-caps keyword.`)
       } else if(typeof code == 'array') {
-        run(code,state)
+        console.warn(`this can't happen.`)
+        run(code,state) // when does this even happen?
       }
     }
   }
@@ -113,7 +114,7 @@
 
   function click_emit ({elem,body,state}) {
     if(elem.innerHTML.match(/button/)) return
-    if (!body?.length) return trouble(elem,'CLICK expects indented blocks to follow.')
+    if (!body?.length) return trouble(elem,`CLICK expects indented blocks to follow.`)
     elem.innerHTML += '<button style="border-width:0;">▶</button>'
     elem.querySelector('button').addEventListener('click',event => {
       state.debug = event.shiftKey
@@ -122,16 +123,17 @@
   }
 
   function hello_emit ({elem,args,state}) {
-    const want = args[0] == 'world' ? ' 🌎' : ' 😀'
+    const world = args[0] == 'world' ? ' 🌎' : ' 😀'
     for (const key of Object.keys(state))
       inspect(elem,key,state)
-    elem.innerHTML += want
+    elem.innerHTML += world
   }
 
   function from_emit ({elem,args,body,state}) {
     const line = elem.innerHTML
+    const url = args[0]
     elem.innerHTML = line + ' ⏳'
-    fetch(`//${args[0]}.json`)
+    fetch(`//${url}.json`)
       .then(res => res.json())
       .then(page => {
         state.page = page
@@ -146,13 +148,13 @@
     inspect(elem,'page',state)
     const datalog = state.page.story.find(item => item.type == 'datalog')
     if(!datalog) return trouble(elem, `Expect Datalog plugin in the page.`)
-    const want = args[0]
-    if(!want) return trouble(elem, 'SENSOR needs a sensor name.')
+    const device = args[0]
+    if(!device) return trouble(elem, `SENSOR needs a sensor name.`)
     const sensor = datalog.text.split(/\n/)
       .map(line => line.split(/ +/))
       .filter(fields => fields[0] == 'SENSOR')
-      .find(fields => fields[1] == want)
-    if(!sensor) return trouble(elem, `Expect to find "${want}" in Datalog.`)
+      .find(fields => fields[1] == device)
+    if(!sensor) return trouble(elem, `Expect to find "${device}" in Datalog.`)
     const url = sensor[2]
 
     const f = c => 9/5*(c/16)+32
@@ -192,6 +194,10 @@
       .join(", ")
     if (state.debug) console.log({topic,sources})
     elem.innerHTML = command + ' ⇒ ' + counts
+    // state.assets = ?
+    // state.aspect = ?
+    // state.region = ?
+    // state.marker = ?
     state[topic] = sources.map(({div,result}) => ({id:div.dataset.id, result}))
     if (body) run(body,state)
   }
@@ -199,8 +205,9 @@
   function preview_emit ({elem,command,args,state}) {
     const round = digits => (+digits).toFixed(7)
     const story = []
-    for (const arg of args) {
-      switch (arg) {
+    const types = args
+    for (const type of types) {
+      switch (type) {
       case 'map':
         if(!('marker' in state)) return trouble(elem,`"map" preview expects "marker" state, like from "SOURCE marker".`)
         inspect(elem,'marker',state)
@@ -234,7 +241,7 @@
         story.push({type:'paragraph',text})}
         break
       default:
-        return trouble(elem,`"${arg}" doesn't name an item we can preview`)
+        return trouble(elem,`"${type}" doesn't name an item we can preview`)
       }
     }
     const title = "Mech Preview" + (state.tick ? ` ${state.tick}` : '')
@@ -264,7 +271,7 @@
     elem.innerHTML = command
     const nodes = aspects.map(({graph}) => graph.nodes).flat()
     elem.innerHTML += ` ⇒ ${aspects.length} aspects, ${nodes.length} nodes`
-    if(steps.find(({graph}) => !graph)) trouble(elem,"WALK skipped sites with no links in sitemaps")
+    if(steps.find(({graph}) => !graph)) trouble(elem,`WALK skipped sites with no links in sitemaps`)
     const item = elem.closest('.item')
     item.classList.add('aspect-source')
     item.aspectData = () => aspects
@@ -273,9 +280,9 @@
 
   function tick_emit ({elem,args,body,state}) {
     if(elem.innerHTML.match(/button/)) return
-    if (!body?.length) return trouble(elem,'TICK expects indented blocks to follow.')
+    if (!body?.length) return trouble(elem,`TICK expects indented blocks to follow.`)
     const count = args[0] || '1'
-    if (!count.match(/^[1-9][0-9]?$/)) return trouble(elem,"TICK expects a count from 1 to 99")
+    if (!count.match(/^[1-9][0-9]?$/)) return trouble(elem,`TICK expects a count from 1 to 99`)
     let clock = null
     elem.innerHTML += '<button style="border-width:0;">▶</button>'
     elem.querySelector('button').addEventListener('click',event => {
@@ -319,14 +326,16 @@
   function forward_emit ({elem,command,args,state}) {
     if(args.length < 1) return trouble(elem,`FORWARD expects an argument, the number of steps to move a "turtle".`)
     if(!('turtle' in state)) state.turtle = new Turtle(elem)
-    const position = state.turtle.forward(+args[0])
+    const steps = args[0]
+    const position = state.turtle.forward(+steps)
     elem.innerHTML = command + ` ⇒ ${position.map(n => (n-200).toFixed(1)).join(', ')}`
   }
 
   function turn_emit ({elem,command,args,state}) {
     if(args.length < 1) return trouble(elem,`TURN expects an argument, the number of degrees to turn a "turtle".`)
     if(!('turtle' in state)) state.turtle = new Turtle(elem)
-    const direction = state.turtle.turn(+args[0])
+    const degrees = args[0]
+    const direction = state.turtle.turn(+degrees)
     elem.innerHTML = command + ` ⇒ ${direction}°`
   }
 
@@ -437,9 +446,10 @@
         return trouble(elem,`SHOW expects a slug or site/slug to open in the lineup.`)
       }
     } else {
-      [site,slug] = args[0].includes('/')
-        ? args[0].split(/\//)
-        : [null,args[0]]
+      const info = args[0]
+      [site,slug] = info.includes('/')
+        ? info.split(/\//)
+        : [null,info]
     }
     const lineup = [...document.querySelectorAll('.page')].map(e => e.id)
     if(lineup.includes(slug)) return trouble(elem,`SHOW expects a page not already in the lineup.`)
@@ -457,6 +467,34 @@
     state.info = infos[one]
   }
 
+  function sleep_emit({elem,command,args,body,state}) {
+    let count = args[0] || '1'
+    if (!count.match(/^[1-9][0-9]?$/)) return trouble(elem,`SLEEP expects seconds from 1 to 99`)
+    return new Promise(resolve => {
+      if(body)
+        run(body,state)
+          .then(result => {if(state.debug) console.log(command,'children', result)})
+      elem.innerHTML = command + ` ⇒ ${count} remain`
+      let clock = setInterval(()=> {
+        if(--count > 0)
+          elem.innerHTML = command + ` ⇒ ${count} remain`
+        else {
+          clearInterval(clock)
+          elem.innerHTML = command + ` ⇒ done`
+          if(state.debug) console.log(command, 'done')
+          resolve()
+        }
+      }, 1000)
+    })
+  }
+
+  function together_emit({elem,command,args,body,state}) {
+    if (!body) return trouble(elem,`TOGETHER expects indented commands to run together.`)
+    const children = body
+      .map(child => run([child],state))
+    return Promise.all(children)
+  }
+
 
 // C A T A L O G
 
@@ -477,7 +515,9 @@
     FILE:    {emit:file_emit},
     KWIC:    {emit:kwic_emit},
     SHOW:    {emit:show_emit},
-    RANDOM:  {emit:random_emit}
+    RANDOM:  {emit:random_emit},
+    SLEEP:   {emit:sleep_emit},
+    TOGETHER:{emit:together_emit}
   }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-plugin-mech",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "Federated Wiki - Mechanism Scripting Plugin",
   "keywords": [
     "mech",