tpmkms_4wp 9.3.0 → 9.4.1

package/common/kirk.instance.json

@@ -500,11 +500,6 @@
           "theAble",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -1598,27 +1593,6 @@
       ],
       "metadata": {
         "opChoices": [
-          {
-            "op": [
-              "self",
-              0
-            ],
-            "ops": [
-              [
-                "is",
-                0
-              ],
-              [
-                "kirk",
-                0
-              ],
-              [
-                "self",
-                0
-              ]
-            ],
-            "counter": 1
-          },
           {
             "op": [
               "kirk",
@@ -1634,7 +1608,7 @@
                 0
               ]
             ],
-            "counter": 2
+            "counter": 1
           },
           {
             "op": [
@@ -1647,7 +1621,7 @@
                 0
               ]
             ],
-            "counter": 3
+            "counter": 2
           },
           {
             "op": [
@@ -1660,7 +1634,7 @@
                 1
               ]
             ],
-            "counter": 4
+            "counter": 3
           }
         ]
       },
@@ -1676,21 +1650,28 @@
             "end": 11
           },
           "one": {
-            "number": "many",
-            "variable": true,
-            "value": "self",
+            "number": [
+              "one",
+              "many"
+            ],
+            "word": "you",
+            "grammar_person": 2,
+            "grammer_case": [
+              "nominative",
+              "dative",
+              "accusative"
+            ],
             "text": "you",
             "marker": "self",
-            "word": "you",
+            "dead": true,
             "range": {
               "start": 0,
               "end": 11
             },
-            "dead": true,
             "types": [
               "self"
             ],
-            "level": 1
+            "level": 0
           },
           "two": {
             "value": "kirk",
@@ -1738,6 +1719,10 @@
           [
             "kirk",
             0
+          ],
+          [
+            "self",
+            0
           ]
         ],
         [
@@ -1745,10 +1730,6 @@
             "is",
             0
           ],
-          [
-            "kirk",
-            0
-          ],
           [
             "self",
             0
@@ -1798,43 +1779,8 @@
                 {
                   "marker": [
                     "self",
-                    1
-                  ],
-                  "range": {
-                    "start": 0,
-                    "end": 2
-                  }
-                },
-                {
-                  "marker": [
-                    "is",
-                    0
-                  ],
-                  "range": {
-                    "start": 4,
-                    "end": 6
-                  }
-                },
-                {
-                  "marker": [
-                    "kirk",
                     0
                   ],
-                  "range": {
-                    "start": 8,
-                    "end": 11
-                  }
-                }
-              ],
-              "counter": 2
-            },
-            {
-              "operators": [
-                {
-                  "marker": [
-                    "self",
-                    1
-                  ],
                   "range": {
                     "start": 0,
                     "end": 2
@@ -1861,7 +1807,7 @@
                   }
                 }
               ],
-              "counter": 3
+              "counter": 2
             },
             {
               "operators": [
@@ -1876,7 +1822,7 @@
                   }
                 }
               ],
-              "counter": 4
+              "counter": 3
             },
             {
               "operators": [
@@ -1891,7 +1837,7 @@
                   }
                 }
               ],
-              "counter": 5
+              "counter": 4
             }
           ],
           "length": 1
@@ -1916,6 +1862,10 @@
       [
         "kirk",
         0
+      ],
+      [
+        "self",
+        0
       ]
     ],
     [
@@ -1923,10 +1873,6 @@
         "is",
         0
       ],
-      [
-        "kirk",
-        0
-      ],
       [
         "self",
         0
@@ -1976,43 +1922,8 @@
             {
               "marker": [
                 "self",
-                1
-              ],
-              "range": {
-                "start": 0,
-                "end": 2
-              }
-            },
-            {
-              "marker": [
-                "is",
                 0
               ],
-              "range": {
-                "start": 4,
-                "end": 6
-              }
-            },
-            {
-              "marker": [
-                "kirk",
-                0
-              ],
-              "range": {
-                "start": 8,
-                "end": 11
-              }
-            }
-          ],
-          "counter": 2
-        },
-        {
-          "operators": [
-            {
-              "marker": [
-                "self",
-                1
-              ],
               "range": {
                 "start": 0,
                 "end": 2
@@ -2039,7 +1950,7 @@
               }
             }
           ],
-          "counter": 3
+          "counter": 2
         },
         {
           "operators": [
@@ -2054,7 +1965,7 @@
               }
             }
           ],
-          "counter": 4
+          "counter": 3
         },
         {
           "operators": [
@@ -2069,7 +1980,7 @@
               }
             }
           ],
-          "counter": 5
+          "counter": 4
         }
       ],
       "length": 1

package/common/kirk.js

