tpmkms_4wp 9.3.0-beta.31 → 9.3.0-beta.32

package/common/asking.js

@@ -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: [id_q],
+          tied_ids: s_ids,
           oneShot,
           where: semantic.where || ask.where || where(2),
           source: 'response',
@@ -145,7 +148,8 @@ const getAsk = (config) => (uuid) => {
         uuid,
         oneShot,
         id: id_q,
-        tied_ids: id_rs,
+        // 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
   }
 }
 

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/crew.instance.json

@@ -22668,24 +22668,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "mccoy",
-            0
-          ],
-          [
-            "name",
-            0
-          ],
-          [
-            "possession",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -30514,6 +30496,24 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "propertyOf",
+            0
+          ],
+          [
+            "the",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -52528,24 +52528,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "mccoy",
-        0
-      ],
-      [
-        "name",
-        0
-      ],
-      [
-        "possession",
-        0
-      ]
-    ],
     [
       [
         "is",
@@ -53140,6 +53122,24 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "propertyOf",
+        0
+      ],
+      [
+        "the",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "is",

package/common/dateTimeSelectors.instance.json

@@ -25,7 +25,7 @@
       "semantics": [
         {
           "match": "({context, isA}) => (isA(context.marker, 'onDateValue_dates') || isA(context.marker, 'dateTimeSelector')) && !!context.evaluate",
-          "apply": "({context, isProcess, isTest, kms}) => {\n            debugger\n            context.evalue = instantiate(kms, isProcess || isTest || context.isTest, context)\n          }"
+          "apply": "({context, isProcess, isTest, kms}) => {\n            context.evalue = instantiate(kms, isProcess || isTest || context.isTest, context)\n          }"
         }
       ]
     }

package/common/dates.instance.json

@@ -3230,20 +3230,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -11591,20 +11577,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -15694,20 +15666,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -18918,48 +18876,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "setIdSuffix",

package/common/dialogues.js

@@ -278,47 +278,6 @@ const config = {
       bridge: "{ ...next(operator) }" 
     },
     */
-    /*
-    { 
-      id: "nevermind", 
-      bridge: "{ ...next(operator) }",
-      semantic: (args) => {
-        const {config, context} = args
-        // stop asking all questions
-        for (const semantic of config.semantics) {
-          if (semantic.isQuestion) {
-            let doRemove = true
-            if (semantic.onNevermind && semantic.getWasAsked() && !semantic.getWasApplied()) {
-              doRemove = semantic.onNevermind(args)
-            }
-            if (doRemove) {
-              config.removeSemantic(semantic)
-            }
-          }
-        }
-      }
-    },
-    */
-    /*
-    { 
-      id: "nevermindTestSetup", 
-      development: true,
-      bridge: "{ ...next(operator), type: after[0], postModifiers: ['type'] }",
-      semantic: ({ask, context}) => {
-        const nevermindType = context.type.value
-        ask({
-          applyq: () => 'the test question?',
-          onNevermind: ({objects, context}) => {
-            objects.onNevermindWasCalled = true
-            objects.nevermindType = nevermindType
-            return nevermindType == 'accept'
-          },
-          matchr: () => false,
-          applyr: () => {},
-        })
-      }
-    },
-    */
     { 
       id: "why", 
       level: 0, 

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",