tpmkms_4wp 9.3.0-beta.51 → 9.3.0-beta.53

package/common/articles.js

@@ -120,10 +120,6 @@ knowledgeModule( {
   test: {
     name: './articles.test.json',
     contents: tests,
-    checks: {
-            objects: ['onNevermindWasCalled', 'nevermindType', 'idSuffix'],
-            context: defaultContextCheck(['distributer']),
-          },
-
+    checks: defaultContextCheck(['distributer']),
   },
 })

package/common/asking.js

@@ -4,7 +4,7 @@ const gdefaults = require('./gdefaults.js')
 const sdefaults = require('./sdefaults.js')
 const conjunction = require('./conjunction.js')
 const asking_tests = require('./asking.test.json')
-const { defaultContextCheck, indent, focus, requiredArgument } = require('./helpers')
+const { defaultObjectCheck, defaultContextCheck, indent, focus, requiredArgument } = require('./helpers')
 const pluralize = require('pluralize')
 
 // TODO implement what / what did you say ...
@@ -260,8 +260,8 @@ knowledgeModule( {
     name: './asking.test.json',
     contents: asking_tests,
     checks: {
-      objects: ['onNevermindWasCalled', 'nevermindType', 'choice'],
-      context: defaultContextCheck(),
+      ...defaultObjectCheck(['onNevermindWasCalled', 'nevermindType', 'choice']),
+      ...defaultContextCheck(),
     },
   },
 })

package/common/avatar.js

@@ -69,8 +69,6 @@ knowledgeModule( {
   test: {
     name: './avatar.test.json',
     contents: avatar_tests,
-    checks: {
-            context: defaultContextCheck(),
-          },
+    checks: defaultContextCheck(),
   }
 })

package/common/characters.js

@@ -200,8 +200,6 @@ knowledgeModule({
   test: {
     name: './characters.test.json',
     contents: characters_tests,
-    checks: {
-        context: defaultContextCheck(),
-          },
+    checks: defaultContextCheck(),
   },
 })

package/common/colors.instance.json

@@ -3586,20 +3586,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -36049,20 +36035,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",

package/common/colors.js

