tpmkms_4wp 8.0.0-beta.20 → 8.0.0-beta.22

package/common/pipboy.instance.json

@@ -112,7 +112,7 @@
           ],
           "level": 0,
           "bridge": "{ ...next(operator) }",
-          "generatorp": "({context, g}) => `put on`"
+          "generatorp": "({context}) => `put on`"
         },
         {
           "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:161",
@@ -134,7 +134,7 @@
           ],
           "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}) => {\n         api.change(context.item.marker)\n       }"
         },
         {
@@ -151,7 +151,7 @@
               "changeable"
             ]
           ],
-          "generatorp": "({context, g}) => `change ${g(context.item)}`",
+          "generatorp": "async ({context, g}) => `change ${await g(context.item)}`",
           "semantic": "({api, context}) => {\n         api.change(context.item.marker)\n       }"
         },
         {
@@ -162,7 +162,7 @@
           ],
           "level": 0,
           "bridge": "{ ...next(operator) }",
-          "generatorp": "({context, g}) => `disarm`",
+          "generatorp": "({context}) => `disarm`",
           "semantic": "({api, context}) => {\n         api.disarm()\n       }"
         },
         {
@@ -173,7 +173,7 @@
           ],
           "level": 0,
           "bridge": "{ ...next(operator) }",
-          "generatorp": "({context, g}) => `strip`",
+          "generatorp": "({context}) => `strip`",
           "semantic": "({api, context}) => {\n         api.strip()\n       }"
         },
         {
@@ -184,7 +184,7 @@
           ],
           "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}) => {\n         api.setName(context.item, context.name.name.value)\n       }"
         },
         {
@@ -195,7 +195,7 @@
           ],
           "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}) => {\n         if (context.item.name) {\n           api.wear({ name: context.item.name.value, type: 'outfit' })\n         } else {\n           api.wear({ type: context.item.value })\n         }\n       }"
         },
         {
@@ -209,7 +209,7 @@
           ],
           "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}) => {\n         if (context.item.name) {\n           api.wear({ name: context.item.name.value, type: 'outfit' })\n         } else {\n           api.wear({ type: context.item.value })\n         }\n       }"
         },
         {
@@ -230,44 +230,44 @@
             ]
           ],
           "bridge": "{ ...next(operator), item: after[0] }",
-          "generatorp": "({context, g}) => `equip ${g(context.item)}`",
-          "semantic": "({api, context, e}) => {\n         // const value = e(context.item)\n         let condition\n         if (context.item.condition) {\n           condition = { selector: context.item.condition.marker, property: context.item.condition.property[0].marker }\n         }\n         api.equip({ type: context.item.value, condition })\n       }"
+          "generatorp": "async ({context, g}) => `equip ${await g(context.item)}`",
+          "semantic": "async ({api, context}) => {\n         let condition\n         if (context.item.condition) {\n           condition = { selector: context.item.condition.marker, property: context.item.condition.property[0].marker }\n         }\n         api.equip({ type: context.item.value, condition })\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:273",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:272",
           "id": "toDrink",
           "isA": [
             "verby"
           ],
           "level": 0,
           "bridge": "{ ...next(operator), item: after[0] }",
-          "generatorp": "({context, g}) => `drink ${g(context.item)}`",
-          "semantic": "({api, context, e}) => {\n         const value = e(context.item)\n         api.drink(value.value)\n       }"
+          "generatorp": "async ({context, g}) => `drink ${await g(context.item)}`",
+          "semantic": "async ({api, context, e}) => {\n         const value = await e(context.item)\n         api.drink(value.value)\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:285",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:284",
           "id": "eat",
           "isA": [
             "verby"
           ],
           "level": 0,
           "bridge": "{ ...next(operator), item: after[0] }",
-          "generatorp": "({context, g}) => `eat ${g(context.item)}`",
-          "semantic": "({api, context, e}) => {\n         // const value = e(context.item)\n         // api.eat(value.value)\n         api.eat(context.item.value)\n       }"
+          "generatorp": "async ({context, g}) => `eat ${await g(context.item)}`",
+          "semantic": "async ({api, context}) => {\n         api.eat(context.item.value)\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:298",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:295",
           "id": "take",
           "isA": [
             "verby"
           ],
           "level": 0,
           "bridge": "{ ...next(operator), item: after[0] }",
-          "generatorp": "({context, g}) => `take ${g(context.item)}`",
-          "semantic": "({api, context, e}) => {\n         const value = e(context.item)\n         api.take(value.value)\n       }"
+          "generatorp": "async ({context, g}) => `take ${await g(context.item)}`",
+          "semantic": "async ({api, context, e}) => {\n         const value = await e(context.item)\n         api.take(value.value)\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:310",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:307",
           "id": "nameable",
           "isA": [
             "theAble"
@@ -327,8 +327,8 @@
           ],
           "level": 0,
           "bridge": "{ ...next(operator), item: after[0] }",
-          "generatorp": "({context, g}) => `apply ${g(context.item)}`",
-          "semantic": "({api, context, e}) => {\n          // { item: 'stimpak', quantity: <number>, to?: [ { part: ['arm', 'leg', 'torso', head'], side?: ['left', 'right'] } ] }\n         const quantity = context.item.quantity ? e(context.item.quantity).value : 1\n         api.apply({ item: 'stimpak', quantity })\n       }"
+          "generatorp": "async ({context, g}) => `apply ${await g(context.item)}`",
+          "semantic": "async ({api, context, e}) => {\n          // { item: 'stimpak', quantity: <number>, to?: [ { part: ['arm', 'leg', 'torso', head'], side?: ['left', 'right'] } ] }\n         const quantity = context.item.quantity ? (await e(context.item.quantity)).value : 1\n         api.apply({ item: 'stimpak', quantity })\n       }"
         },
         {
           "id": "go",
@@ -337,7 +337,7 @@
           ],
           "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}) => {\n         api.setDisplay(context.showable.value)\n       }"
         },
         {
@@ -347,7 +347,7 @@
           ],
           "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",
