npm - tpmkms - Versions diffs - 7.12.7 → 7.12.8-beta.0 - Mend

tpmkms 7.12.7 → 7.12.8-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/common/animals.instance.json +0 -44
package/common/dialogues.js +106 -3
package/common/edible.instance.json +2 -190
package/common/fastfood.instance.json +886 -922
package/common/formulas.test.json +1187 -3651
package/common/length.instance.json +120 -60
package/common/math.instance.json +1979 -1
package/common/math.js +17 -5
package/common/ordering.instance.json +0 -52
package/common/pipboy.test.json +13 -9
package/common/pokemon.instance.json +0 -44
package/common/pressure.instance.json +32 -0
package/common/reports.instance.json +17 -1
package/common/temperature.instance.json +32 -60
package/common/ui.instance.json +8 -0
package/common/weight.instance.json +128 -48
package/main.js +0 -2
package/package.json +2 -6
package/common/mathTemplate.instance.json +0 -1635
package/common/mathTemplate.js +0 -32
package/common/mathTemplate.test.json +0 -1422

package/common/animals.instance.json CHANGED Viewed

@@ -5926,28 +5926,6 @@
             1
           ]
         ],
-        [
-          [
-            "bird",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "bird",
@@ -8774,28 +8752,6 @@
         1
       ]
     ],
-    [
-      [
-        "bird",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "bird",

package/common/dialogues.js CHANGED Viewed

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { Config, knowledgeModule, where, stableId } = require('./runtime').theprogrammablemind
 const meta = require('./meta.js')
 const gdefaults = require('./gdefaults.js')
 const sdefaults = require('./sdefaults.js')
@@ -893,6 +893,105 @@ let configStruct = {
   ],
 };
+// move ask to the KM's since verbatim is called probably in dialogues?
+const getAsk = (config) => (uuid) => {
+    // if (!uuid) {
+    //  debugger
+    //}
+    return (asks) => {
+    const ask = (ask) => {
+      let oneShot = true // default
+      if (ask.oneShot === false) {
+        oneShot = false
+      }
+      const id_q = stableId('semantic')
+      const id_rs = []
+      let wasAsked = false
+      let wasApplied = false
+      const getWasAsked = () => {
+        return wasAsked
+      }
+      const setWasAsked = (value) => {
+        wasAsked = value
+      }
+      const getWasApplied = () => {
+        return wasApplied
+      }
+      const setWasApplied = (value) => {
+        wasApplied = value
+      }
+      const semanticsr = ask.semanticsr || []
+      if (semanticsr.length == 0) {
+        semanticsr.push({ match: ask.matchr, apply: ask.applyr })
+      }
+      for (const semantic of semanticsr) {
+        const id_r = stableId('semantic')
+        id_rs.push(id_r)
+        config.addSemantic({
+          uuid,
+          id: id_r,
+          tied_ids: [id_q],
+          oneShot,
+          where: semantic.where || ask.where || where(2),
+          source: 'response',
+          match: (args) => semantic.match(args),
+          apply: (args) => {
+            setWasApplied(true)
+            semantic.apply(args)
+          },
+        })
+      }
+      config.addSemantic({
+        uuid,
+        oneShot,
+        id: id_q,
+        tied_ids: id_rs,
+        where: ask.where,
+        isQuestion: true,  // do one question at a time
+        getWasAsked,
+        getWasApplied,
+        onNevermind: ask.onNevermind,
+        source: 'question',
+        match: ({ context }) => context.marker == 'controlEnd' || context.marker == 'controlBetween',
+        apply: (args) => {
+          let matchq = ask.matchq
+          let applyq = ask.applyq
+          if (!matchq) {
+            let wasAsked = false
+            matchq = () => !wasAsked,
+            applyq = (args) => {
+              wasAsked = true
+              return ask.applyq(args)
+            }
+          }
+          if (matchq(args)) {
+            setWasAsked(true)
+            setWasApplied(false)
+            // args.context.motivationKeep = true
+            args.verbatim(applyq(args))
+            /*
+              args.context.verbatim = applyq(args)
+              args.context.isResponse = true;
+              delete args.context.controlRemove;
+              */
+            args.context.controlKeepMotivation = true
+          }
+          args.context.cascade = true
+        }
+      })
+    }
+    if (!Array.isArray(asks)) {
+      asks = [asks]
+    }
+    [...asks].reverse().forEach( (a) => ask(a) )
+  }
+}
 const createConfig = () => {
   const config = new Config(configStruct, module)
   config.stop_auto_rebuild()
@@ -904,7 +1003,7 @@ const createConfig = () => {
       e: (context) => config.api.getEvaluator(args.s, args.log, context),
     }))
     */
-    config.addArgs(({isA}) => ({
+    config.addArgs(({config, isA}) => ({
       isAListable: (context, type) => {
         if (context.marker == 'list' || context.listable) {
           return context.value.every( (element) => isA(element.marker, type) )
@@ -912,7 +1011,7 @@ const createConfig = () => {
           return isA(context.marker, type)
         }
       },
-      toContext(v) {
+      toContext: (v) => {
         if (Array.isArray(v)) {
           return { marker: 'list', level: 1, value: v }
         }
@@ -921,6 +1020,10 @@ const createConfig = () => {
         }
         return v
       },
+      getUUIDScoped: (uuid) => { return {
+          ask: getAsk(config)(uuid),
+        }
+      },
     }))
     objects.mentioned = []
     objects.variables = {

package/common/edible.instance.json CHANGED Viewed

@@ -2293,11 +2293,11 @@
                 0
               ],
               [
-                "chicken_nugget",
+                "chicken_strip",
                 0
               ],
               [
-                "chicken_strip",
+                "chicken_nugget",
                 0
               ]
             ],
@@ -4456,38 +4456,6 @@
             "list",
             0
           ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
           [
             "unknown",
             1
@@ -17635,28 +17603,6 @@
             1
           ]
         ],
-        [
-          [
-            "comma",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "comma",
@@ -17689,20 +17635,6 @@
             1
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "is",
@@ -41002,32 +40934,6 @@
             1
           ]
         ],
-        [
-          [
-            "comma",
-            0
-          ],
-          [
-            "drink",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "comma",
@@ -48701,32 +48607,6 @@
         1
       ]
     ],
-    [
-      [
-        "comma",
-        0
-      ],
-      [
-        "drink",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "comma",
@@ -48789,28 +48669,6 @@
         1
       ]
     ],
-    [
-      [
-        "comma",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "comma",
@@ -49387,24 +49245,6 @@
         1
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "is",
@@ -49539,34 +49379,6 @@
         1
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "is",