tpmkms 9.5.1-beta.3 → 9.5.1-beta.30

package/common/animals.instance.json

@@ -474,7 +474,7 @@
             "text": "birds and mammals",
             "range": {
               "start": 0,
-              "end": 28
+              "end": 16
             },
             "types": [
               "list",
@@ -1416,7 +1416,7 @@
             "word": "mammals",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 6
             },
             "dead": true,
             "types": [
@@ -1442,12 +1442,7 @@
           },
           "do": {
             "left": "object",
-            "right": "property",
-            "range": {
-              "start": 0,
-              "end": 16
-            },
-            "text": "mammals have ears"
+            "right": "property"
           },
           "dead": true,
           "level": 2,
@@ -2167,7 +2162,7 @@
             "word": "mammals",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 6
             },
             "dead": true,
             "types": [
@@ -2193,12 +2188,7 @@
           },
           "do": {
             "left": "object",
-            "right": "property",
-            "range": {
-              "start": 0,
-              "end": 16
-            },
-            "text": "mammals have hair"
+            "right": "property"
           },
           "dead": true,
           "level": 2,
@@ -2948,7 +2938,7 @@
             "word": "mammals",
             "range": {
               "start": 0,
-              "end": 22
+              "end": 6
             },
             "dead": true,
             "types": [
@@ -2974,12 +2964,7 @@
           },
           "do": {
             "left": "object",
-            "right": "property",
-            "range": {
-              "start": 0,
-              "end": 22
-            },
-            "text": "mammals dont have wings"
+            "right": "property"
           },
           "negation": true,
           "level": 2,
@@ -3782,7 +3767,7 @@
             "word": "animals",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 6
             },
             "dead": true,
             "types": [
@@ -3808,12 +3793,7 @@
           },
           "do": {
             "left": "object",
-            "right": "property",
-            "range": {
-              "start": 0,
-              "end": 16
-            },
-            "text": "animals have skin"
+            "right": "property"
           },
           "dead": true,
           "level": 2,
@@ -4533,7 +4513,7 @@
             "word": "animals",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 6
             },
             "dead": true,
             "types": [
@@ -4559,12 +4539,7 @@
           },
           "do": {
             "left": "object",
-            "right": "property",
-            "range": {
-              "start": 0,
-              "end": 16
-            },
-            "text": "animals have eyes"
+            "right": "property"
           },
           "dead": true,
           "level": 2,
@@ -5284,7 +5259,7 @@
             "word": "birds",
             "range": {
               "start": 0,
-              "end": 15
+              "end": 4
             },
             "dead": true,
             "types": [
@@ -5310,12 +5285,7 @@
           },
           "do": {
             "left": "object",
-            "right": "property",
-            "range": {
-              "start": 0,
-              "end": 15
-            },
-            "text": "birds have wings"
+            "right": "property"
           },
           "dead": true,
           "level": 2,
@@ -6035,7 +6005,7 @@
             "word": "birds",
             "range": {
               "start": 0,
-              "end": 15
+              "end": 4
             },
             "dead": true,
             "types": [
@@ -6061,12 +6031,7 @@
           },
           "do": {
             "left": "object",
-            "right": "property",
-            "range": {
-              "start": 0,
-              "end": 15
-            },
-            "text": "birds have beaks"
+            "right": "property"
           },
           "dead": true,
           "level": 2,
