tpmkms 8.0.0 → 8.1.0-beta.0

package/common/ui.js

@@ -1,7 +1,7 @@
-const { Config, knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const dialogues = require('./dialogues')
-const math = require('./math')
+const ordinals = require('./ordinals')
 const ui_tests = require('./ui.test.json')
 const ui_instance = require('./ui.instance.json')
 
@@ -39,13 +39,13 @@ class API {
   again
   stop/start listening
 */
-const configStruct = {
+const config = {
   name: 'ui',
   operators: [
     "([select])",
     "([unselect])",
     "([cancel])",
-    "([move] ([direction]))",
+    "([move] ([moveable])? ([direction]))",
     "([down])",
     "([up])",
     "([left])",
@@ -58,7 +58,7 @@ const configStruct = {
     {
       where: where(),
       match: ({context, isA}) => isA(context, 'direction'),
-      apply: ({context, insert, s, fragments}) => {
+      apply: async ({context, insert, s, fragments}) => {
         const direction = context
         const fragment = fragments("move direction")
         const mappings = [{
@@ -66,8 +66,8 @@ const configStruct = {
           match: ({context}) => context.value == 'direction',
           apply: ({context}) => Object.assign(context, direction),
         }]
-        const instantiation = fragment.instantiate(mappings)
-        s(instantiation)
+        const instantiation = await fragment.instantiate(mappings)
+        await s(instantiation)
       }
     },
   ],
@@ -75,7 +75,7 @@ const configStruct = {
     { 
        where: where(),
        id: "select", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator) }",
        semantic: ({api, context}) => {
@@ -85,7 +85,7 @@ const configStruct = {
     { 
        where: where(),
        id: "unselect", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator) }",
        semantic: ({api, context}) => {
@@ -103,7 +103,7 @@ const configStruct = {
     { 
        where: where(),
        id: "cancel", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        words: ['close'],
        bridge: "{ ...next(operator) }",
@@ -114,36 +114,30 @@ const configStruct = {
     { 
        where: where(),
        id: "stop", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
        bridge: "{ ...next(operator), action: after[0] }",
-       generatorp: ({context, g}) => `stop ${g(context.action)}`,
+       generatorp: async ({context, g}) => `stop ${await g(context.action)}`,
        semantic: ({api, context}) => {
-         debugger
          api.stop(context.action.value)
        }
     },
     { 
        where: where(),
        id: "move", 
-       isA: ['verby'],
+       isA: ['verb'],
        level: 0, 
-       bridge: "{ ...next(operator), direction: after[0] }",
-       generatorp: ({context, g}) => `move ${g(context.direction)}`,
+       optional: { 1: "{ marker: 'moveable', pullFromContext: true, default: true, skipDefault: true }" },
+       bridge: "{ ...next(operator), operator: operator, moveable: after[0], direction: after[1], generate: ['operator', 'moveable', 'direction' ] }",
        semantic: ({api, context}) => {
          api.move(context.direction.value, context.direction.steps ? context.direction.steps.value : 1)
        }
     },
-    { 
-       id: "direction", 
-       level: 0, 
-       bridge: "{ ...next(operator) }" 
-    },
+    { id: "moveable", },
+    { id: "direction", },
     { 
        id: "up", 
-       level: 0, 
        isA: ['direction'],
-       bridge: "{ ...next(operator) }" 
     },
     { 
        id: "down", 
@@ -184,27 +178,21 @@ const template = {
   ],
 }
 
-const createConfig = () => {
-  const config = new Config(configStruct, module)
-  config.stop_auto_rebuild()
-  config.add(dialogues(), math())
-  config.api = new API()
-  config.restart_auto_rebuild()
-  return config
-}
-
 // const config = createConfig()
 
 knowledgeModule({ 
+  config,
+  includes: [dialogues, ordinals],
+  api: () => new API(),
+
   module,
   description: 'Control a ui with speech',
-  createConfig,
   test: {
     name: './ui.test.json',
     contents: ui_tests,
     checks: {
       objects: ['move', 'select', 'unselect', 'cancel', 'stop'],
-      context: defaultContextCheck,
+      context: defaultContextCheck(['operator', 'direction', 'moveable']),
     },
   },
   template: {