@@ -55,9 +55,7 @@ knowledgeModule( {
   test: {
     name: './colors.test.json',
     contents: colors_tests,
-    checks: {
-      context: defaultContextCheck(),
-    },
+    checks: defaultContextCheck(),
   },
   template: {
     template,

package/common/comparable.js

@@ -80,8 +80,6 @@ knowledgeModule({
   test: {
     name: './comparable.test.json',
     contents: comparable_tests,
-    checks: {
-      context: [...defaultContextCheck(), 'ordering'],
-    },
+    checks: defaultContextCheck(['ordering']),
   },
 })

package/common/concept.js

@@ -148,9 +148,6 @@ knowledgeModule({
   test: {
     name: './concept.test.json',
     contents: concept_tests,
-    checks: {
-      context: defaultContextCheck(),
-      objects: [],
-    }
+    checks: defaultContextCheck(),
   }
 })

package/common/conjunction.js

@@ -1,7 +1,7 @@
 const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const gdefaults = require('./gdefaults.js')
 const conjunction_tests = require('./conjunction.test.json')
-const { defaultContextCheck, propertyToArray } = require('./helpers')
+const { defaultObjectCheck, defaultContextCheck, propertyToArray } = require('./helpers')
 const { isA, asList, listable } = require('./helpers/conjunction.js')
 
 const config = {
@@ -109,10 +109,6 @@ knowledgeModule( {
   test: {
     name: './conjunction.test.json',
     contents: conjunction_tests,
-    checks: {
-            objects: ['idSuffix'],
-            context: defaultContextCheck(),
-          },
-
+    checks: defaultContextCheck(),
   },
 })

package/common/countable.js

@@ -94,20 +94,6 @@ knowledgeModule({
   test: {
     name: './countable.test.json',
     contents: countable_tests,
-    checks: {
-            context: [
-              ...defaultContextCheck(), 
-              { 
-                property: 'quantity', 
-                filter: ['marker', 'value'],
-              },
-              { 
-                property: 'pieces', 
-                filter: [
-                  'marker', 'text',
-                  { property: 'count', filter: ['marker', 'value'] },
-                ] 
-              }]
-          },
+    checks: defaultContextCheck(['count', 'quantity']), 
   },
 })

package/common/crew.js

@@ -82,9 +82,7 @@ knowledgeModule( {
   test: {
           name: './crew.test.json',
           contents: crew_tests,
-          checks: {
-                  context: defaultContextCheck(),
-                },
+          checks: defaultContextCheck(),
         },
   template: {
     template,

package/common/currency.js

@@ -120,9 +120,6 @@ knowledgeModule({
   test: {
     name: './currency.test.json',
     contents: currency_tests,
-    checks: {
-            context: defaultContextCheck(),
-          },
-
+    checks: defaultContextCheck(),
   },
 })

package/common/dateTimeSelectors.js

@@ -150,18 +150,7 @@ knowledgeModule( {
   test: {
     name: './dateTimeSelectors.test.json',
     contents: dateTimeSelectors_tests,
-    checks: {
-      context: defaultContextCheck([
-        'date', 'time', 'response',
-        {
-          value: {
-            date: { variable: 'defaults' },
-            time: { variable: 'defaults' },
-            evalue: { variable: 'defaults' },
-          },
-        }
-      ]),
-    },
+    checks: defaultContextCheck(['date', 'time', 'response', 'after', 'day', 'month', 'year', 'evalue']),
   },
   template: {
     template,

package/common/dates.instance.json

@@ -3287,20 +3287,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -11651,20 +11637,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -15754,20 +15726,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -18615,48 +18573,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "setIdSuffix",

package/common/dates.js

@@ -242,23 +242,7 @@ knowledgeModule( {
   test: {
     name: './dates.test.json',
     contents: dates_tests,
-    checks: {
-      context: defaultContextCheck([
-          'month', 'day', 'year', 'era', 'month_ordinal', 'day_ordinal',
-          {
-            month: [
-              'month_ordinal',
-            ],
-            day: [
-              'day_ordinal',
-            ],
-            date: [
-              'month_ordinal',
-              'day_ordinal',
-            ],
-          },
-        ]),
-    },
+    checks: defaultContextCheck(['month', 'day', 'year', 'era', 'month_ordinal', 'day_ordinal', 'month', 'date']),
   },
   template: {
     template,

package/common/dialogues.js

@@ -13,7 +13,7 @@ const _ = require('lodash')
 const { API } = require('./helpers/dialogues')
 const { isMany, propertyToArray, words } = require('./helpers')
 const dialogues_tests = require('./dialogues.test.json')
-const { defaultContextCheck, indent, focus } = require('./helpers')
+const { defaultObjectCheck, defaultContextCheck, indent, focus } = require('./helpers')
 const pluralize = require('pluralize')
 
 const api = new API()
@@ -828,8 +828,8 @@ knowledgeModule( {
     name: './dialogues.test.json',
     contents: dialogues_tests,
     checks: {
-            objects: ['idSuffix'],
-            context: defaultContextCheck(),
+            ...defaultObjectCheck(['idSuffix']),
+            ...defaultContextCheck(['one', 'two']),
           },
 
   },

package/common/dimension.js

@@ -1,5 +1,5 @@
 const { knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
-const { defaultContextCheck } = require('./helpers')
+const { defaultObjectCheck, defaultContextCheck } = require('./helpers')
 const hierarchy = require('./hierarchy.js')
 const formulas = require('./formulas.js')
 const testing = require('./testing.js')
@@ -197,9 +197,7 @@ knowledgeModule({
     contents: tests,
     checks: {
       objects: [{ km: 'properties' }],
-      checks: {
-            context: defaultContextCheck(),
-          },
+      ...defaultContextCheck(),
     },
   },
 })

package/common/edible.instance.json

@@ -6494,20 +6494,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -24632,20 +24618,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -69665,34 +69637,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",

package/common/edible.js

@@ -82,9 +82,7 @@ knowledgeModule( {
       test: {
               name: './edible.test.json',
               contents: edible_tests,
-              checks: {
-                  context: defaultContextCheck(),
-              },
+              checks: defaultContextCheck(),
             },
       template: {
         template,

package/common/emotions.js

@@ -65,9 +65,7 @@ knowledgeModule( {
       test: {
               name: './emotions.test.json',
               contents: emotions_tests,
-              checks: {
-                  context: defaultContextCheck(),
-                },
+              checks: defaultContextCheck(),
             },
       template: {
         template,

package/common/errors.js

@@ -44,6 +44,7 @@ knowledgeModule({
   test: {
     name: './errors.test.json',
     contents: tests,
+    checks: defaultContextCheck(), 
     /*
     checks: {
             context: [

package/common/evaluate.js

@@ -46,8 +46,6 @@ knowledgeModule({
     include: {
       words: true,
     },
-    checks: {
-      context: defaultContextCheck(),
-    },
+    checks: defaultContextCheck(),
   },
 })

package/common/events.js

@@ -130,9 +130,6 @@ knowledgeModule({
     include: {
       words: true,
     },
-    checks: {
-      context: defaultContextCheck(['event', 'action']),
-    },
-
+    checks: defaultContextCheck(['event', 'action']),
   },
 })