tpmkms 9.5.0 → 9.5.1-beta.10

package/common/currency.js

@@ -89,7 +89,7 @@ const config = {
   ],
 };
 
-const initializer = ({config, objects, apis, addWord, addGenerator, baseConfig, uuid}) => {
+function initializer({config, objects, apis, addWord, addGenerator, baseConfig, uuid}) {
   const api = apis('currency')
   units = api.getUnits()
   for (word in units) {

package/common/dates.instance.json

@@ -2972,7 +2972,7 @@
             "text": "january, february, march, april, may, june, july, august, september, october, november and december",
             "range": {
               "start": 0,
-              "end": 109
+              "end": 98
             },
             "types": [
               "list",
@@ -3401,6 +3401,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -11477,7 +11491,7 @@
             "text": "monday, tuesday, wednesday, thursday, friday, saturday and sunday",
             "range": {
               "start": 0,
-              "end": 73
+              "end": 64
             },
             "types": [
               "list",
@@ -11751,6 +11765,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -15659,7 +15687,7 @@
             "text": "ac, bc, bce and ad",
             "range": {
               "start": 0,
-              "end": 26
+              "end": 17
             },
             "types": [
               "list",
@@ -15840,6 +15868,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -18801,6 +18843,48 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "setIdSuffix",

package/common/dialogues.js

@@ -18,7 +18,7 @@ const pluralize = require('pluralize')
 
 const api = new API()
 
-const warningIsANotImplemented = (log, context) => {
+function warningIsANotImplemented(log, context) {
   const description = 'WARNING from Dialogues KM: For semantics in order to handle sentences of type "x is y?", set the response to what you like.'
   const match = `({context, hierarchy}) => hierarchy.isA(context.marker, 'is') && context.query && <other conditions as you like>`
   const apply = `({context}) => <do stuff...>; context.evalue = <value>`
@@ -27,7 +27,7 @@ const warningIsANotImplemented = (log, context) => {
   log(indent(message, 4))
 }
 
-const warningSameNotEvaluated = (log, one) => {
+function warningSameNotEvaluated(log, one) {
   const description = 'WARNING from Dialogues KM: For the "X is Y" type phrase implement a same handler.'
   const match = `({context}) => context.marker == '${one.marker}' && context.same && <other conditions as you like>`
   const apply = '({context}) => <do stuff... context.same is the other value>; context.sameWasProcessed = true'
@@ -36,7 +36,7 @@ const warningSameNotEvaluated = (log, one) => {
   log(indent(message, 4))
 }
 
-const listorama = (type) => {
+function listorama(type) {
   return [
       { context: [[type, 0], ['list', 0], [type, 0]], choose: 0 },
       { context: [[type, 1], ['list', 0], [type, 0]], choose: 0 },
@@ -69,7 +69,7 @@ const config = {
     "([isEder|])",
 
     // "([nevermind])",
-    // { pattern: "([nevermindTestSetup] (allowed))", development: true },
+    // { pattern: "([nevermindTestSetup] (allowed))", scope: "testing" },
     "([why])",
     "([reason])",
     // "([thisitthat|])",
@@ -245,6 +245,7 @@ const config = {
     { id: "canBeDoQuestion", level: 2, bridge: "{ ...next(operator) }" },
     { id: "doesAble", level: 0, bridge: "{ ...next(operator) }" },
     { id: "doesAble", level: 1, bridge: "{ ...next(operator), before: before[0] }" },
+    // { id: "does", level: 0, bridge: "{ query: true, wantsTruthValue: true, what: operator.marker, ...context, number: operator.number, object.number: operator.number }*" },
     { id: "does", level: 0, bridge: "{ query: true, what: operator.marker, ...context, number: operator.number, object.number: operator.number }*" },
 
     /*
@@ -369,11 +370,13 @@ const config = {
     {
       where: where(),
       notes: "handle making responses brief",
-      match: ({context, objects}) => (context.topLevel || context.isResponse) && objects.brief && !context.briefWasRun,
+      match: ({context, objects, callId}) => (context.topLevel || context.isResponse) && objects.brief && !context.briefWasRun,
       apply: async ({context, g}) => {
         const focussed = focus(context)
         context.briefWasRun = true
-        return await g(focussed)
+        const result = await g(focussed)
+        context.briefWasRun = false
+        return result
       },
       priority: -2,
     },
@@ -393,7 +396,7 @@ const config = {
       where: where(),
       notes: "be brief or wordy",
       match: ({context}) => context.marker == 'be',
-      apply: ({context}) => `be ${context.type.word}`,
+      apply: ({context}) => `be ${context.type?.word}`,
     },
     /*
     {
@@ -528,7 +531,7 @@ const config = {
           return `${await gp(context.one)} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${await g(context.two)}`
         }
 
-        const hasFocus = (property) => {
+        function hasFocus(property) {
           if (context.focusableForPhrase) {
             return true
           }
@@ -788,7 +791,7 @@ const config = {
   ],
 };
 
-const initializer = ({objects, config, isModule}) => {
+function initializer({objects, config, isModule}) {
   /* TODO add this beck in. some stuff from config needs to be here
   config.addArgs((args) => ({ 
     e: (context) => config.api.getEvaluator(args.s, args.log, context),

package/common/dimension.instance.json

@@ -6,13 +6,13 @@
       "operators": [
         "([dimension])",
         "([unit])",
-        "((amount/1 || number/1) [amountOfDimension|] ([unit]))",
+        "((amount/* || number/*) [amountOfDimension|] ([unit]))",
         "(([amount]) [unit])",
         "((dimension) [convertToUnits|in] (unit))",
         "(([number]) [degree])",
         {
           "pattern": "([length])",
-          "development": true
+          "scope": "testing"
         }
       ],
       "priorities": [
@@ -36,7 +36,7 @@
         {
           "child": "convertToUnits",
           "parent": "testingValue",
-          "development": true
+          "scope": "testing"
         }
       ],
       "generators": [
@@ -59,7 +59,7 @@
             "dimension"
           ],
           "bridge": "{ ...next(operator) }",
-          "development": true
+          "scope": "testing"
         },
         {
           "id": "amount"
@@ -1135,7 +1135,7 @@
             "text": "dimension and unit",
             "range": {
               "start": 0,
-              "end": 30
+              "end": 17
             },
             "types": [
               "list",
@@ -1552,13 +1552,13 @@
       "operators": [
         "([dimension])",
         "([unit])",
-        "((amount/1 || number/1) [amountOfDimension|] ([unit]))",
+        "((amount/* || number/*) [amountOfDimension|] ([unit]))",
         "(([amount]) [unit])",
         "((dimension) [convertToUnits|in] (unit))",
         "(([number]) [degree])",
         {
           "pattern": "([length])",
-          "development": true
+          "scope": "testing"
         }
       ],
       "priorities": [
@@ -1582,7 +1582,7 @@
         {
           "child": "convertToUnits",
           "parent": "testingValue",
-          "development": true
+          "scope": "testing"
         }
       ],
       "generators": [
@@ -1604,7 +1604,7 @@
             "dimension"
           ],
           "bridge": "{ ...next(operator) }",
-          "development": true
+          "scope": "testing"
         },
         {
           "id": "amount"

package/common/dimension.js

@@ -58,19 +58,19 @@ const config = {
     "([dimension])",
     "([unit])",
     // "(([unit]) [kindOfDimension|of] ([dimension]))",
-    "((amount/1 || number/1) [amountOfDimension|] ([unit]))",
+    "((amount/* || number/*) [amountOfDimension|] ([unit]))",
     "(([amount]) [unit])",
     "((dimension) [convertToUnits|in] (unit))",
 
     "(([number]) [degree])",
-    { pattern: "([length])", development: true },
+    { pattern: "([length])", scope: "testing" },
   ],
   priorities: [
     // TODO this should have been calculated
     { "context": [['amountOfDimension', 0], ['convertToUnits', 0], ], "choose": [0] },
   ],
   hierarchy: [
-    { child: 'convertToUnits', parent: 'testingValue', development: true },
+    { child: 'convertToUnits', parent: 'testingValue', scope: "testing" },
   ],
   generators: [
     {
@@ -94,7 +94,7 @@ const config = {
       id: "length", 
       isA: ['dimension'], 
       bridge: "{ ...next(operator) }",
-      development: true 
+      scope: "testing" 
     },
     { id: "amount", },
     /*

package/common/edible.instance.json

@@ -540,7 +540,7 @@
             "text": "food and drinks",
             "range": {
               "start": 0,
-              "end": 25
+              "end": 14
             },
             "types": [
               "list",
@@ -3545,7 +3545,7 @@
             "text": "nuggets, chicken strips and chicken nuggets",
             "range": {
               "start": 0,
-              "end": 51
+              "end": 42
             },
             "types": [
               "chicken_nugget",
@@ -5179,7 +5179,7 @@
             "word": "sushi",
             "range": {
               "start": 0,
-              "end": 12
+              "end": 4
             },
             "dead": true,
             "types": [
@@ -6349,7 +6349,7 @@
             "text": "apples oranges and bananas",
             "range": {
               "start": 0,
-              "end": 35
+              "end": 25
             },
             "types": [
               "list",
@@ -6462,6 +6462,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -9272,7 +9286,7 @@
             "word": "dogs",
             "range": {
               "start": 0,
-              "end": 20
+              "end": 7
             },
             "types": [
               "dog",
@@ -10726,7 +10740,7 @@
             "word": "sausages",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 7
             },
             "dead": true,
             "types": [
@@ -13697,7 +13711,7 @@
             "word": "fries",
             "range": {
               "start": 0,
-              "end": 13
+              "end": 4
             },
             "dead": true,
             "types": [
@@ -15283,7 +15297,7 @@
             "word": "meat",
             "range": {
               "start": 0,
-              "end": 11
+              "end": 3
             },
             "dead": true,
             "types": [
@@ -16864,7 +16878,7 @@
             "word": "fruits",
             "range": {
               "start": 0,
-              "end": 14
+              "end": 5
             },
             "dead": true,
             "types": [
@@ -18504,7 +18518,7 @@
             "text": "pie and salad",
             "range": {
               "start": 0,
-              "end": 22
+              "end": 12
             },
             "types": [
               "list",
@@ -22054,7 +22068,7 @@
             "word": "sandwiches",
             "range": {
               "start": 0,
-              "end": 18
+              "end": 9
             },
             "dead": true,
             "types": [
@@ -24188,7 +24202,7 @@
             "text": "carrots, peas, cabbage, potatoes and broccoli",
             "range": {
               "start": 0,
-              "end": 59
+              "end": 44
             },
             "types": [
               "list",
@@ -24400,6 +24414,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -27568,7 +27596,7 @@
             "text": "vegetables and bread",
             "range": {
               "start": 0,
-              "end": 28
+              "end": 19
             },
             "types": [
               "list",
@@ -32108,7 +32136,7 @@
             "text": "muffins, french toast and pancakes",
             "range": {
               "start": 0,
-              "end": 43
+              "end": 33
             },
             "types": [
               "french_toast",
@@ -34956,7 +34984,7 @@
             "word": "grain",
             "range": {
               "start": 0,
-              "end": 14
+              "end": 4
             },
             "dead": true,
             "types": [
@@ -39718,7 +39746,7 @@
             "word": "oatmeal",
             "range": {
               "start": 0,
-              "end": 24
+              "end": 6
             },
             "dead": true,
             "types": [
@@ -42319,7 +42347,7 @@
             "word": "sausage",
             "range": {
               "start": 0,
-              "end": 16
+              "end": 6
             },
             "dead": true,
             "types": [
@@ -44890,7 +44918,7 @@
             "word": "hamburger",
             "range": {
               "start": 0,
-              "end": 24
+              "end": 10
             },
             "dead": true,
             "types": [
@@ -47594,7 +47622,7 @@
             "word": "cheeseburger",
             "range": {
               "start": 0,
-              "end": 28
+              "end": 13
             },
             "dead": true,
             "types": [
@@ -50309,7 +50337,7 @@
             "word": "cheese",
             "range": {
               "start": 0,
-              "end": 15
+              "end": 5
             },
             "dead": true,
             "types": [
@@ -52971,7 +52999,7 @@
             "word": "cheddar",
             "range": {
               "start": 0,
-              "end": 18
+              "end": 6
             },
             "dead": true,
             "types": [
@@ -56316,7 +56344,7 @@
             "text": "milk, pop, soda, coffee, tea, shakes and juice",
             "range": {
               "start": 0,
-              "end": 56
+              "end": 45
             },
             "types": [
               "list",
@@ -67434,7 +67462,7 @@
             "word": "lemonade",
             "range": {
               "start": 0,
-              "end": 18
+              "end": 7
             },
             "dead": true,
             "types": [
@@ -68694,6 +68722,34 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "is",

package/common/emotions.instance.json

@@ -730,12 +730,7 @@
             },
             "do": {
               "left": "sentientBeing",
-              "right": "emotion",
-              "range": {
-                "start": 0,
-                "end": 28
-              },
-              "text": "sentientbeing1 feels emotion1"
+              "right": "emotion"
             },
             "sentientBeing": {
               "value": "sentientbeing1",
@@ -772,6 +767,21 @@
               ],
               "level": 0
             },
+            "operator": {
+              "value": "feel",
+              "number": "one",
+              "text": "feels",
+              "marker": "feel",
+              "word": "feels",
+              "range": {
+                "start": 15,
+                "end": 19
+              },
+              "evaluateWord": true,
+              "imperative": false,
+              "isVerb": true,
+              "level": 0
+            },
             "unflatten": [
               "sentientBeing",
               "emotion"
@@ -780,6 +790,18 @@
               "sentientBeing",
               "emotion"
             ],
+            "interpolate": [
+              {
+                "property": "sentientBeing"
+              },
+              {
+                "property": "operator",
+                "number": "sentientBeing"
+              },
+              {
+                "property": "emotion"
+              }
+            ],
             "dead": true,
             "level": 2
           },
@@ -801,7 +823,7 @@
               "word": "emotion",
               "range": {
                 "start": 36,
-                "end": 76
+                "end": 64
               },
               "dead": true,
               "types": [

package/common/emotions.js

@@ -40,7 +40,7 @@ const config = {
   ],
 }
 
-const initializer = ({config, apis}) => {
+function initializer({config, apis}) {
   const api = apis('properties')
   api.createActionPrefix({
                 operator: 'feel',