@@ -27,9 +27,8 @@ knowledgeModule( {
           name: './kirk.test.json',
           contents: kirk_tests,
           checks: {
-            context: defaultContextCheck(),
-          },
-
+            context: [defaultContextCheck()],
+          }
         },
   template: {
     template,

package/common/length.instance.json

@@ -254,11 +254,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -1686,11 +1681,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -4182,11 +4172,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -5898,11 +5883,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -7614,11 +7594,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -9321,11 +9296,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -11038,11 +11008,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -12755,11 +12720,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -14462,11 +14422,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -16178,11 +16133,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -17894,11 +17844,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -19610,11 +19555,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -21240,11 +21180,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -22947,11 +22882,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -24664,11 +24594,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/length.js

@@ -46,9 +46,8 @@ knowledgeModule({
     name: './length.test.json',
     contents: length_tests,
     checks: {
-            context: defaultContextCheck(),
-          },
-
+      context: [defaultContextCheck()],
+    }
   },
   template: {
     template,

package/common/listener.js

@@ -41,7 +41,9 @@ knowledgeModule( {
     name: './listener.test.json',
     contents: listener_tests,
     checks: {
-            context: defaultContextCheck(),
+            context: [
+              defaultContextCheck(),
+            ],
             objects: ['mentioned', { km: 'gdefaults' }],
           },
   },

package/common/math.instance.json

@@ -364,11 +364,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/math.js

@@ -124,8 +124,7 @@ knowledgeModule( {
     name: './math.test.json',
     contents: tests,
     checks: {
-            context: defaultContextCheck(),
-          },
-
+      context: [defaultContextCheck()],
+    }
   },
 })

package/common/menus.instance.json

@@ -237,11 +237,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -1296,11 +1291,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -2539,11 +2529,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -3822,11 +3807,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -5066,11 +5046,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -6773,11 +6748,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -7929,11 +7899,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/menus.js

@@ -251,7 +251,9 @@ knowledgeModule({
     fixtures,
     checks: {
       objects: ['move', 'select', 'unselect', 'cancel', 'stop', 'show', 'menuDefs', 'close'],
-      context: defaultContextCheck(['operator', 'direction', 'moveable']),
+      context: [
+        defaultContextCheck({ extra: ['operator', 'direction', 'moveable'] }),
+      ],
     },
   },
   template: {

package/common/meta.js

@@ -288,12 +288,12 @@ const config = {
         if (kms.dialogues) {
           if (context.from.unknown && !context.to.unknown) {
             // kms.dialogues.api.makeObject({ context: context.from, types: [context.to.marker], source_value: context.to.value, config });
-            kms.dialogues.api.makeObject({ context: context.from, types: [context.to.marker], source_value: context.to.value, config });
+            await kms.dialogues.api.makeObject({ context: context.from, types: [context.to.marker], source_value: context.to.value, config });
           }
           if (context.to.value) {
             kms.stm.api.setVariable(context.from.value, context.to.value)
           } else {
-            kms.dialogues.api.makeObject({ context: context.from, types: context.to.types || [], config });
+            await kms.dialogues.api.makeObject({ context: context.from, types: context.to.types || [], config });
             kms.stm.api.setVariable(context.from.value, context.to)
           }
         }
@@ -393,9 +393,8 @@ knowledgeModule({
       words: true,
     },
     checks: {
-            context: defaultContextCheck(),
-          },
-
+      context: [defaultContextCheck()],
+    },
   },
   template: {
     template,

package/common/nameable.js

@@ -134,7 +134,9 @@ knowledgeModule( {
     name: './nameable.test.json',
     contents: nameable_tests,
     checks: {
-            context: [...defaultContextCheck(), 'pullFromContext'],
+            context: [
+              defaultContextCheck({ extra: ['pullFromContext'] }),
+            ],
             objects: ['mentioned', { km: 'stm' }],
           },
     include: {

package/common/negation.js

@@ -36,8 +36,8 @@ knowledgeModule( {
     name: './negation.test.json',
     contents: negation_tests,
     checks: {
-      context: defaultContextCheck(),
-    },
+      context: [defaultContextCheck()],
+    }
   },
 })
 

package/common/numbers.js

@@ -93,7 +93,7 @@ const config = {
     },
     { 
       where: where(),
-      match: ({context}) => ['number', 'integer'].includes(context.marker),
+      match: ({context}) => false && ['number', 'integer'].includes(context.marker),
       apply: ({context}) => `${context.value}` 
     },
   ],
@@ -112,8 +112,11 @@ knowledgeModule( {
     name: './numbers.test.json',
     contents: numbers_tests,
     checks: {
-            context: defaultContextCheck(),
-          },
-
+      context: [
+        defaultContextCheck({ marker: 'number', exported: true, extra: ['instance'] }),
+        defaultContextCheck({ marker: 'integer', exported: true, extra: ['instance'] }),
+        defaultContextCheck()
+      ],
+    }
   },
 })