tpmkms_4wp 9.3.0-beta.53 → 9.3.0-beta.55

package/common/fastfood.js

@@ -995,7 +995,9 @@ knowledgeModule( {
                 { property: 'quantity', filter: ['marker', 'value', 'text' ] },
                 { property: 'pieces', filter: ['marker', 'value', 'text' ] },
               ],
-              ...defaultContextCheck(['comboNumber']),
+              context: [
+                defaultContextCheck({ extra: ['comboNumber'] }),
+              ],
             },
           },
     template: {

package/common/formulas.js

@@ -207,7 +207,9 @@ knowledgeModule({
       objects: [
         'formulas',
       ],
-      ...defaultContextCheck(),
+      context: [
+        defaultContextCheck(),
+      ]
     }
   },
 })

package/common/gdefaults.js

@@ -264,6 +264,8 @@ knowledgeModule({
   test: {
     name: './gdefaults.test.json',
     contents: gdefaults_tests,
-    checks: defaultContextCheck(),
+    checks: {
+      context: [defaultContextCheck()],
+    },
   },
 })

package/common/help.js

@@ -102,6 +102,8 @@ knowledgeModule({
   test: {
     name: './help.test.json',
     contents: help_tests,
-    checks: defaultContextCheck(),
+    checks: {
+      context: [defaultContextCheck()],
+    }
   },
 })

package/common/helpers.js

@@ -162,14 +162,21 @@ const defaultObjectCheck = (extra = []) => {
   }
 }
 
