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

package/common/pipboy.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const hierarchy = require('./hierarchy')
 const countable = require('./countable')
@@ -100,7 +100,7 @@ class API {
 }
 const api = new API()
 
-let configStruct = {
+let config = {
   name: 'pipboy',
   // TODO mark default as local scope
   operators: [
@@ -117,7 +117,7 @@ let configStruct = {
     // "([weapon])",
     // "([44_pistol|])",
     "([apparel])",
-    "((!articlePOS/0 && !verby/0) [outfit|outfit])",
+    "((!articlePOS/0 && !verb/0) [outfit|outfit])",
     // this doesnt work because the speech recognizer hears 'where'
     "([wear] ([wearable]))",
     "([strip])",
@@ -152,10 +152,10 @@ let configStruct = {
     {
        where: where(),
        id: "put", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator) }",
-       generatorp: ({context, g}) => `put on`,
+       generatorp: ({context}) => `put on`,
     },
     { 
        where: where(),
@@ -171,7 +171,7 @@ let configStruct = {
        isA: ['preposition'],
        level: 0, 
        bridge: "{ ...before, marker: operator('putOn', 0), dead: false }",
-       generatorp: ({context, g}) => `put on ${g(context.item)}`,
+       generatorp: async ({context, g}) => `put on ${await g(context.item)}`,
        semantic: ({api, context}) => {
          api.change(context.item.marker)
        }
@@ -179,11 +179,11 @@ let configStruct = {
     { 
        where: where(),
        id: "change", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator), item: after[0] }",
        localHierarchy: [ ['weapon', 'changeable'] ],
-       generatorp: ({context, g}) => `change ${g(context.item)}`,
+       generatorp: async ({context, g}) => `change ${await g(context.item)}`,
        semantic: ({api, context}) => {
          api.change(context.item.marker)
        }
@@ -191,10 +191,10 @@ let configStruct = {
     { 
        where: where(),
        id: "disarm", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator) }",
-       generatorp: ({context, g}) => `disarm`,
+       generatorp: ({context}) => `disarm`,
        semantic: ({api, context}) => {
          api.disarm()
        }
@@ -202,10 +202,10 @@ let configStruct = {
     { 
        where: where(),
        id: "strip", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator) }",
-       generatorp: ({context, g}) => `strip`,
+       generatorp: ({context}) => `strip`,
        semantic: ({api, context}) => {
          api.strip()
        }
@@ -213,10 +213,10 @@ let configStruct = {
     { 
        where: where(),
        id: "call", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator), item: after[0], name: after[1] }",
-       generatorp: ({context, g}) => `call ${g(context.item)} ${g(context.name)}`,
+       generatorp: async ({context, g}) => `call ${await g(context.item)} ${await g(context.name)}`,
        semantic: ({api, context}) => {
          api.setName(context.item, context.name.name.value)
        }
@@ -224,10 +224,10 @@ let configStruct = {
     { 
        where: where(),
        id: "putOn", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator), item: after[0] }",
-       generatorp: ({context, g}) => `put on ${g(context.item)}`,
+       generatorp: async ({context, g}) => `put on ${await g(context.item)}`,
        semantic: ({api, context}) => {
          if (context.item.name) {
            api.wear({ name: context.item.name.value, type: 'outfit' })
@@ -239,11 +239,11 @@ let configStruct = {
     { 
        where: where(),
        id: "wear", 
-       isA: ['verby'],
+       isA: ['verb'],
        words: ['where'], // the speech recognizer hears 'where' not 'wear'
        level: 0, 
        bridge: "{ ...next(operator), item: after[0] }",
-       generatorp: ({context, g}) => `wear ${g(context.item)}`,
+       generatorp: async ({context, g}) => `wear ${await g(context.item)}`,
        semantic: ({api, context}) => {
          if (context.item.name) {
            api.wear({ name: context.item.name.value, type: 'outfit' })
@@ -255,13 +255,12 @@ let configStruct = {
     { 
        where: where(),
        id: "equip", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        localHierarchy: [ ['weapon', 'equipable'], ['thisitthat', 'equipable'] ],
        bridge: "{ ...next(operator), item: after[0] }",
-       generatorp: ({context, g}) => `equip ${g(context.item)}`,
-       semantic: ({api, context, e}) => {
-         // const value = e(context.item)
+       generatorp: async ({context, g}) => `equip ${await g(context.item)}`,
+       semantic: async ({api, context}) => {
          let condition
          if (context.item.condition) {
            condition = { selector: context.item.condition.marker, property: context.item.condition.property[0].marker }
@@ -272,37 +271,35 @@ let configStruct = {
     { 
        where: where(),
        id: "toDrink", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator), item: after[0] }",
-       generatorp: ({context, g}) => `drink ${g(context.item)}`,
-       semantic: ({api, context, e}) => {
-         const value = e(context.item)
+       generatorp: async ({context, g}) => `drink ${await g(context.item)}`,
+       semantic: async ({api, context, e}) => {
+         const value = await e(context.item)
          api.drink(value.value)
        }
     },
     { 
        where: where(),
        id: "eat", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator), item: after[0] }",
-       generatorp: ({context, g}) => `eat ${g(context.item)}`,
-       semantic: ({api, context, e}) => {
-         // const value = e(context.item)
-         // api.eat(value.value)
+       generatorp: async ({context, g}) => `eat ${await g(context.item)}`,
+       semantic: async ({api, context}) => {
          api.eat(context.item.value)
        }
     },
     { 
        where: where(),
        id: "take", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator), item: after[0] }",
-       generatorp: ({context, g}) => `take ${g(context.item)}`,
-       semantic: ({api, context, e}) => {
-         const value = e(context.item)
+       generatorp: async ({context, g}) => `take ${await g(context.item)}`,
+       semantic: async ({api, context, e}) => {
+         const value = await e(context.item)
          api.take(value.value)
        }
     },
@@ -371,22 +368,22 @@ let configStruct = {
     */
     { 
        id: "apply", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator), item: after[0] }",
-       generatorp: ({context, g}) => `apply ${g(context.item)}`,
-       semantic: ({api, context, e}) => {
+       generatorp: async ({context, g}) => `apply ${await g(context.item)}`,
+       semantic: async ({api, context, e}) => {
           // { item: 'stimpak', quantity: <number>, to?: [ { part: ['arm', 'leg', 'torso', head'], side?: ['left', 'right'] } ] }
-         const quantity = context.item.quantity ? e(context.item.quantity).value : 1
+         const quantity = context.item.quantity ? (await e(context.item.quantity)).value : 1
          api.apply({ item: 'stimpak', quantity })
        }
     },
     { 
        id: "go", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator), showable: after[0].showable }",
-       generatorp: ({context, g}) => `go to ${g(context.showable)}`,
+       generatorp: async ({context, g}) => `go to ${await g(context.showable)}`,
        semantic: ({api, context}) => {
          api.setDisplay(context.showable.value)
        }
@@ -396,14 +393,14 @@ let configStruct = {
        isA: ['preposition'],
        level: 0, 
        bridge: "{ ...next(operator), showable: after[0] }",
-       generatorp: ({context, g}) => `to ${g(context.showable)}`,
+       generatorp: async ({context, g}) => `to ${await g(context.showable)}`,
     },
     { 
        id: "showWeapons", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator), showable: after[0] }",
-       generatorp: ({context, g}) => `show ${g(context.showable)}`,
+       generatorp: async ({context, g}) => `show ${await g(context.showable)}`,
        semantic: ({api, context}) => {
          if (context.showable.quantity && context.showable.quantity.value == 'all') {
            api.showWeapons('all')
@@ -414,10 +411,10 @@ let configStruct = {
     },
     { 
        id: "show", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator), showable: after[0] }",
-       generatorp: ({context, g}) => `show ${g(context.showable)}`,
+       generatorp: async ({context, g}) => `show ${await g(context.showable)}`,
        semantic: ({api, context}) => {
          api.setDisplay(context.showable.value)
        }
@@ -524,25 +521,17 @@ const template = {
     "medicine and stimpaks are takeable",
     "item modifies properties",
     "damage luck hp rads value ap charisma range and accuracy are item properties",
-    configStruct,
+    config,
   ]
 }
 
-const createConfig = () => {
-  const config = new Config({ name: 'pipboy' }, module)
-  config.stop_auto_rebuild()
-  config.add(hierarchy(), countable(), comparable(), help(), math())
-  // console.log('config.config.hierarchy', JSON.stringify(config.config.hierarchy, null, 2))
-  // console.log('config.hierarchy', config.hierarchy)
-  config.api = api
-  config.restart_auto_rebuild()
-  return config
-}
-
 knowledgeModule({ 
+  config: { name: 'pipboy' },
+  includes: [hierarchy, countable, comparable, help, math],
+  api: () => new API(),
+
   module,
   description: 'Control a pipboy with speech',
-  createConfig,
   template: { template, instance },
   test: {
     name: './pipboy.test.json',