@@ -6951,7 +6916,7 @@
             "text": "humans bats felines and canines",
             "range": {
               "start": 0,
-              "end": 42
+              "end": 30
             },
             "types": [
               "list",
@@ -8562,7 +8527,7 @@
             "text": "owls eagles pidgeons and parrots",
             "range": {
               "start": 0,
-              "end": 41
+              "end": 31
             },
             "types": [
               "list",
@@ -10168,7 +10133,7 @@
             "word": "cats",
             "range": {
               "start": 0,
-              "end": 15
+              "end": 3
             },
             "dead": true,
             "types": [
@@ -11323,7 +11288,7 @@
             "text": "dogs and wolves",
             "range": {
               "start": 0,
-              "end": 26
+              "end": 14
             },
             "types": [
               "list",
@@ -12689,7 +12654,7 @@
             "word": "bats",
             "range": {
               "start": 0,
-              "end": 14
+              "end": 3
             },
             "dead": true,
             "types": [
@@ -12715,12 +12680,7 @@
           },
           "do": {
             "left": "object",
-            "right": "property",
-            "range": {
-              "start": 0,
-              "end": 14
-            },
-            "text": "bats have wings"
+            "right": "property"
           },
           "dead": true,
           "level": 2,

package/common/asking.js

@@ -22,17 +22,22 @@ const config = {
       semantic: (args) => {
         const {config, context} = args
         // stop asking all questions
-        for (const semantic of config.semantics) {
+        const remove = []
+        for (const semantic of config.semantics()) {
           if (semantic.isQuestion) {
             let doRemove = true
             if (semantic.onNevermind && semantic.getWasAsked() && !semantic.getWasApplied()) {
               doRemove = semantic.onNevermind(args)
             }
             if (doRemove) {
-              config.removeSemantic(semantic)
+              remove.push(semantic)
+              // config.removeSemantic(semantic)
             }
           }
         }
+        for (const semantic of remove) {
+          config.removeSemantic(semantic)
+        }
       }
     },
 
@@ -43,11 +48,11 @@ const config = {
       bridge: "{ ...next(operator), choices: after[0] }",
       semantic: ({askWhich, context}) => {
         const choices = context.choices
-        const chosen = ({ choice, objects }) => {
+        function chosen({ choice, objects }) {
           objects.choice = choice
         }
 
-        const question = async ({choices, g, gs, wasAsked, state}) => {
+        async function question({choices, g, gs, wasAsked, state}) {
           if (wasAsked) {
             return `${await g(state.lastChoice)} is not a choice. The choices are: ${await gs(choices, ' ', ' or ')}`
           } else {
@@ -55,7 +60,7 @@ const config = {
           }
         }
 
-        const isChoice = ({context, choices, state}) => {
+        function isChoice({context, choices, state}) {
           state.lastChoice = context
           for (const choice of choices) {
             if (choice.value == context.value) {
@@ -64,7 +69,7 @@ const config = {
           }
         }
 
-        const onNevermind = ({objects, context}) => {
+        function onNevermind({objects, context}) {
           objects.onNevermindWasCalled = true
           return true
         }
@@ -94,115 +99,120 @@ const config = {
   ],
 };
 
-const getAsk = (config) => (uuid) => {
-    return (asks) => {
-    const ask = (ask, s_ids) => {
-      let oneShot = true // default
-      if (ask.oneShot === false) {
-        oneShot = false
-      }
+function getAsk(config) {
+    return (uuid) => {
+      return (asks) => {
+      function ask(ask, s_ids) {
+        let oneShot = true // default
+        if (ask.oneShot === false) {
+          oneShot = false
+        }
 
-      const id_q = stableId('semantic')
-      s_ids.push(id_q)
-      const id_rs = []
-      let wasAsked = false
-      let wasApplied = false
-      const getWasAsked = () => {
-        return wasAsked
-      }
-      const setWasAsked = (value) => {
-        wasAsked = value
-      }
-      const getWasApplied = () => {
-        return wasApplied
-      }
-      const setWasApplied = (value) => {
-        wasApplied = value
-      }
+        const id_q = stableId('semantic')
+        s_ids.push(id_q)
+        const id_rs = []
+        let wasAsked = false
+        let wasApplied = false
+        function getWasAsked() {
+          return wasAsked
+        }
+        function setWasAsked(value) {
+          wasAsked = value
+        }
+        function getWasApplied() {
+          return wasApplied
+        }
+        function setWasApplied(value) {
+          wasApplied = value
+        }
+
+        const semanticsr = ask.semanticsr || []
+        if (semanticsr.length == 0) {
+          semanticsr.push({ match: ask.matchr, apply: ask.applyr })
+        }
+        for (const semantic of semanticsr) {
+          const id_r = stableId('semantic')
+          id_rs.push(id_r)
+          s_ids.push(id_r)
+          config.addSemantic({
+            uuid,
+            id: id_r,
+            tied_ids: [id_q],
+            // tied_ids: s_ids,
+            onDelete: ask.onDelete,
+            oneShot,
+            where: semantic.where || ask.where || where(2),
+            source: 'response',
+            match: (args) => semantic.match(args),
+            apply: async (args) => {
+              setWasApplied(true)
+              await semantic.apply(args)
+            },
+          })
+        }
 
-      const semanticsr = ask.semanticsr || []
-      if (semanticsr.length == 0) {
-        semanticsr.push({ match: ask.matchr, apply: ask.applyr })
-      }
-      for (const semantic of semanticsr) {
-        const id_r = stableId('semantic')
-        id_rs.push(id_r)
-        s_ids.push(id_r)
-        // debugger
         config.addSemantic({
           uuid,
-          id: id_r,
-          tied_ids: [id_q],
+          oneShot,
+          id: id_q,
+          tied_ids: id_rs,
           // tied_ids: s_ids,
+          where: ask.where,
+          isQuestion: true,  // do one question at a time
+          getWasAsked,
+          getWasApplied,
           onDelete: ask.onDelete,
-          oneShot,
-          where: semantic.where || ask.where || where(2),
-          source: 'response',
-          match: (args) => semantic.match(args),
+          onNevermind: ask.onNevermind,
+          source: 'question',
+          match: ({ context }) => context.marker == 'controlEnd' || context.marker == 'controlBetween',
           apply: async (args) => {
-            setWasApplied(true)
-            await semantic.apply(args)
-          },
-        })
-      }
-
-      config.addSemantic({
-        uuid,
-        oneShot,
-        id: id_q,
-        tied_ids: id_rs,
-        // tied_ids: s_ids,
-        where: ask.where,
-        isQuestion: true,  // do one question at a time
-        getWasAsked,
-        getWasApplied,
-        onDelete: ask.onDelete,
-        onNevermind: ask.onNevermind,
-        source: 'question',
-        match: ({ context }) => context.marker == 'controlEnd' || context.marker == 'controlBetween',
-        apply: async (args) => {
-          let matchq = ask.matchq
-          let applyq = ask.applyq
-          if (!matchq) {
-            let wasAsked = false
-            matchq = () => !wasAsked,
-            applyq = (args) => {
-              wasAsked = true
-              return ask.applyq(args)
+            let matchq = ask.matchq
+            let applyq = ask.applyq
+            if (!matchq) {
+              let wasAsked = false
+              matchq = () => !wasAsked,
+              applyq = (args) => {
+                wasAsked = true
+                return ask.applyq(args)
+              }
             }
+            if (await matchq(args)) {
+              setWasApplied(false)
+              // args.context.motivationKeep = true
+              const query = await applyq({ ...args, wasAsked: getWasAsked() })
+              if (typeof query != 'string') {
+                throw new Error(`ask expects the value return from applyq to be a string. ${ask.where}`)
+              }
+              args.verbatim(query)
+              setWasAsked(true)
+              args.context.controlKeepMotivation = true
+            } else {
+              args._continue()
+            }
+            args.context.cascade = true
           }
-          if (await matchq(args)) {
-            setWasApplied(false)
-            // args.context.motivationKeep = true
-            args.verbatim(await applyq({ ...args, wasAsked: getWasAsked() }))
-            setWasAsked(true)
-            args.context.controlKeepMotivation = true
-          } else {
-            args._continue()
-          }
-          args.context.cascade = true
-        }
-      })
-    }
-    if (!Array.isArray(asks)) {
-      asks = [asks]
-    }
+        })
+      }
+      if (!Array.isArray(asks)) {
+        asks = [asks]
+      }
 
-    const s_ids = []
-    for (const a of [...asks].reverse()) {
-      // debugger
-      ask(a, s_ids)
-    }
-    
-    const cleanUp = () => {
-      config.removeSemantic(s_ids)
+      const s_ids = []
+      for (const a of [...asks].reverse()) {
+        // debugger
+        ask(a, s_ids)
+      }
+      
+      function cleanUp() {
+        config.removeSemantic(s_ids)
+      }
+      return cleanUp
     }
-    return cleanUp
   }
 }
 
 
-const initializer = ({objects, config, isModule}) => {
+function initializer({objects, config, isModule}) {
   config.addArgs(({config, api, isA}) => ({ 
     getUUIDScoped: (uuid) => { 
       const ask = getAsk(config)(uuid)
@@ -221,7 +231,7 @@ const initializer = ({objects, config, isModule}) => {
           }
 
           if (!question) {
-            const question = async ({choices, g, gs, wasAsked, state}) => {
+            async function question({choices, g, gs, wasAsked, state}) {
               if (wasAsked) {
                 return `${await g(state.lastChoice)} is not a choice. The choices are: ${await gs(choices, ' ', ' or ')}`
               } else {
@@ -231,7 +241,7 @@ const initializer = ({objects, config, isModule}) => {
           }
 
           if (!isChoice) {
-            const isChoice = ({context, choices, state}) => {
+            function isChoice({context, choices, state}) {
               state.lastChoice = context
               for (const choice of choices) {
                 if (choice.value == context.value) {