-const defaultContextCheck = (extra = []) => {
+const defaultContextCheckProperties = (extra) => {
+  return ['marker', 'text', 'verbatim', 'value', 'evalue', 'isResponse', { properties: 'modifiers' }, { properties: 'postModifiers' }, ...extra]
+}
+
+const defaultContextCheck = ({marker, extra = [], exported = false} = {}) => {
+  let match
+  if (marker) {
+    match = ({context}) => context.marker == marker
+  } else {
+    match = ({context}) => !Array.isArray(context)
+  }
   return {
-    context: [
-      {
-        match: ({context}) => !Array.isArray(context),
-        apply: () => ['marker', 'text', 'verbatim', 'value', 'evalue', 'isResponse', { properties: 'modifiers' }, { properties: 'postModifiers' }, ...extra],
-      },
-    ],
+    match,
+    exported,
+    apply: () => ['marker', 'text', 'verbatim', 'value', 'evalue', 'isResponse', { properties: 'modifiers' }, { properties: 'postModifiers' }, ...extra],
   }
 }
 
@@ -262,6 +269,7 @@ module.exports = {
   pushL,
   getValue,
   defaultContextCheck,
+  defaultContextCheckProperties,
   defaultObjectCheck,
 	toEValue,
   millisecondsUntilHourOfDay,

package/common/hierarchy.js

@@ -305,7 +305,9 @@ knowledgeModule( {
     // TODO doesnt this need the KM
     checks: {
       objects: ['children', 'concept', 'parents', 'properties'],
-      ...defaultContextCheck(),
+      context: [
+        defaultContextCheck(),
+      ],
     },
     includes: {
       words: true,

package/common/javascript.js

@@ -72,6 +72,8 @@ knowledgeModule( {
   test: {
     name: './javascript.test.json',
     contents: javascript_tests,
-    checks: defaultContextCheck(),
+    checks: {
+      context: [defaultContextCheck()],
+    }
   },
 })

package/common/kirk.js

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

package/common/length.js

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

package/common/listener.js

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

package/common/math.js

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

package/common/menus.js

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

package/common/meta.js

@@ -392,7 +392,9 @@ knowledgeModule({
     include: {
       words: true,
     },
-    checks: defaultContextCheck(),
+    checks: {
+      context: [defaultContextCheck()],
+    },
   },
   template: {
     template,

package/common/nameable.js

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

package/common/negation.js

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

package/common/numbers.js

@@ -111,6 +111,12 @@ knowledgeModule( {
   test: {
     name: './numbers.test.json',
     contents: numbers_tests,
-    checks: defaultContextCheck(['instance'])
+    checks: {
+      context: [
+        defaultContextCheck({ marker: 'number', exported: true, extra: ['instance'] }),
+        defaultContextCheck({ marker: 'integer', exported: true, extra: ['instance'] }),
+        defaultContextCheck()
+      ],
+    }
   },
 })

package/common/ordering.js

@@ -120,7 +120,9 @@ knowledgeModule( {
             name: './ordering.test.json',
             heck: ['children', 'concept', 'parents', 'properties'],
             contents: ordering_tests,
-            checks: defaultContextCheck(),
+            checks: {
+              context: [defaultContextCheck()],
+            }
           },
     template: {
       template, 

package/common/ordinals.js

@@ -59,6 +59,8 @@ knowledgeModule( {
   test: {
     name: './ordinals.test.json',
     contents: ordinals_tests,
-    checks: defaultContextCheck(),
+    checks: {
+      context: [defaultContextCheck()],
+    }
   },
 })

package/common/people.js

@@ -70,7 +70,9 @@ knowledgeModule( {
   test: {
     name: './people.test.json',
     contents: people_tests,
-    checks: defaultContextCheck(),
+    checks: {
+      context: [defaultContextCheck()],
+    }
   },
   template: {
     template,

package/common/percentages.js

@@ -45,6 +45,8 @@ knowledgeModule( {
   test: {
     name: './percentages.test.json',
     contents: percentages_tests,
-    checks: defaultContextCheck(['scale'])
+    checks: {
+      context: [defaultContextCheck({ extra: ['scale'] })],
+    }
   },
 })

package/common/pipboy.instance.json

@@ -1713,6 +1713,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -6900,6 +6914,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -10182,6 +10210,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -35613,6 +35655,48 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "is",

package/common/pipboy.js

@@ -506,7 +506,7 @@ knowledgeModule({
         'apply', 'change', 'display', 'disarm', 'drink', 'eat', 'equip', 'setName', 'strip', 'take', 'wear',
         'apply', 'change', 'display', 'disarm', 'drink', 'eat', 'equip', 'setName', 'strip', 'take', 'wear', 'showWeapons',
       ],
-      ...defaultContextCheck(),
+      context: [defaultContextCheck()],
     },
   },
 })

package/common/pokemon.js

@@ -61,7 +61,9 @@ knowledgeModule( {
   test: {
           name: './pokemon.test.json',
           contents: pokemon_tests,
-          checks: defaultContextCheck(),
+          checks: {
+            context: [defaultContextCheck()],
+          },
         },
   template: {
     template,

package/common/pos.js

@@ -63,6 +63,8 @@ knowledgeModule( {
   test: {
     name: './pos.test.json',
     contents: pos_tests,
-    checks: defaultContextCheck(),
+    checks: {
+      context: [defaultContextCheck()],
+    },
   },
 })

package/common/pressure.js

@@ -23,7 +23,9 @@ knowledgeModule({
   test: {
     name: './pressure.test.json',
     contents: pressure_tests,
-    checks: defaultContextCheck(),
+    checks: {
+      context: [defaultContextCheck()],
+    },
   },
   template: {
     template,

package/common/properties.js

@@ -694,7 +694,15 @@ knowledgeModule( {
   test: {
     name: './properties.test.json',
     contents: properties_tests,
-    checks: defaultContextCheck(['object', 'objects']),
+    checks: {
+      context: [
+        defaultContextCheck({ marker: 'property', exported: true, extra: ['object', 'objects'] }),
+        defaultContextCheck({ marker: 'possession', exported: true, extra: ['object', 'objects'] }),
+        defaultContextCheck({ marker: 'propertyOf', exported: true, extra: ['object', 'objects'] }),
+        defaultContextCheck({ marker: 'objectPrefix', exported: true, extra: ['object', 'objects'] }),
+        defaultContextCheck()
+      ],
+    },
     include: {
       words: true,
       operators: true,

package/common/punctuation.js

@@ -70,7 +70,9 @@ knowledgeModule( {
   test: {
     name: './punctuation.test.json',
     contents: punctuation_tests,
-    checks: defaultContextCheck(),
+    checks: {
+      context: [defaultContextCheck()],
+    },
   },
 })
 

package/common/reminders.js

@@ -367,7 +367,7 @@ knowledgeModule( {
     name: './reminders.test.json',
     contents: reminders_tests,
     checks: {
-      ...defaultContextCheck(['who', 'reminder']),
+      context: [defaultContextCheck({ extra: ['who', 'reminder'] })],
       objects: [
         { 
           property: 'reminders',