tpmkms_4wp 8.0.0-beta.7 → 8.0.0-beta.70

package/common/fastfood.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, ensureTestFile, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, ensureTestFile, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck, propertyToArray } = require('./helpers')
 const edible = require('./edible')
 const events = require('./events')
@@ -137,7 +137,7 @@ const template = {
         "((meal/* && context.comboNumber == undefined) [comboMeal] (combo/*))",
         "((combo/*) [comboNumber] (number/* || numberNumberCombo/*))",
         "((numberNumberCombo/1) [numberNumberCombo_combo|] (combo/0))",
-        "((number/0,1 && context.instance == undefined) [numberNumberCombo] (number/0,1))",
+        "((number/0,1 && context.instance == false) [numberNumberCombo] (number/0,1 && instance == true))",
         "((combo/*) [([withModification|with] ([modification]))])",
       ],
       floaters: ['instance'],
@@ -216,7 +216,7 @@ const template = {
         {
           where: where(),
           match: ({context}) => false && context.marker == 'combo' && context.comboNumber,
-          apply: ({context, g}) => g(context.comboNumber),
+          apply: async ({context, g}) => await g(context.comboNumber),
         }
       ],
       bridges: [
@@ -225,7 +225,7 @@ const template = {
           id: 'withModification',
           level: 0,
           before: ['preposition'],
-          generatorp: ({context, gp}) => `with ${gp(context.modifications)}`,
+          generatorp: async ({context, gp}) => `with ${await gp(context.modifications)}`,
           bridge: "{ ...next(operator), modifications: after[0], flatten: false }",
         },
         { 
@@ -287,18 +287,16 @@ const template = {
         {
           // split "sprite and fanta" into separate things so the ask will pick them up
           match: ({context}) => context.marker == 'list' && context.topLevel && !context.flatten,
-          apply: ({context, s}) => {
-            s({...context, flatten: true})
-          }
+          apply: async ({context, s}) => await s({...context, flatten: true}),
         },
         {
           where: where(),
           match: ({context, api}) => context.marker == 'controlEnd' && api.hasAskedForButNotAvailable(),
-          apply: ({context, api, gp, toContext, verbatim}) => {
+          apply: async ({context, api, gp, toContext, verbatim}) => {
             const naArray = api.getAskedForButNotAvailable()
             naArray.forEach((f) => f.paraphrase = true)
             const naContext = toContext(naArray)
-            verbatim(`The following are not menu items: ${gp(naContext)}`)
+            verbatim(`The following are not menu items: ${await gp(naContext)}`)
             // allow other motivation to run
             context.cascade = true
           }
@@ -306,11 +304,13 @@ const template = {
         {
           where: where(),
           match: ({context, api}) => context.marker == 'controlEnd' && api.hasAskedForButNotAvailableModification(),
-          apply: ({context, api, gp, toContext, verbatim}) => {
-            const naArray = api.getAskedForButNotAvailableModification().map(({ item, modification }) => {
+          apply: async ({context, api, gp, toContext, verbatim}) => {
+            const naArray = []
+            for (const args of api.getAskedForButNotAvailableModification()) {
+              const args = { item, modification }
               // return `${gp(item)} can not be modified with ${gp(modification)}.`
-              return `XXX can not be modified with ${gp(modification)}.`
-            })
+              naArray.push(`XXX can not be modified with ${await gp(modification)}.`)
+            }
             verbatim(naArray.join(' '))
             // allow other motivation to run
             context.cascade = true
@@ -411,13 +411,13 @@ const template = {
       bridges: [
         { 
           id: "change",
-          isA: ['verby'],
-          localHierarchy: [ ['thisitthat', 'meal'] ],
-          generatorp: ({context, gp}) => `change ${gp(context.from)} to ${gp(context.to)}`,
+          isA: ['verb'],
+          localHierarchy: [ ['thisitthat', 'meal'], ['thisitthat', 'drink'] ],
+          generatorp: async ({context, gp}) => `change ${await gp(context.from)} to ${await gp(context.to)}`,
           bridge: "{ ...next(operator), from: after[0], to: after[1].toObject }",
-          semantic: ({context, api, e}) => {
+          semantic: async ({context, api, e}) => {
             const state = api.state
-            const eFrom = e(context.from).evalue
+            const eFrom = (await e(context.from)).evalue
             const from = state.getIdCombo(eFrom.fromSTM ? eFrom : context.from)
             const to = state.getIdCombo(context.to)
             for (const item of api.items()) {
@@ -451,7 +451,7 @@ const template = {
       bridges: [
         {
           id: 'remove',
-          isA: ['verby'],
+          isA: ['verb'],
           bridge: "{ ...next(operator), remove: after[0], postModifiers: ['remove'] }",
           semantic: ({context, api}) => {
             const state = api.state
@@ -464,7 +464,7 @@ const template = {
         },
         {
           id: 'reset',
-          isA: ['verby'],
+          isA: ['verb'],
           bridge: "{ ...next(operator) }",
           semantic: ({context, api}) => {
             api.reset()
@@ -887,8 +887,8 @@ class State {
                 {
                   where: where(),
                   match: ({context, isA}) => isA(context.marker, 'number') && !context.evaluate,
-                  apply: ({context, e}) => {
-                    food.comboNumber = { value: e(context).value }
+                  apply: async ({context, e}) => {
+                    food.comboNumber = { value: (await e(context)).value }
                     this.add(Object.assign(food, context))
                   }
                 },
@@ -917,7 +917,7 @@ class State {
       }
 
       this.api.add(item)
-      this.api.args.mentioned(food)
+      this.api.args.mentioned({ context: food })
 
       for (const addIt of addsInsteadOfModifications) {
         this.add(addIt)
@@ -935,75 +935,65 @@ class State {
   }
 }
 
-const createConfig = (additionalConfig) => {
-  const config = new Config({ 
-    name: 'fastfood',
-    operators: [
-      "([orderNoun|order])",
-      "([showOrder|show] ([orderNoun/1]))",
-    ],
-    // flatten: ['list'],
-    // TODO use node naming not python
-    semantics: [
-      {
-        where: where(),
-        priority: -10,
-        match: ({context}) => context.marker == 'compound_operator',
-        apply: ({context, s}) => {
-          context.marker = 'list'
-          context.flatten = true
-          s(context)
-        }
-      },
-      {
-        where: where(),
-        match: ({context, isAListable}) => isAListable(context, 'edible') && context.marker !== 'edible' && !context.same && !context.isResponse && !context.evaluate,
-        apply: ({context, km, api, instance}) => {
-          for (const element of propertyToArray(context)) {
-            km('fastfood').api.state.add(element)
-          }
-        }
-      },
-    ],
-    floaters: ['quantity'],
-    bridges: [
-      { 
-        id: 'orderNoun',
-        parents: ['noun', 'queryable'],
-        evaluator: ({context, api}) => {
-          context.evalue = { marker: 'list', value: api.objects.items }
-          api.show()
+const config = { 
+  name: 'fastfood',
+  operators: [
+    "([orderNoun|order])",
+    "([showOrder|show] ([orderNoun/1]))",
+  ],
+  // flatten: ['list'],
+  // TODO use node naming not python
+  semantics: [
+    {
+      where: where(),
+      priority: -10,
+      match: ({context}) => context.marker == 'compound_operator',
+      apply: async ({context, s}) => {
+        context.marker = 'list'
+        context.flatten = true
+        await s(context)
+      }
+    },
+    {
+      where: where(),
+      match: ({context, isAListable}) => isAListable(context, 'edible') && context.marker !== 'edible' && !context.same && !context.isResponse && !context.evaluate,
+      apply: ({context, km, api, instance}) => {
+        for (const element of propertyToArray(context)) {
+          km('fastfood').api.state.add(element)
         }
+      }
+    },
+  ],
+  floaters: ['quantity'],
+  bridges: [
+    { 
+      id: 'orderNoun',
+      parents: ['noun', 'queryable'],
+      evaluator: ({context, api}) => {
+        context.evalue = { marker: 'list', value: api.objects.items }
+        api.show()
+      }
+    },
+    { 
+      id: 'showOrder',
+      parents: ['verb'],
+      bridge: "{ ...next(operator), order: after[0] }",
+      generatorp: async ({context, g}) => `show ${await g(context.order)}`,
+      semantic: ({api}) => {
+        api.state.show()
       },
-      { 
-        id: 'showOrder',
-        parents: ['verby'],
-        bridge: "{ ...next(operator), order: after[0] }",
-        generatorp: ({context, g}) => `show ${g(context.order)}`,
-        semantic: ({api}) => {
-          api.state.show()
-        },
-      },
-    ],
-  }, module)
-  config.stop_auto_rebuild()
-  config.add(edible(), countable(), events(), sizeable())
-  config.api = api
-  config.initializer( ({api}) => {
-    api.state = new State(api)
-  })
-  if (additionalConfig) {
-    additionalConfig(config)
-  }
-  config.restart_auto_rebuild()
-  return config
+    },
+  ],
 }
 
 knowledgeModule( {
+    config,
+    includes: [edible, countable, events, sizeable],
+    api: () => new API(),
+    initializer: ({api}) => { api.state = new State(api) },
+
     module,
     description: 'fastfood related concepts',
-    createConfig,
-    acceptsAdditionalConfig: true,
     test: {
             name: './fastfood.test.json',
             contents: fastfood_tests,