theprogrammablemind_4wp 7.12.4-beta.2 → 7.12.4-beta.3

package/client.js

@@ -10,10 +10,36 @@ const _ = require('lodash')
 const stringify = require('json-stable-stringify')
 const Lines = require('./lines')
 const flattens = require('./src/flatten')
-const { appendNoDups, InitCalls, updateQueries, safeNoDups } = require('./src/helpers')
+const { appendNoDups, InitCalls, updateQueries, safeNoDups, stableId } = require('./src/helpers')
 const runtime = require('./runtime')
 const sortJson = runtime.sortJson
 
+function where (goUp = 2) {
+  const e = new Error()
+  const regexForm1 = /\((.*):(\d+):(\d+)\)$/
+  const regexForm2 = /at (.*):(\d+):(\d+)$/
+  const lines = e.stack.split('\n')
+  let line
+  let match
+  for (line of lines.slice(1)) {
+    // if (!(line.includes('config.js:') || line.includes('client.js:') || line.includes('<anonymous>'))) {
+    if (!(line.includes('config.js:') || line.includes('client.js:'))) {
+      match = regexForm1.exec(line) || regexForm2.exec(line)
+      if (!match) {
+        continue
+      }
+      break
+    }
+  }
+  // const line = e.stack.split("\n")[goUp];
+  // const match = regexForm1.exec(line) || regexForm2.exec(line)
+  if (match) {
+    return `${match[1]}:${match[2]}`
+  } else {
+    return 'running in browser'
+  }
+}
+
 const getConfig_getObjectsCheck = (config, testConfig) => {
   let testConfigName = config.name
   if (testConfig.testModuleName) {
@@ -55,57 +81,102 @@ const pickObjects = (config, testConfig, getObjects) => {
   return projection
 }
 
-// move ask to the KM's since verbatim is called
-const getAsk = (config) => (uuid) => (asks) => {
-  for (const ask of asks) {
-    let oneShot = true // default
-    if (ask.oneShot === false) {
-      oneShot = false
-    }
-    config.addSemantic({
-      uuid,
-      oneShot,
-      match: (args) => ask.matchr(args),
-      apply: (args) => ask.applyr(args)
-    })
-  }
-  let oneShot = true
-  for (const ask of asks) {
-    if (ask.oneShot === false) {
-      oneShot = false
-    }
-  }
-  config.addSemantic({
-    uuid,
-    oneShot,
-    match: ({ context }) => context.marker == 'controlEnd' || context.marker == 'controlBetween',
-    apply: (args) => {
-      for (const ask of asks) {
-        let matchq = ask.matchq
-        let applyq = ask.applyq
-        if (!matchq) {
-          let wasAsked = false
-          matchq = () => !wasAsked,
-          applyq = (args) => {
-            wasAsked = true
-            applyq(args)
+// move ask to the KM's since verbatim is called probably in dialogues?
+const getAsk = (config) => (uuid) => {
+    // if (!uuid) {
+    //  debugger
+    //}
+    return (asks) => {
+    const ask = (ask) => {
+      let oneShot = true // default
+      if (ask.oneShot === false) {
+        oneShot = false
+      }
+
+      const id_q = stableId('semantic')
+      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 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)
+        config.addSemantic({
+          uuid,
+          id: id_r,
+          tied_ids: [id_q],
+          oneShot,
+          where: semantic.where || ask.where || where(2),
+          source: 'response',
+          match: (args) => semantic.match(args),
+          apply: (args) => {
+            setWasApplied(true)
+            semantic.apply(args)
+          },
+        })
+      }
+      
+      config.addSemantic({
+        uuid,
+        oneShot,
+        id: id_q,
+        tied_ids: id_rs,
+        where: ask.where,
+        isQuestion: true,  // do one question at a time
+        getWasAsked,
+        getWasApplied,
+        onNevermind: ask.onNevermind,
+        source: 'question',
+        match: ({ context }) => context.marker == 'controlEnd' || context.marker == 'controlBetween',
+        apply: (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 (matchq(args)) {
+            setWasAsked(true)
+            setWasApplied(false)
+            // args.context.motivationKeep = true
+            args.verbatim(applyq(args))
+            /*
+              args.context.verbatim = applyq(args)
+              args.context.isResponse = true;
+              delete args.context.controlRemove;
+              */
+            args.context.controlKeepMotivation = true
+          }
+          args.context.cascade = true
         }
-        if (matchq(args)) {
-          // args.context.motivationKeep = true
-          args.verbatim(applyq(args))
-          /*
-            args.context.verbatim = applyq(args)
-            args.context.isResponse = true;
-            delete args.context.controlRemove;
-            */
-          args.context.controlKeepMotivation = true
-          break
-        }
-      }
-      args.context.cascade = true
+      })
     }
-  })
+    if (!Array.isArray(asks)) {
+      asks = [asks]
+    }
+
+    [...asks].reverse().forEach( (a) => ask(a) )
+  }
 }
 
 const sameJSON = (json1, json2) => {
@@ -178,7 +249,7 @@ class ErrorReason extends Error {
 }
 
 const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
-  config.setArgs(args)
+
   // callId
   args.calls = new InitCalls(args.isInstance ? `${args.isInstance}#${config.name}` : config.name)
   if (global.theprogrammablemind && global.theprogrammablemind.loadForTesting) {
@@ -197,32 +268,11 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   args.asList = asList
   args.retry = () => { throw new RetryError() }
   args.fragments = (query) => config.fragment(query)
-  const scopedAsk = getAsk(config)
-
-  const getAPI = (uuid) => {
-    if (config && config.getAPI) {
-      return config.getAPI(uuid)
-    }
-  }
-  const getAPIs = (uuid) => {
-    if (config && config.getAPIs) {
-      return config.getAPIs(uuid)
-    }
-  }
-  args.getUUIDScoped = (uuid) => {
-    return {
-      ask: scopedAsk(uuid),
-      api: getAPI(uuid),
-      apis: getAPIs(uuid)
-    }
-  }
-  Object.assign(args, args.getUUIDScoped(uuidForScoping))
   args.breakOnSemantics = false
   args.theDebugger = {
     breakOnSemantics: (value) => args.breakOnSemantics = value
   }
   if (!logs) {
-    debugger
   }
   args.log = (message) => logs.push(message)
 
@@ -251,6 +301,33 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   // for semantics
   args.addAssumedScoped(args, {})
   config.getAddedArgs(args)
+
+  const getAPI = (uuid) => {
+    if (config && config.getAPI) {
+      return config.getAPI(uuid)
+    }
+  }
+  const getAPIs = (uuid) => {
+    if (config && config.getAPIs) {
+      return config.getAPIs(uuid)
+    }
+  }
+  const scopedAsk = getAsk(config)
+  args.getUUIDScoped = (uuid) => {
+    return {
+      ask: scopedAsk(uuid),
+      api: getAPI(uuid),
+      apis: getAPIs(uuid)
+    }
+  }
+  Object.assign(args, args.getUUIDScoped(uuidForScoping || config.uuid))
+  /*
+  if (uuidForScoping) {
+    Object.assign(args, args.getUUIDScoped(uuidForScoping))
+  }
+  */
+  // sets args for all the API. that make a copy so the args must be fully setup by here except for scoped
+  config.setArgs(args)
 }
 
 const gs = (g) => (contexts, separator, lastSeparator) => {
@@ -2179,26 +2256,6 @@ const ensureTestFile = (module, name, type) => {
   }
 }
 
-function where (goUp = 2) {
-  const e = new Error()
-  const regexForm1 = /\((.*):(\d+):(\d+)\)$/
-  const regexForm2 = /at (.*):(\d+):(\d+)$/
-  const lines = e.stack.split('\n')
-  let line
-  for (line of lines.slice(1)) {
-    if (!(line.includes('config.js:') || line.includes('client.js:'))) {
-      break
-    }
-  }
-  // const line = e.stack.split("\n")[goUp];
-  const match = regexForm1.exec(line) || regexForm2.exec(line)
-  if (match) {
-    return `${match[1]}:${match[2]}`
-  } else {
-    return 'running in browser'
-  }
-}
-
 function w (func) {
   func.where = where(3)
   return func

package/package.json

@@ -65,6 +65,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.12.4-beta.2",
+  "version": "7.12.4-beta.3",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -467,7 +467,7 @@ const normalizeConfig = (config) => {
     if (config.semantics) {
       for (const semantic of config.semantics) {
         if (semantic.oneShot) {
-          semantic.id = uuid()
+          semantic.id = semantic.id || helpers.stableId('semantic')
         }
       }
     }
@@ -902,6 +902,10 @@ class Config {
     }
   }
 
+  get semantics() {
+    return [...this.config.semantics]
+  }
+
   getSemantics (logs = []) {
     return new Semantics(this.config.semantics, logs, { km: this.name })
   }
@@ -1366,9 +1370,28 @@ class Config {
   }
 
   removeSemantic (deleteSemantic) {
-    const index = this.config.semantics.findIndex((semantic) => semantic.id === deleteSemantic.id)
-    if (index >= 0) {
-      this.config.semantics.splice(index, 1)
+    const id = deleteSemantic.id || deleteSemantic
+    const todo = [id]
+    const seen = new Set()
+
+    while (todo.length > 0) {
+      const id = todo.pop()
+      if (seen.has(id)) {
+        continue
+      }
+      seen.add(id)
+      const index = this.config.semantics.findIndex((semantic) => semantic.id === id)
+      if (index == -1) {
+        continue
+      }
+      for (const tied_id of this.config.semantics[index].tied_ids || []) {
+        if (!seen.has(tied_id)) {
+          todo.push(tied_id)
+        }
+      }
+      if (index >= 0) {
+        this.config.semantics.splice(index, 1)
+      }
     }
   }
 
@@ -1556,7 +1579,7 @@ class Config {
           config._api.multiApi[api].args = args
         }
       } else {
-        config._api.args = args
+        config._api.args = { ...args, ...args.getUUIDScoped(config.uuid) }
       }
     }
 
@@ -3079,5 +3102,5 @@ module.exports = {
   Config,
   config_toServer,
   operatorKey_valid,
-  handleBridgeProps
+  handleBridgeProps,
 }

package/src/helpers.js

@@ -374,7 +374,15 @@ const subPriority = (sub, sup) => {
   return true
 }
 
+const stableIds = {}
+const stableId = (tag) => {
+  const id = stableIds[tag] || 1
+  stableIds[tag] = id + 1
+  return id
+}
+
 module.exports = {
+  stableId,
   ecatch,
   functionsToStrings,
   updateQueries,

package/src/semantics.js

@@ -6,7 +6,7 @@ class Semantic {
   // constructor ({match, apply, uuid, index, km, notes}) {
   constructor (semantic) {
     semantic = normalizeSemantic(semantic)
-    const { match, apply, uuid, index, km, notes, priority, debug, where, applyWrapped, property, oneShot, id } = semantic
+    const { match, apply, uuid, index, km, notes, priority, debug, where, source, applyWrapped, property, oneShot, id, tied_ids, isQuestion } = semantic
     this.matcher = match
     this._apply = apply
     this._applyWrapped = applyWrapped
@@ -18,8 +18,11 @@ class Semantic {
     this.notes = notes
     this.callId = debug
     this.where = where
+    this.source = source
     this.oneShot = oneShot
+    this.isQuestion = isQuestion
     this.id = id
+    this.tied_ids = tied_ids || []
   }
 
   toLabel () {
@@ -184,11 +187,16 @@ class Semantics {
     let applied = false
     const stack = args.calls.push()
     let counter = 0
+    let seenQuestion = false
     for (const isemantic in this.semantics) {
       const semantic = this.semantics[isemantic]
       if (!semantic) {
         debugger
       }
+      // only one question at a time
+      if (semantic.isQuestion && seenQuestion) {
+        continue
+      }
       if (semantic.matches(args, context, options)) {
         if (!this.calls[counter]) {
           this.calls[counter] = 0
@@ -198,6 +206,7 @@ class Semantics {
         try {
           contextPrime = semantic.apply(args, context, s, log, options)
           if (!contextPrime.controlKeepMotivation && semantic.oneShot) {
+            // semantic.tied_ids.forEach((tied_id) => args.config.removeSemantic(tied_id))
             args.config.removeSemantic(semantic)
           }
         } catch (e) {
@@ -274,6 +283,7 @@ class Semantics {
           this.logs.push(lines.toString())
         }
         applied = true
+        seenQuestion = seenQuestion || semantic.isQuestion
         if (contextPrime.cascade) {
           contextPrime.cascade = false
         } else {