tpmkms_4wp 9.3.0-beta.52 → 9.3.0-beta.54

package/common/fastfood.js

@@ -1,5 +1,5 @@
 const { knowledgeModule, ensureTestFile, where } = require('./runtime').theprogrammablemind
-const { defaultContextCheck, propertyToArray } = require('./helpers')
+const { defaultObjectCheck, defaultContextCheck, propertyToArray } = require('./helpers')
 const edible = require('./edible')
 const events = require('./events')
 const sizeable = require('./sizeable')
@@ -995,11 +995,7 @@ knowledgeModule( {
                 { property: 'quantity', filter: ['marker', 'value', 'text' ] },
                 { property: 'pieces', filter: ['marker', 'value', 'text' ] },
               ],
-              context: [
-                ...defaultContextCheck(),
-                // TODO some kind of conditional selector { match: (value) => value.marker == 'count', filter: ['marker', 'value', 'text'] },
-                { property: 'comboNumber', filter: ['marker', 'value', 'text' ] },
-              ],
+              ...defaultContextCheck(['comboNumber']),
             },
           },
     template: {

package/common/formulas.js

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

package/common/gdefaults.js

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

package/common/help.js

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

package/common/helpers.js

@@ -151,82 +151,25 @@ const toEValue = (context) => {
 	return context;
 }
 
-const defaultContextCheckValidify = (properties) => {
-  return // new way
-  for (const value of properties) {
-    if (typeof value == 'string') {
-      continue
-    }
-    if (typeof value.property == 'string' && value.filter) {
-      continue
-    }
-    throw new Error("Expected the <checks> argument to defaultContextCheck to be a list of <property> or { property: <property>, filter: <checks> }. Where <property> is a string.")
-  }
-}
-
-const defaultContextCheckProperties = ['marker', 'text', 'verbatim', 'isResponse', 'types', { property: 'response', filter: ['marker', 'text', 'verbatim'] }] 
-
-const expand_checks = (properties, variables = {}) => {
-  let expanded = []
-  if (properties == 'defaults') {
-    return defaultContextCheckProperties
-  }
-  if (properties.variable) {
-    return variables[properties.variable]
-  }
-  if (Array.isArray(properties)) {
-    for (const property of properties) {
-      defaultContextCheckValidify(properties)
-      if (typeof property == 'string') {
-        expanded.push({ property, filter: defaultContextCheckProperties })
-      } else if (property.property && property.filter) {
-        expanded.push({ property: property.property, filter: [defaultContextCheckProperties, ...expand_checks(property.filter, variables)] })
-      } else {
-        expanded = [...expanded, ...expand_checks(property, variables)]
-      }
-    }
-    return expanded
-  }
-  for (const key of Object.keys(properties)) {
-    if (key === '_') {
-      expanded = [...expanded, ...defaultContextCheckProperties]
-    } else {
-      expanded.push({ property: key, filter: [...expand_checks(properties[key], variables)] })
-    }
+const defaultObjectCheck = (extra = []) => {
+  return {
+    objects: [
+      {
+        match: ({objects}) => true,
+        apply: () => extra
+      },
+    ],
   }
-  return expanded
-
 }
 
-const defaultContextCheck = (properties = [], variables={}, minimal=false) => {
-  defaultContextCheckValidify(properties)
-  variables.defaults = defaultContextCheckProperties
-  if (minimal) {
-    return expand_checks(properties, variables)
-  } else {
-    return [
-      ...defaultContextCheckProperties,
-      // ...properties.map((property) => { return { property, filter: defaultContextCheckProperties } }),
-      ...expand_checks(properties, variables),
-      (object) => {
-        if (typeof object.value == 'object') {
-          return { property: 'value', filter: defaultContextCheckProperties }
-        } else {
-          return 'value'
-        }
-      },
-      (object) => {
-        if (!Array.isArray(object.modifiers)) {
-          return
-        }
-        if (typeof object.modifiers[0] == 'object') {
-          return { property: 'modifiers', filter: defaultContextCheckProperties }
-        } else {
-          return 'modifiers'
-        }
+const defaultContextCheck = (extra = []) => {
+  return {
+    context: [
+      {
+        match: ({context}) => !Array.isArray(context),
+        apply: () => ['marker', 'text', 'verbatim', 'value', 'evalue', 'isResponse', { properties: 'modifiers' }, { properties: 'postModifiers' }, ...extra],
       },
-      { property: 'modifiers', isPropertyList: true, filter: defaultContextCheckProperties }
-    ]
+    ],
   }
 }
 
@@ -319,7 +262,7 @@ module.exports = {
   pushL,
   getValue,
   defaultContextCheck,
-  defaultContextCheckProperties,
+  defaultObjectCheck,
 	toEValue,
   millisecondsUntilHourOfDay,
   indent,

package/common/hierarchy.js

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

package/common/javascript.js

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

package/common/kirk.js

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

package/common/length.js

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

package/common/listener.js

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

package/common/math.js

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

package/common/menus.js

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

package/common/meta.js

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

package/common/nameable.js

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

package/common/negation.js

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

package/common/numbers.js

@@ -111,9 +111,6 @@ knowledgeModule( {
   test: {
     name: './numbers.test.json',
     contents: numbers_tests,
-    checks: {
-            context: defaultContextCheck(),
-          },
-
+    checks: defaultContextCheck(['instance'])
   },
 })

package/common/ordering.js

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

package/common/ordinals.js

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

package/common/people.instance.json

@@ -8430,24 +8430,6 @@
             0
           ]
         ],
-        [
-          [
-            "by",
-            0
-          ],
-          [
-            "isEd",
-            0
-          ],
-          [
-            "owned",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "isEd",
@@ -8846,24 +8828,6 @@
         0
       ]
     ],
-    [
-      [
-        "by",
-        0
-      ],
-      [
-        "isEd",
-        0
-      ],
-      [
-        "owned",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "first",

package/common/people.js

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

package/common/percentages.js

@@ -45,9 +45,6 @@ knowledgeModule( {
   test: {
     name: './percentages.test.json',
     contents: percentages_tests,
-    checks: {
-      context: [...defaultContextCheck(), { property: 'scale', filter: ['marker', 'word', 'value'] }],
-    },
-
+    checks: defaultContextCheck(['scale'])
   },
 })

package/common/percentages.test.json

@@ -16,6 +16,7 @@
     },
     "contexts": [
       {
+        "context_id": 2,
         "context_index": 1,
         "dead": true,
         "level": 1,
@@ -87,6 +88,8 @@
       ]
     },
     "objects": {
+      "associations": [
+      ],
       "nameToUUID": {
         "gdefaults": "gdefaults2",
         "numbers": "numbers2",
@@ -96,19 +99,25 @@
       },
       "namespaced": {
         "gdefaults2": {
+          "km": "gdefaults2"
         },
         "numbers2": {
+          "km": "numbers2"
         },
         "percentages1": {
+          "km": "percentages1"
         },
         "sdefaults2": {
+          "km": "sdefaults2"
         },
         "tokenize2": {
+          "km": "tokenize2"
         }
       },
       "processed": [
         {
           "context": {
+            "context_id": 2,
             "context_index": 1,
             "dead": true,
             "level": 1,
@@ -141,9 +150,12 @@
             "value": "percent",
             "word": "percent"
           },
-          "generatedParenthesized": "",
-          "paraphrases": "10 percent",
-          "paraphrasesParenthesized": "(10 percent)",
+          "generatedParenthesized": [
+          ],
+          "paraphrases": [
+          ],
+          "paraphrasesParenthesized": [
+          ],
           "responses": [
             ""
           ]
@@ -250,6 +262,7 @@
     },
     "contexts": [
       {
+        "context_id": 2,
         "context_index": 1,
         "dead": true,
         "level": 1,
@@ -321,6 +334,8 @@
       ]
     },
     "objects": {
+      "associations": [
+      ],
       "nameToUUID": {
         "gdefaults": "gdefaults2",
         "numbers": "numbers2",
@@ -330,19 +345,25 @@
       },
       "namespaced": {
         "gdefaults2": {
+          "km": "gdefaults2"
         },
         "numbers2": {
+          "km": "numbers2"
         },
         "percentages1": {
+          "km": "percentages1"
         },
         "sdefaults2": {
+          "km": "sdefaults2"
         },
         "tokenize2": {
+          "km": "tokenize2"
         }
       },
       "processed": [
         {
           "context": {
+            "context_id": 2,
             "context_index": 1,
             "dead": true,
             "level": 1,
@@ -375,9 +396,12 @@
             "value": "percent",
             "word": "%"
           },
-          "generatedParenthesized": "",
-          "paraphrases": "10%",
-          "paraphrasesParenthesized": "(10%)",
+          "generatedParenthesized": [
+          ],
+          "paraphrases": [
+          ],
+          "paraphrasesParenthesized": [
+          ],
           "responses": [
             ""
           ]
@@ -512,6 +536,7 @@
     },
     "contexts": [
       {
+        "context_id": 2,
         "context_index": 1,
         "dead": true,
         "default": true,
@@ -563,13 +588,16 @@
           "percentages#call2"
         ],
         "value": {
+          "context_id": 2,
           "context_index": 1,
           "dead": true,
           "default": true,
           "evalue": {
             "edefault": true,
-            "evalue": 110,
+            "evalue": 11,
             "instance": true,
+            "isModule": true,
+            "isProcess": true,
             "level": 0,
             "marker": "integer",
             "range": {
@@ -587,6 +615,8 @@
             "word": null
           },
           "instance": true,
+          "isModule": true,
+          "isProcess": true,
           "isReponse": true,
           "isResponse": true,
           "level": 1,
@@ -728,6 +758,8 @@
       ]
     },
     "objects": {
+      "associations": [
+      ],
       "nameToUUID": {
         "gdefaults": "gdefaults2",
         "numbers": "numbers2",
@@ -737,19 +769,25 @@
       },
       "namespaced": {
         "gdefaults2": {
+          "km": "gdefaults2"
         },
         "numbers2": {
+          "km": "numbers2"
         },
         "percentages1": {
+          "km": "percentages1"
         },
         "sdefaults2": {
+          "km": "sdefaults2"
         },
         "tokenize2": {
+          "km": "tokenize2"
         }
       },
       "processed": [
         {
           "context": {
+            "context_id": 2,
             "context_index": 1,
             "dead": true,
             "default": true,
@@ -801,13 +839,16 @@
               "percentages#call2"
             ],
             "value": {
+              "context_id": 2,
               "context_index": 1,
               "dead": true,
               "default": true,
               "evalue": {
                 "edefault": true,
-                "evalue": 110,
+                "evalue": 11,
                 "instance": true,
+                "isModule": true,
+                "isProcess": true,
                 "level": 0,
                 "marker": "integer",
                 "range": {
@@ -825,6 +866,8 @@
                 "word": null
               },
               "instance": true,
+              "isModule": true,
+              "isProcess": true,
               "isReponse": true,
               "isResponse": true,
               "level": 1,
@@ -894,9 +937,12 @@
             },
             "word": "of"
           },
-          "generatedParenthesized": "(((11)))",
-          "paraphrases": "10 percent of 110",
-          "paraphrasesParenthesized": "(10 percent of 110)",
+          "generatedParenthesized": [
+          ],
+          "paraphrases": [
+          ],
+          "paraphrasesParenthesized": [
+          ],
           "responses": [
             "11"
           ]