tpmkms_4wp 9.3.0-beta.9 → 9.4.0

package/common/articles.js

@@ -121,9 +121,7 @@ knowledgeModule( {
     name: './articles.test.json',
     contents: tests,
     checks: {
-            objects: ['onNevermindWasCalled', 'nevermindType', 'idSuffix'],
-            context: defaultContextCheck(['distributer']),
-          },
-
+      context: [defaultContextCheck({ extra: ['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 ...
@@ -96,13 +96,14 @@ const config = {
 
 const getAsk = (config) => (uuid) => {
     return (asks) => {
-    const ask = (ask) => {
+    const ask = (ask, s_ids) => {
       let oneShot = true // default
       if (ask.oneShot === false) {
         oneShot = false
       }
 
       const id_q = stableId('semantic')
+      s_ids.push(id_q)
       const id_rs = []
       let wasAsked = false
       let wasApplied = false
@@ -126,10 +127,12 @@ const getAsk = (config) => (uuid) => {
       for (const semantic of semanticsr) {
         const id_r = stableId('semantic')
         id_rs.push(id_r)
+        s_ids.push(id_r)
         config.addSemantic({
           uuid,
           id: id_r,
           tied_ids: [id_q],
+          // tied_ids: s_ids,
           oneShot,
           where: semantic.where || ask.where || where(2),
           source: 'response',
@@ -146,6 +149,7 @@ const getAsk = (config) => (uuid) => {
         oneShot,
         id: id_q,
         tied_ids: id_rs,
+        // tied_ids: s_ids,
         where: ask.where,
         isQuestion: true,  // do one question at a time
         getWasAsked,
@@ -170,6 +174,8 @@ const getAsk = (config) => (uuid) => {
             args.verbatim(await applyq({ ...args, wasAsked: getWasAsked() }))
             setWasAsked(true)
             args.context.controlKeepMotivation = true
+          } else {
+            args._continue()
           }
           args.context.cascade = true
         }
@@ -179,7 +185,15 @@ const getAsk = (config) => (uuid) => {
       asks = [asks]
     }
 
-    [...asks].reverse().forEach( (a) => ask(a) )
+    const s_ids = []
+    for (const a of [...asks].reverse()) {
+      ask(a, s_ids)
+    }
+    
+    const cleanUp = () => {
+      config.removeSemantic(s_ids)
+    }
+    return cleanUp
   }
 }
 
@@ -246,8 +260,10 @@ knowledgeModule( {
     name: './asking.test.json',
     contents: asking_tests,
     checks: {
-      objects: ['onNevermindWasCalled', 'nevermindType', 'choice'],
-      context: defaultContextCheck(),
+      ...defaultObjectCheck(['onNevermindWasCalled', 'nevermindType', 'choice']),
+      context: [
+        defaultContextCheck(),
+      ],
     },
   },
 })

package/common/avatar.js

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

package/common/characters.js

@@ -201,7 +201,7 @@ knowledgeModule({
     name: './characters.test.json',
     contents: characters_tests,
     checks: {
-        context: defaultContextCheck(),
-          },
+      context: [defaultContextCheck()],
+    },
   },
 })

package/common/colors.instance.json

@@ -189,11 +189,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -683,11 +678,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -1633,11 +1623,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -3601,6 +3586,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -8442,11 +8441,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -9799,11 +9793,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -11425,11 +11414,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -14077,11 +14061,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -16929,11 +16908,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -20612,11 +20586,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -23289,11 +23258,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -26661,11 +26625,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -29207,11 +29166,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -31431,11 +31385,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -33772,11 +33721,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -36105,6 +36049,20 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "is",

package/common/colors.js

@@ -56,8 +56,8 @@ knowledgeModule( {
     name: './colors.test.json',
     contents: colors_tests,
     checks: {
-      context: defaultContextCheck(),
-    },
+      context: [defaultContextCheck()],
+    }
   },
   template: {
     template,

package/common/comparable.instance.json

@@ -83,11 +83,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -608,11 +603,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",
@@ -1424,11 +1414,6 @@
           "article",
           false
         ],
-        [
-          "evaluate",
-          "verb",
-          false
-        ],
         [
           "every",
           "article",

package/common/comparable.js

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

package/common/concept.js

@@ -149,8 +149,7 @@ knowledgeModule({
     name: './concept.test.json',
     contents: concept_tests,
     checks: {
-      context: defaultContextCheck(),
-      objects: [],
+      context: [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 = {
@@ -110,9 +110,7 @@ knowledgeModule( {
     name: './conjunction.test.json',
     contents: conjunction_tests,
     checks: {
-            objects: ['idSuffix'],
-            context: defaultContextCheck(),
-          },
-
+      context: [defaultContextCheck()],
+    },
   },
 })

package/common/countable.js

@@ -95,19 +95,7 @@ knowledgeModule({
     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'] },
-                ] 
-              }]
-          },
+      context: [defaultContextCheck({ extra: ['count', 'quantity'] })],
+    }
   },
 })