@@ -356,7 +356,7 @@
           ],
           "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}) => {\n         if (context.showable.quantity && context.showable.quantity.value == 'all') {\n           api.showWeapons('all')\n         } else {\n           api.showWeapons(context.showable.value)\n         }\n       }"
         },
         {
@@ -366,7 +366,7 @@
           ],
           "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}) => {\n         api.setDisplay(context.showable.value)\n       }"
         },
         {
@@ -1463,24 +1463,6 @@
             1
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "is",
@@ -6948,24 +6930,6 @@
             1
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "is",
@@ -24451,32 +24415,6 @@
             1
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "item",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "property",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "is",
@@ -24757,7 +24695,7 @@
           "bridge": "{ ...next(operator), item: after[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:273",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:272",
           "id": "toDrink",
           "isA": [
             "verby"
@@ -24766,7 +24704,7 @@
           "bridge": "{ ...next(operator), item: after[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:285",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:284",
           "id": "eat",
           "isA": [
             "verby"
@@ -24775,7 +24713,7 @@
           "bridge": "{ ...next(operator), item: after[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:298",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:295",
           "id": "take",
           "isA": [
             "verby"
@@ -24784,7 +24722,7 @@
           "bridge": "{ ...next(operator), item: after[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:310",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:307",
           "id": "nameable",
           "isA": [
             "theAble"
@@ -25457,32 +25395,6 @@
         1
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "item",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "property",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "is",
@@ -25733,42 +25645,6 @@
         1
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "is",

package/common/pipboy.js

@@ -155,7 +155,7 @@ let configStruct = {
        isA: ['verby'],
        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)
        }
@@ -183,7 +183,7 @@ let configStruct = {
        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)
        }
@@ -194,7 +194,7 @@ let configStruct = {
        isA: ['verby'],
        level: 0, 
        bridge: "{ ...next(operator) }",
-       generatorp: ({context, g}) => `disarm`,
+       generatorp: ({context}) => `disarm`,
        semantic: ({api, context}) => {
          api.disarm()
        }
@@ -205,7 +205,7 @@ let configStruct = {
        isA: ['verby'],
        level: 0, 
        bridge: "{ ...next(operator) }",
-       generatorp: ({context, g}) => `strip`,
+       generatorp: ({context}) => `strip`,
        semantic: ({api, context}) => {
          api.strip()
        }
@@ -216,7 +216,7 @@ let configStruct = {
        isA: ['verby'],
        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)
        }
@@ -227,7 +227,7 @@ let configStruct = {
        isA: ['verby'],
        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' })
@@ -243,7 +243,7 @@ let configStruct = {
        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' })
@@ -259,9 +259,8 @@ let configStruct = {
        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 }
@@ -275,9 +274,9 @@ let configStruct = {
        isA: ['verby'],
        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)
        }
     },
@@ -287,10 +286,8 @@ let configStruct = {
        isA: ['verby'],
        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)
        }
     },
@@ -300,9 +297,9 @@ let configStruct = {
        isA: ['verby'],
        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)
        }
     },
@@ -374,10 +371,10 @@ let configStruct = {
        isA: ['verby'],
        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 })
        }
     },
@@ -386,7 +383,7 @@ let configStruct = {
        isA: ['verby'],
        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'],
        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')
@@ -417,7 +414,7 @@ let configStruct = {
        isA: ['verby'],
        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)
        }
@@ -528,14 +525,14 @@ const template = {
   ]
 }
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config({ name: 'pipboy' }, module)
   config.stop_auto_rebuild()
-  config.add(hierarchy(), countable(), comparable(), help(), math())
+  await 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()
+  await config.setApi(api)
+  await config.restart_auto_rebuild()
   return config
 }
 

package/common/pokemon.instance.json

@@ -1984,28 +1984,6 @@
             1
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "pokemon",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "is",
@@ -13567,28 +13545,6 @@
         1
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "pokemon",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "is",

package/common/pokemon.js

@@ -29,7 +29,7 @@ const template = {
 // 'ashe owns pikachu who owns pikachu'
 // TODO does ashe own pikachu / ash owns pikachu? / 'ashe likes pikachu does ashe like pikachu'
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config({ 
     name: 'pokemon',
     hierarchy: [
@@ -40,8 +40,8 @@ const createConfig = () => {
     ],
   })
   config.stop_auto_rebuild()
-  config.add(hierarchy())
-  config.initializer( ({config, apis}) => {
+  await config.add(hierarchy)
+  await config.initializer( ({config, apis}) => {
     const api = apis('properties')
     /*
     api.createActionPrefix({
@@ -62,7 +62,7 @@ const createConfig = () => {
                 config 
               })
   })
-  config.restart_auto_rebuild()
+  await config.restart_auto_rebuild()
   // config.load(template, pokemon_instance)
   return config
 }

package/common/pos.js

@@ -36,7 +36,7 @@ let configStruct = {
 
 };
 
-createConfig = () => new Config(configStruct, module)
+createConfig = async () => new Config(configStruct, module)
 
 knowledgeModule( { 
   module,

package/common/pressure.js

@@ -14,9 +14,9 @@ const template = {
   ],
 }
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config({ name: 'pressure' }, module)
-  config.add(dimension())
+  await config.add(dimension)
   return config
 }