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

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

@@ -311,6 +311,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -1555,6 +1565,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -2197,6 +2217,7 @@
             "value": [
               {
                 "value": "like",
+                "isVerb": true,
                 "number": "one",
                 "text": "x likes y",
                 "marker": "like",
@@ -2243,6 +2264,7 @@
                 },
                 "operator": {
                   "value": "like",
+                  "isVerb": true,
                   "number": "one",
                   "text": "likes",
                   "marker": "like",
@@ -2253,7 +2275,6 @@
                   },
                   "evaluateWord": true,
                   "imperative": false,
-                  "isVerb": true,
                   "level": 0
                 },
                 "unflatten": [
@@ -2284,6 +2305,7 @@
               },
               {
                 "value": "love",
+                "isVerb": true,
                 "number": "one",
                 "text": "x loves y",
                 "marker": "love",
@@ -2330,6 +2352,7 @@
                 },
                 "operator": {
                   "value": "love",
+                  "isVerb": true,
                   "number": "one",
                   "text": "loves",
                   "marker": "love",
@@ -2340,7 +2363,6 @@
                   },
                   "evaluateWord": true,
                   "imperative": false,
-                  "isVerb": true,
                   "level": 0
                 },
                 "unflatten": [

package/common/ordering.js

@@ -2,7 +2,7 @@ const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const hierarchy = require('./hierarchy')
 const ordering_tests = require('./ordering.test.json')
-const ordering_instance = require('./ordering.instance.json')
+const instance = require('./ordering.instance.json')
 const { API } = require('./helpers/ordering')
 
 const template ={
@@ -124,8 +124,6 @@ knowledgeModule( {
               context: [defaultContextCheck()],
             }
           },
-    template: {
-      template, 
-      instance: ordering_instance
-    }
+    instance,
+    template, 
 })