tpmkms_4wp 9.5.1-beta.9 → 9.6.0

package/common/math.instance.json

@@ -878,7 +878,7 @@
             "end": 29
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "mathematical",
               "unknown": true,

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          }"
         }
       ]
     },
@@ -4651,7 +4651,7 @@
             "end": 17
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "menu_menus",
               "number": "one",
@@ -8839,10 +8839,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
-          "touchedBy": [
-            "menus#call2"
-          ]
+          "context_id": 2
         }
       ],
       "generated": [
@@ -8943,7 +8940,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)
           }
         },

package/common/meta.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)

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')
@@ -107,19 +107,26 @@ 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')},
   ]
 }
 

package/common/nameable.test.json

@@ -6862,5 +6862,441 @@
         ]
       }
     ]
+  },
+  {
+    "associations": [
+      [
+        [
+          "call",
+          0
+        ],
+        [
+          "nameable",
+          0
+        ],
+        [
+          "unknown",
+          0
+        ]
+      ]
+    ],
+    "config": {
+      "words": {
+        "hierarchy": [
+        ],
+        "literals": {
+          "\"": [
+            {
+              "id": "doubleQuote",
+              "initial": "{\"word\":\"\\\"\",\"depth\":\"+\"}",
+              "word": "\""
+            }
+          ],
+          "(": [
+            {
+              "id": "leftParenthesis",
+              "initial": "{\"word\":\"(\",\"value\":\"(\",\"depth\":\"+\"}",
+              "word": "("
+            }
+          ],
+          ")": [
+            {
+              "id": "rightParenthesis",
+              "initial": "{\"word\":\")\",\"value\":\")\",\"depth\":\"-\"}",
+              "word": ")"
+            }
+          ],
+          ",": [
+            {
+              "id": "comma",
+              "initial": "{\"word\":\",\",\"value\":\",\",\"depth\":\"+\"}",
+              "word": ","
+            }
+          ],
+          ".": [
+            {
+              "id": "endOfSentence",
+              "initial": "{ value: \"endOfSentence\"}"
+            }
+          ],
+          ":": [
+            {
+              "id": "colon",
+              "initial": "{ value: \"colon\"}"
+            }
+          ],
+          "memorable": [
+            {
+              "id": "memorable",
+              "initial": "{\"word\":\"memorable\",\"number\":\"one\"}",
+              "word": "memorable"
+            }
+          ],
+          "memorables": [
+            {
+              "id": "memorable",
+              "initial": "{\"word\":\"memorables\",\"number\":\"many\"}",
+              "word": "memorables"
+            }
+          ],
+          "nameable": [
+            {
+              "id": "nameable",
+              "initial": "{\"word\":\"nameable\",\"number\":\"one\"}",
+              "word": "nameable"
+            }
+          ],
+          "nameables": [
+            {
+              "id": "nameable",
+              "initial": "{\"word\":\"nameables\",\"number\":\"many\"}",
+              "word": "nameables"
+            }
+          ],
+          "the": [
+            {
+              "id": "the",
+              "initial": "{ modifiers: [] }"
+            }
+          ]
+        },
+        "patterns": [
+        ]
+      }
+    },
+    "contexts": [
+      {
+        "context_id": 2,
+        "context_index": 1,
+        "dead": true,
+        "default": true,
+        "level": 1,
+        "marker": "call",
+        "name": [
+          {
+            "dead": true,
+            "level": 0,
+            "marker": "unknown",
+            "range": {
+              "end": 17,
+              "start": 14
+            },
+            "text": "fred",
+            "unknown": true,
+            "value": "fred",
+            "word": "fred"
+          }
+        ],
+        "nameable": {
+          "dead": true,
+          "level": 0,
+          "marker": "nameable",
+          "number": "one",
+          "range": {
+            "end": 12,
+            "start": 5
+          },
+          "text": "nameable",
+          "types": [
+            "nameable"
+          ],
+          "word": "nameable"
+        },
+        "range": {
+          "end": 17,
+          "start": 0
+        },
+        "text": "call nameable fred",
+        "topLevel": true,
+        "touchedBy": [
+          "nameable#call2"
+        ],
+        "value": "call",
+        "word": "call"
+      },
+      {
+        "context_id": 3,
+        "isResponse": true,
+        "marker": "verbatim",
+        "topLevel": true,
+        "verbatim": "nameable is not known"
+      }
+    ],
+    "developerTest": false,
+    "generatedParenthesized": [
+      "",
+      "(nameable is not known)"
+    ],
+    "metadata": {
+      "opChoices": [
+        {
+          "counter": 1,
+          "op": [
+            "unknown",
+            0
+          ],
+          "ops": [
+            [
+              "call",
+              0
+            ],
+            [
+              "unknown",
+              0
+            ]
+          ]
+        },
+        {
+          "counter": 2,
+          "op": [
+            "call",
+            0
+          ],
+          "ops": [
+            [
+              "call",
+              0
+            ]
+          ]
+        }
+      ]
+    },
+    "objects": {
+      "nameToUUID": {
+        "articles": "articles2",
+        "evaluate": "evaluate2",
+        "gdefaults": "gdefaults2",
+        "nameable": "nameable1",
+        "pos": "pos2",
+        "punctuation": "punctuation2",
+        "stm": "stm2",
+        "tokenize": "tokenize2",
+        "words": "words2"
+      },
+      "namespaced": {
+        "articles2": {
+          "km": "articles2"
+        },
+        "evaluate2": {
+          "km": "evaluate2"
+        },
+        "gdefaults2": {
+          "km": "gdefaults2"
+        },
+        "nameable1": {
+          "km": "nameable1",
+          "named": {
+          }
+        },
+        "pos2": {
+          "km": "pos2"
+        },
+        "punctuation2": {
+          "km": "punctuation2"
+        },
+        "stm2": {
+          "km": "stm2",
+          "mentioned": [
+          ],
+          "variables": {
+          }
+        },
+        "tokenize2": {
+          "km": "tokenize2"
+        },
+        "words2": {
+          "km": "words2",
+          "words": [
+          ]
+        }
+      },
+      "processed": [
+        {
+          "context": {
+            "context_id": 3,
+            "isResponse": true,
+            "marker": "verbatim",
+            "topLevel": true,
+            "verbatim": "nameable is not known"
+          },
+          "generatedParenthesized": [
+          ],
+          "paraphrases": [
+          ],
+          "paraphrasesParenthesized": [
+          ],
+          "responses": [
+            "",
+            "nameable is not known"
+          ]
+        },
+        {
+          "context": {
+            "context_id": 2,
+            "context_index": 1,
+            "dead": true,
+            "default": true,
+            "level": 1,
+            "marker": "call",
+            "name": [
+              {
+                "dead": true,
+                "level": 0,
+                "marker": "unknown",
+                "range": {
+                  "end": 17,
+                  "start": 14
+                },
+                "text": "fred",
+                "unknown": true,
+                "value": "fred",
+                "word": "fred"
+              }
+            ],
+            "nameable": {
+              "dead": true,
+              "level": 0,
+              "marker": "nameable",
+              "number": "one",
+              "range": {
+                "end": 12,
+                "start": 5
+              },
+              "text": "nameable",
+              "types": [
+                "nameable"
+              ],
+              "word": "nameable"
+            },
+            "range": {
+              "end": 17,
+              "start": 0
+            },
+            "text": "call nameable fred",
+            "topLevel": true,
+            "touchedBy": [
+              "nameable#call2"
+            ],
+            "value": "call",
+            "word": "call"
+          },
+          "generatedParenthesized": [
+          ],
+          "paraphrases": [
+          ],
+          "paraphrasesParenthesized": [
+          ],
+          "responses": [
+            "",
+            "nameable is not known"
+          ]
+        }
+      ]
+    },
+    "paraphrases": [
+      "call nameable fred",
+      "nameable is not known"
+    ],
+    "paraphrasesParenthesized": [
+      "(call (nameable) (fred))",
+      "(nameable is not known)"
+    ],
+    "query": "call nameable fred",
+    "responses": [
+      "",
+      "nameable is not known"
+    ],
+    "summaries": [
+      {
+        "length": 1,
+        "summaries": [
+          {
+            "counter": 1,
+            "operators": [
+              {
+                "marker": [
+                  "call",
+                  0
+                ],
+                "range": {
+                  "end": 3,
+                  "start": 0
+                }
+              },
+              {
+                "marker": [
+                  "nameable",
+                  0
+                ],
+                "range": {
+                  "end": 12,
+                  "start": 5
+                }
+              },
+              {
+                "marker": [
+                  "unknown",
+                  0
+                ],
+                "range": {
+                  "end": 17,
+                  "start": 14
+                }
+              }
+            ]
+          },
+          {
+            "counter": 2,
+            "operators": [
+              {
+                "marker": [
+                  "call",
+                  0
+                ],
+                "range": {
+                  "end": 3,
+                  "start": 0
+                }
+              },
+              {
+                "marker": [
+                  "nameable",
+                  0
+                ],
+                "range": {
+                  "end": 12,
+                  "start": 5
+                }
+              },
+              {
+                "marker": [
+                  "unknown",
+                  0
+                ],
+                "range": {
+                  "end": 17,
+                  "start": 14
+                }
+              }
+            ]
+          },
+          {
+            "counter": 3,
+            "operators": [
+              {
+                "marker": [
+                  "call",
+                  1
+                ],
+                "range": {
+                  "end": 17,
+                  "start": 0
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
   }
 ]

package/common/numbers.js

@@ -114,7 +114,7 @@ knowledgeModule( {
     checks: {
       context: [
         defaultContextCheck({ marker: 'number', exported: true, extra: ['instance'] }),
-        defaultContextCheck({ marker: 'integer', exported: true, extra: ['instance'] }),
+        defaultContextCheck({ match: ({isA, context}) => isA(context.marker, 'integer'), exported: true, extra: ['instance'] }),
         defaultContextCheck()
       ],
     }

package/common/ordering.instance.json

@@ -2197,6 +2197,7 @@
             "value": [
               {
                 "value": "like",
+                "isVerb": true,
                 "number": "one",
                 "text": "x likes y",
                 "marker": "like",
@@ -2243,6 +2244,7 @@
                 },
                 "operator": {
                   "value": "like",
+                  "isVerb": true,
                   "number": "one",
                   "text": "likes",
                   "marker": "like",
@@ -2253,7 +2255,6 @@
                   },
                   "evaluateWord": true,
                   "imperative": false,
-                  "isVerb": true,
                   "level": 0
                 },
                 "unflatten": [
@@ -2284,6 +2285,7 @@
               },
               {
                 "value": "love",
+                "isVerb": true,
                 "number": "one",
                 "text": "x loves y",
                 "marker": "love",
@@ -2330,6 +2332,7 @@
                 },
                 "operator": {
                   "value": "love",
+                  "isVerb": true,
                   "number": "one",
                   "text": "loves",
                   "marker": "love",
@@ -2340,7 +2343,6 @@
                   },
                   "evaluateWord": true,
                   "imperative": false,
-                  "isVerb": true,
                   "level": 0
                 },
                 "unflatten": [