tpmkms_4wp 9.5.1-beta.9 → 9.6.0-beta.0

package/common/math.instance.json

@@ -719,6 +719,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -878,7 +888,7 @@
             "end": 29
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "mathematical",
               "unknown": true,

package/common/math.js

@@ -120,7 +120,8 @@ knowledgeModule( {
 
   module,
   description: 'talking about math',
-  template: { template, instance },
+  instance,
+  template,
   test: {
     name: './math.test.json',
     contents: tests,

package/common/menus.instance.json

@@ -43,7 +43,7 @@
       "semantics": [
         {
           "match": "({context, isA}) => isA(context, 'showable_menus')",
-          "apply": "async ({context, insert, s, fragments}) => {\n            const value = context\n            const fragment = fragments(\"show showable\")\n            const mappings = [{\n              where: where(),\n              match: ({context}) => context.value == 'showable_menus',\n              apply: ({context}) => Object.assign(context, value),\n            }]\n            const instantiation = await fragment.instantiate(mappings)\n            await s(instantiation)\n          }"
+          "apply": "async ({context, insert, s, fragments}) => {\n            const instantiation = await fragments(\"show showable\", { 'showable_menus': context })\n            await s(instantiation)\n          }"
         }
       ]
     },
@@ -807,6 +807,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "stop",
           "verb",
@@ -1861,6 +1871,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "stop",
           "verb",
@@ -3139,6 +3159,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "stop",
           "verb",
@@ -4457,6 +4487,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "stop",
           "verb",
@@ -4651,7 +4691,7 @@
             "end": 17
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "menu_menus",
               "number": "one",
@@ -5746,6 +5786,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "stop",
           "verb",
@@ -7488,6 +7538,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "stop",
           "verb",
@@ -8639,6 +8699,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "stop",
           "verb",
@@ -8839,10 +8909,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
-          "touchedBy": [
-            "menus#call2"
-          ]
+          "context_id": 2
         }
       ],
       "generated": [
@@ -8943,7 +9010,7 @@
       "learned_contextual_priorities": [],
       "rtf_associations": [],
       "query": "show showable",
-      "skipSemantics": false,
+      "skipSemantics": true,
       "key": {
         "query": "show showable"
       }

package/common/menus.js

@@ -156,14 +156,7 @@ const template = {
           where: where(),
           match: ({context, isA}) => isA(context, 'showable_menus'),
           apply: async ({context, insert, s, fragments}) => {
-            const value = context
-            const fragment = fragments("show showable")
-            const mappings = [{
-              where: where(),
-              match: ({context}) => context.value == 'showable_menus',
-              apply: ({context}) => Object.assign(context, value),
-            }]
-            const instantiation = await fragment.instantiate(mappings)
+            const instantiation = await fragments("show showable", { 'showable_menus': context })
             await s(instantiation)
           }
         },
@@ -256,8 +249,6 @@ knowledgeModule({
       ],
     },
   },
-  template: {
-    template,
-    instance,
-  }
+  instance,
+  template,
 })

package/common/meta.js

@@ -5,7 +5,7 @@ const gdefaults = require('./gdefaults.js')
 ensureTestFile(module, 'meta', 'test')
 ensureTestFile(module, 'meta', 'instance')
 const meta_tests = require('./meta.test.json')
-const meta_instance = require('./meta.instance.json')
+const instance = require('./meta.instance.json')
 const { hashIndexesGet, hashIndexesSet, translationMapping, translationMappings } = require('./helpers/meta.js')
 const { zip, words } = require('./helpers.js')
 
@@ -296,6 +296,7 @@ const config = {
           }
           if (context.to.value) {
             kms.stm.api.setVariable(context.from.value, context.to.value)
+            // config.addWord(context.from.word, context.to)
           } else {
             await kms.dialogues.api.makeObject({ context: context.from, types: context.to.types || [], config });
             kms.stm.api.setVariable(context.from.value, context.to)
@@ -412,8 +413,6 @@ knowledgeModule({
       context: [defaultContextCheck()],
     },
   },
-  template: {
-    template,
-    instance: meta_instance,
-  },
+  instance,
+  template,
 })

package/common/nameable.js

@@ -1,5 +1,5 @@
 const { knowledgeModule, where } = require('./runtime').theprogrammablemind
-const { defaultContextCheck } = require('./helpers')
+const { defaultContextCheck, defaultContextCheckProperties } = require('./helpers')
 const helpers = require('./helpers')
 const stm = require('./stm')
 const nameable_tests = require('./nameable.test.json')
@@ -14,13 +14,10 @@ class API {
 
   // report is a context
   setName(context, name) {
-    if (!context.stm) {
-      context.stm = {}
-    }
-    if (!context.stm.names) {
-      context.stm.names = []
-    }
+    context.stm ??= {}
+    context.stm.names ??= []
     context.stm.names.push(name)
+    this.args.config.addWord(name, { id: context.marker, initial: `{ value: "${name}", pullFromContext: true, nameable_named: true }` })
   }
 
   get(type, name) {
@@ -70,8 +67,18 @@ class API {
   }
 }
 
-const api = new API()
-
+function initializer({config}) {
+  config.addArgs(({kms, mentioned}) => {
+    return {
+      mentioned: (args) => {
+        mentioned(args)
+        if (args.name) {
+          kms.nameable.api.setName(args.context, args.name)
+        }
+      },
+    }
+  })
+}
 const config = {
   name: 'nameable',
   operators: [
@@ -107,19 +114,25 @@ const config = {
       id: 'call',
       isA: ['verb'],
       bridge: "{ ...next(operator), nameable: after[0], name: after[1:][0] }",
-      // bridge: "{ ...next(operator), nameable: after[0], name: after[1] }",
-      // generatorp: async ({context, g}) => `call ${await g(context.nameable)} ${await g(context.name)}`,
       generatorp: async ({context, g, gs}) => `call ${await g(context.nameable)} ${await gs(context.name)}`,
-      semantic: async ({config, context, api, e}) => {
+      semantic: async ({config, context, api, e, verbatim, g}) => {
         // TODO find report being referred to
         const nameable = (await e(context.nameable)).evalue
+        if (!nameable) {
+          verbatim(`${await g(context.nameable)} is not known`)
+          return
+        }
         const name = context.name.map((n) => n.text).join(' ')
         // const name = context.name.text
-        config.addWord(name, { id: nameable.marker, initial: `{ value: "${name}", pullFromContext: true, nameable_named: true }` })
         api.setName(nameable, name)
-      }
+      },
+      check: defaultContextCheckProperties(['nameable', 'name']),
+    },
+    { 
+      id: 'nameable', 
+      words: helpers.words('nameable'),
+      children: ['thisitthat'],
     },
-    { id: 'nameable', words: helpers.words('nameable')},
   ]
 }
 
@@ -127,6 +140,7 @@ knowledgeModule( {
   config,
   api: () => new API(),
   includes: [stm],
+  initializer,
 
   module,
   description: 'namable objects',