tpmkms_4wp 8.0.0-beta.75 → 8.0.0-beta.77

package/common/dialogues.js

@@ -9,7 +9,7 @@ const punctuation = require('./punctuation.js')
 const stm = require('./stm.js')
 const _ = require('lodash')
 const { API } = require('./helpers/dialogues')
-const { isMany } = require('./helpers')
+const { isMany, propertyToArray, words } = require('./helpers')
 const dialogues_tests = require('./dialogues.test.json')
 const { defaultContextCheck, indent, focus } = require('./helpers')
 const pluralize = require('pluralize')
@@ -776,9 +776,11 @@ let config = {
 
         // if not isA add to stm
         if (!onePrime.sameWasProcessed && !twoPrime.sameWasProcessed) {
-					api.makeObject({ context: one, config, types: context.two.types || [] })
-					kms.stm.api.setVariable(one.value, two)
-					kms.stm.api.mentioned({ context: one, value: two })
+          for (const child of propertyToArray(one)) {
+            api.makeObject({ context: child, config, types: context.two.types || [] })
+            kms.stm.api.setVariable(child.value, two)
+            kms.stm.api.mentioned({ context: child, value: two })
+          }
         }
       }
     },
@@ -927,6 +929,11 @@ const initializer = ({objects, config, isModule}) => {
     toScopedId: (context) => {
       return api('dialogues').toScopedId(context)
     },
+    addWords: (id, word, additional) => {
+      for (let props of words(word, additional)) {
+        config.addWord(id, props) 
+      }
+    }
   }))
   objects.mentioned = []
   objects.variables = {

package/common/dimension.instance.json

@@ -41,14 +41,14 @@
       ],
       "generators": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:77",
           "match": "({context}) => context.marker == 'noconversion'",
           "apply": "async ({context, gp}) => `there is no conversion between ${await gp(context.from)} and ${await gp(context.to)}`"
         }
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:84",
           "id": "dimension",
           "isA": [],
           "generatorpr": {}
@@ -64,7 +64,7 @@
           "id": "amount"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:104",
           "id": "degree",
           "words": [
             {
@@ -84,13 +84,19 @@
           "bridge": "{ marker: operator('dimension'), unit: after[0], value: before[0].value, amount: before[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:117",
           "id": "convertToUnits",
           "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
           "isA": [
             "expression",
             "queryable"
           ],
+          "localHierarchy": [
+            [
+              "unknown",
+              "dimension"
+            ]
+          ],
           "after": [
             [
               "possession",
@@ -105,7 +111,10 @@
           "evaluator": "async ({context, kms, e, error}) => {\n        /*\n        error(({context, e}) => {\n          context.evalue = 'dont know...'\n        })\n        */\n        const from = context.from;\n        const to = context.to;\n        let evalue;\n        let efrom = from\n        if (!from.unit) {\n          efrom = (await e(from)).evalue\n        }\n        if (to.value == efrom.unit.value) {\n          evalue = efrom.amount\n        } else {\n          const formula = kms.formulas.api.get(to, [efrom.unit])\n          if (!formula) {\n            const reason = { marker: 'reason', focusableForPhrase: true, evalue: { marker: 'noconversion', from: efrom.unit, to } }\n            kms.stm.api.mentioned({ context: reason })\n            error(reason)\n          }\n          kms.stm.api.setVariable(efrom.unit.value, efrom.amount)\n          evalue = await e(formula)\n        }\n        /*\n        '{\n            \"marker\":\"dimension\",\n            \"unit\":{\"marker\":\"unit\",\"range\":{\"start\":19,\"end\":25},\"word\":\"celcius\",\"text\":\"celcius\",\"value\":\"celcius\",\"unknown\":true,\"types\":[\"unit\",\"unknown\"]},\n            \"value\":10,\n            \"amount\":{\"word\":\"degrees\",\"number\":\"many\",\"text\":\"10 degrees\",\"marker\":\"degree\",\"range\":{\"start\":8,\"end\":17},\"value\":10,\"amount\":{\"value\":10,\"text\":\"10\",\"marker\":\"number\",\"word\":\"10\",\"range\":{\"start\":8,\"end\":9},\"types\":[\"number\"]}},\n              \"text\":\"10 degrees celcius\",\"range\":{\"start\":8,\"end\":25}}'\n        */\n        context.evalue = { \n          paraphrase: true,\n          marker: 'dimension',\n          level: 1,\n          unit: to,\n          amount: { evalue, paraphrase: undefined }\n        }\n      }"
         },
         {
-          "id": "unit"
+          "id": "unit",
+          "isA": [
+            "number"
+          ]
         }
       ]
     }
@@ -688,11 +697,6 @@
           "theAble",
           false
         ],
-        [
-          "property",
-          "unknown",
-          false
-        ],
         [
           "punctuation",
           "punctuation",
@@ -903,11 +907,6 @@
           "hierarchyAble",
           false
         ],
-        [
-          "unknown",
-          "object",
-          false
-        ],
         [
           "unknown",
           "queryable",
@@ -1283,12 +1282,12 @@
       ],
       "generators": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:77"
         }
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:84",
           "id": "dimension",
           "isA": [],
           "generatorpr": {}
@@ -1304,7 +1303,7 @@
           "id": "amount"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:104",
           "id": "degree",
           "words": [
             {
@@ -1323,13 +1322,19 @@
           "bridge": "{ marker: operator('dimension'), unit: after[0], value: before[0].value, amount: before[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:117",
           "id": "convertToUnits",
           "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
           "isA": [
             "expression",
             "queryable"
           ],
+          "localHierarchy": [
+            [
+              "unknown",
+              "dimension"
+            ]
+          ],
           "after": [
             [
               "possession",
@@ -1342,7 +1347,10 @@
           ]
         },
         {
-          "id": "unit"
+          "id": "unit",
+          "isA": [
+            "number"
+          ]
         }
       ]
     }

package/common/dimension.js

@@ -118,6 +118,7 @@ let config = {
       id: "convertToUnits", 
       bridge: "{ ...next(operator), from: before[0], to: after[0] }",
       isA: ['expression', 'queryable'],
+      localHierarchy: [['unknown', 'dimension']],
       after: [['possession', 0], ['possession', 1]],
       generatorp: async ({context, g}) => `${await g(context.from)} ${context.word} ${await g(context.to)}`,
       // evaluator: ({context, kms, error}) => {
@@ -163,7 +164,10 @@ let config = {
         }
       },
     },
-    { id: "unit", },
+    { 
+      id: "unit", 
+      isA: ['number'],
+    },
   ]
 };
 

package/common/dimension.test.json

@@ -1538,7 +1538,7 @@
             "end": 53,
             "start": 0
           },
-          "text": "fahrenheit celcuis and kelvin",
+          "text": "fahrenheit celcius and kelvin",
           "types": [
             "list",
             "unknown"
@@ -1565,10 +1565,10 @@
                 "end": 17,
                 "start": 11
               },
-              "text": "celcuis",
+              "text": "celcius",
               "unknown": true,
-              "value": "celcuis",
-              "word": "celcuis"
+              "value": "celcius",
+              "word": "celcius"
             },
             {
               "dead": true,
@@ -1590,7 +1590,7 @@
           "end": 53,
           "start": 0
         },
-        "text": "fahrenheit celcuis and kelvin are units of temperature",
+        "text": "fahrenheit celcius and kelvin are units of temperature",
         "topLevel": true,
         "touchedBy": [
           "dimension#call2"
@@ -2702,7 +2702,7 @@
                 "end": 53,
                 "start": 0
               },
-              "text": "fahrenheit celcuis and kelvin",
+              "text": "fahrenheit celcius and kelvin",
               "types": [
                 "list",
                 "unknown"
@@ -2729,10 +2729,10 @@
                     "end": 17,
                     "start": 11
                   },
-                  "text": "celcuis",
+                  "text": "celcius",
                   "unknown": true,
-                  "value": "celcuis",
-                  "word": "celcuis"
+                  "value": "celcius",
+                  "word": "celcius"
                 },
                 {
                   "dead": true,
@@ -2754,7 +2754,7 @@
               "end": 53,
               "start": 0
             },
-            "text": "fahrenheit celcuis and kelvin are units of temperature",
+            "text": "fahrenheit celcius and kelvin are units of temperature",
             "topLevel": true,
             "touchedBy": [
               "dimension#call2"
@@ -2829,8 +2829,8 @@
             "word": "are"
           },
           "generatedParenthesized": "",
-          "paraphrases": "fahrenheit, celcuis and kelvin are units of temperature",
-          "paraphrasesParenthesized": "(((fahrenheit), (celcuis) and (kelvin)) are ((units) of (temperature)))",
+          "paraphrases": "fahrenheit, celcius and kelvin are units of temperature",
+          "paraphrasesParenthesized": "(((fahrenheit), (celcius) and (kelvin)) are ((units) of (temperature)))",
           "responses": [
             ""
           ]
@@ -3123,15 +3123,15 @@
     },
     "paraphrases": [
       "temperature is a dimension",
-      "fahrenheit, celcuis and kelvin are units of temperature",
+      "fahrenheit, celcius and kelvin are units of temperature",
       "10 fahrenheit"
     ],
     "paraphrasesParenthesized": [
       "((temperature) is ((a) (dimension)))",
-      "(((fahrenheit), (celcuis) and (kelvin)) are ((units) of (temperature)))",
+      "(((fahrenheit), (celcius) and (kelvin)) are ((units) of (temperature)))",
       "((10) (fahrenheit))"
     ],
-    "query": "temperature is a dimension\\nfahrenheit celcuis and kelvin are units of temperature\\n10 degrees fahrenheit",
+    "query": "temperature is a dimension\\nfahrenheit celcius and kelvin are units of temperature\\n10 degrees fahrenheit",
     "responses": [
       "",
       "",
@@ -3246,7 +3246,7 @@
             "end": 53,
             "start": 0
           },
-          "text": "fahrenheit celcuis and kelvin",
+          "text": "fahrenheit celcius and kelvin",
           "types": [
             "list",
             "unknown"
@@ -3273,10 +3273,10 @@
                 "end": 17,
                 "start": 11
               },
-              "text": "celcuis",
+              "text": "celcius",
               "unknown": true,
-              "value": "celcuis",
-              "word": "celcuis"
+              "value": "celcius",
+              "word": "celcius"
             },
             {
               "dead": true,
@@ -3298,7 +3298,7 @@
           "end": 53,
           "start": 0
         },
-        "text": "fahrenheit celcuis and kelvin are units of temperature",
+        "text": "fahrenheit celcius and kelvin are units of temperature",
         "topLevel": true,
         "touchedBy": [
           "dimension#call2"
@@ -4353,7 +4353,7 @@
                 "end": 53,
                 "start": 0
               },
-              "text": "fahrenheit celcuis and kelvin",
+              "text": "fahrenheit celcius and kelvin",
               "types": [
                 "list",
                 "unknown"
@@ -4380,10 +4380,10 @@
                     "end": 17,
                     "start": 11
                   },
-                  "text": "celcuis",
+                  "text": "celcius",
                   "unknown": true,
-                  "value": "celcuis",
-                  "word": "celcuis"
+                  "value": "celcius",
+                  "word": "celcius"
                 },
                 {
                   "dead": true,
@@ -4405,7 +4405,7 @@
               "end": 53,
               "start": 0
             },
-            "text": "fahrenheit celcuis and kelvin are units of temperature",
+            "text": "fahrenheit celcius and kelvin are units of temperature",
             "topLevel": true,
             "touchedBy": [
               "dimension#call2"
@@ -4480,8 +4480,8 @@
             "word": "are"
           },
           "generatedParenthesized": "",
-          "paraphrases": "fahrenheit, celcuis and kelvin are units of temperature",
-          "paraphrasesParenthesized": "(((fahrenheit), (celcuis) and (kelvin)) are ((units) of (temperature)))",
+          "paraphrases": "fahrenheit, celcius and kelvin are units of temperature",
+          "paraphrasesParenthesized": "(((fahrenheit), (celcius) and (kelvin)) are ((units) of (temperature)))",
           "responses": [
             ""
           ]
@@ -4774,15 +4774,15 @@
     },
     "paraphrases": [
       "temperature is a dimension",
-      "fahrenheit, celcuis and kelvin are units of temperature",
+      "fahrenheit, celcius and kelvin are units of temperature",
       "10 celcius"
     ],
     "paraphrasesParenthesized": [
       "((temperature) is ((a) (dimension)))",
-      "(((fahrenheit), (celcuis) and (kelvin)) are ((units) of (temperature)))",
+      "(((fahrenheit), (celcius) and (kelvin)) are ((units) of (temperature)))",
       "((10) (celcius))"
     ],
-    "query": "temperature is a dimension\\nfahrenheit celcuis and kelvin are units of temperature\\n10 celcius",
+    "query": "temperature is a dimension\\nfahrenheit celcius and kelvin are units of temperature\\n10 celcius",
     "responses": [
       "",
       "",
@@ -4915,7 +4915,7 @@
             "end": 53,
             "start": 0
           },
-          "text": "fahrenheit celcuis and kelvin",
+          "text": "fahrenheit celcius and kelvin",
           "types": [
             "list",
             "unknown"
@@ -4942,10 +4942,10 @@
                 "end": 17,
                 "start": 11
               },
-              "text": "celcuis",
+              "text": "celcius",
               "unknown": true,
-              "value": "celcuis",
-              "word": "celcuis"
+              "value": "celcius",
+              "word": "celcius"
             },
             {
               "dead": true,
@@ -4967,7 +4967,7 @@
           "end": 53,
           "start": 0
         },
-        "text": "fahrenheit celcuis and kelvin are units of temperature",
+        "text": "fahrenheit celcius and kelvin are units of temperature",
         "topLevel": true,
         "touchedBy": [
           "dimension#call2"
@@ -6075,7 +6075,7 @@
                 "end": 53,
                 "start": 0
               },
-              "text": "fahrenheit celcuis and kelvin",
+              "text": "fahrenheit celcius and kelvin",
               "types": [
                 "list",
                 "unknown"
@@ -6102,10 +6102,10 @@
                     "end": 17,
                     "start": 11
                   },
-                  "text": "celcuis",
+                  "text": "celcius",
                   "unknown": true,
-                  "value": "celcuis",
-                  "word": "celcuis"
+                  "value": "celcius",
+                  "word": "celcius"
                 },
                 {
                   "dead": true,
@@ -6127,7 +6127,7 @@
               "end": 53,
               "start": 0
             },
-            "text": "fahrenheit celcuis and kelvin are units of temperature",
+            "text": "fahrenheit celcius and kelvin are units of temperature",
             "topLevel": true,
             "touchedBy": [
               "dimension#call2"
@@ -6202,8 +6202,8 @@
             "word": "are"
           },
           "generatedParenthesized": "",
-          "paraphrases": "fahrenheit, celcuis and kelvin are units of temperature",
-          "paraphrasesParenthesized": "(((fahrenheit), (celcuis) and (kelvin)) are ((units) of (temperature)))",
+          "paraphrases": "fahrenheit, celcius and kelvin are units of temperature",
+          "paraphrasesParenthesized": "(((fahrenheit), (celcius) and (kelvin)) are ((units) of (temperature)))",
           "responses": [
             ""
           ]
@@ -6496,15 +6496,15 @@
     },
     "paraphrases": [
       "temperature is a dimension",
-      "fahrenheit, celcuis and kelvin are units of temperature",
+      "fahrenheit, celcius and kelvin are units of temperature",
       "10 celcius"
     ],
     "paraphrasesParenthesized": [
       "((temperature) is ((a) (dimension)))",
-      "(((fahrenheit), (celcuis) and (kelvin)) are ((units) of (temperature)))",
+      "(((fahrenheit), (celcius) and (kelvin)) are ((units) of (temperature)))",
       "((10) (celcius))"
     ],
-    "query": "temperature is a dimension\\nfahrenheit celcuis and kelvin are units of temperature\\n10 degrees celcius",
+    "query": "temperature is a dimension\\nfahrenheit celcius and kelvin are units of temperature\\n10 degrees celcius",
     "responses": [
       "",
       "",
@@ -6669,7 +6669,7 @@
             "end": 53,
             "start": 0
           },
-          "text": "fahrenheit celcuis and kelvin",
+          "text": "fahrenheit celcius and kelvin",
           "types": [
             "list",
             "unknown"
@@ -6696,10 +6696,10 @@
                 "end": 17,
                 "start": 11
               },
-              "text": "celcuis",
+              "text": "celcius",
               "unknown": true,
-              "value": "celcuis",
-              "word": "celcuis"
+              "value": "celcius",
+              "word": "celcius"
             },
             {
               "dead": true,
@@ -6721,7 +6721,7 @@
           "end": 53,
           "start": 0
         },
-        "text": "fahrenheit celcuis and kelvin are units of temperature",
+        "text": "fahrenheit celcius and kelvin are units of temperature",
         "topLevel": true,
         "touchedBy": [
           "dimension#call2"
@@ -7957,7 +7957,7 @@
                 "end": 53,
                 "start": 0
               },
-              "text": "fahrenheit celcuis and kelvin",
+              "text": "fahrenheit celcius and kelvin",
               "types": [
                 "list",
                 "unknown"
@@ -7984,10 +7984,10 @@
                     "end": 17,
                     "start": 11
                   },
-                  "text": "celcuis",
+                  "text": "celcius",
                   "unknown": true,
-                  "value": "celcuis",
-                  "word": "celcuis"
+                  "value": "celcius",
+                  "word": "celcius"
                 },
                 {
                   "dead": true,
@@ -8009,7 +8009,7 @@
               "end": 53,
               "start": 0
             },
-            "text": "fahrenheit celcuis and kelvin are units of temperature",
+            "text": "fahrenheit celcius and kelvin are units of temperature",
             "topLevel": true,
             "touchedBy": [
               "dimension#call2"
@@ -8084,8 +8084,8 @@
             "word": "are"
           },
           "generatedParenthesized": "",
-          "paraphrases": "fahrenheit, celcuis and kelvin are units of temperature",
-          "paraphrasesParenthesized": "(((fahrenheit), (celcuis) and (kelvin)) are ((units) of (temperature)))",
+          "paraphrases": "fahrenheit, celcius and kelvin are units of temperature",
+          "paraphrasesParenthesized": "(((fahrenheit), (celcius) and (kelvin)) are ((units) of (temperature)))",
           "responses": [
             ""
           ]
@@ -8378,15 +8378,15 @@
     },
     "paraphrases": [
       "temperature is a dimension",
-      "fahrenheit, celcuis and kelvin are units of temperature",
+      "fahrenheit, celcius and kelvin are units of temperature",
       "10 celcius in fahrenheit"
     ],
     "paraphrasesParenthesized": [
       "((temperature) is ((a) (dimension)))",
-      "(((fahrenheit), (celcuis) and (kelvin)) are ((units) of (temperature)))",
+      "(((fahrenheit), (celcius) and (kelvin)) are ((units) of (temperature)))",
       "(((10) (celcius)) in (fahrenheit))"
     ],
-    "query": "temperature is a dimension\\nfahrenheit celcuis and kelvin are units of temperature\\n10 degrees celcius in fahrenheit",
+    "query": "temperature is a dimension\\nfahrenheit celcius and kelvin are units of temperature\\n10 degrees celcius in fahrenheit",
     "responses": [
       "",
       "",
@@ -8611,7 +8611,7 @@
             "end": 53,
             "start": 0
           },
-          "text": "fahrenheit celcuis and kelvin",
+          "text": "fahrenheit celcius and kelvin",
           "types": [
             "list",
             "unknown"
@@ -8638,10 +8638,10 @@
                 "end": 17,
                 "start": 11
               },
-              "text": "celcuis",
+              "text": "celcius",
               "unknown": true,
-              "value": "celcuis",
-              "word": "celcuis"
+              "value": "celcius",
+              "word": "celcius"
             },
             {
               "dead": true,
@@ -8663,7 +8663,7 @@
           "end": 53,
           "start": 0
         },
-        "text": "fahrenheit celcuis and kelvin are units of temperature",
+        "text": "fahrenheit celcius and kelvin are units of temperature",
         "topLevel": true,
         "touchedBy": [
           "dimension#call2"
@@ -11697,7 +11697,7 @@
                 "end": 53,
                 "start": 0
               },
-              "text": "fahrenheit celcuis and kelvin",
+              "text": "fahrenheit celcius and kelvin",
               "types": [
                 "list",
                 "unknown"
@@ -11724,10 +11724,10 @@
                     "end": 17,
                     "start": 11
                   },
-                  "text": "celcuis",
+                  "text": "celcius",
                   "unknown": true,
-                  "value": "celcuis",
-                  "word": "celcuis"
+                  "value": "celcius",
+                  "word": "celcius"
                 },
                 {
                   "dead": true,
@@ -11749,7 +11749,7 @@
               "end": 53,
               "start": 0
             },
-            "text": "fahrenheit celcuis and kelvin are units of temperature",
+            "text": "fahrenheit celcius and kelvin are units of temperature",
             "topLevel": true,
             "touchedBy": [
               "dimension#call2"
@@ -11824,8 +11824,8 @@
             "word": "are"
           },
           "generatedParenthesized": "",
-          "paraphrases": "fahrenheit, celcuis and kelvin are units of temperature",
-          "paraphrasesParenthesized": "(((fahrenheit), (celcuis) and (kelvin)) are ((units) of (temperature)))",
+          "paraphrases": "fahrenheit, celcius and kelvin are units of temperature",
+          "paraphrasesParenthesized": "(((fahrenheit), (celcius) and (kelvin)) are ((units) of (temperature)))",
           "responses": [
             ""
           ]
@@ -12060,17 +12060,17 @@
     },
     "paraphrases": [
       "temperature is a dimension",
-      "fahrenheit, celcuis and kelvin are units of temperature",
+      "fahrenheit, celcius and kelvin are units of temperature",
       "fahrenheit = celcius * 9 / 5 + 32",
       "what is 10 celcius in fahrenheit?"
     ],
     "paraphrasesParenthesized": [
       "((temperature) is ((a) (dimension)))",
-      "(((fahrenheit), (celcuis) and (kelvin)) are ((units) of (temperature)))",
+      "(((fahrenheit), (celcius) and (kelvin)) are ((units) of (temperature)))",
       "((fahrenheit) = ((((celcius) * (9)) / (5)) + (32)))",
       "(((what) is (((10) (celcius)) in (fahrenheit)))?)"
     ],
-    "query": "temperature is a dimension\\nfahrenheit celcuis and kelvin are units of temperature\\nfahrenheit = celcius*9/5 + 32\\nwhat is 10 degrees celcius in fahrenheit",
+    "query": "temperature is a dimension\\nfahrenheit celcius and kelvin are units of temperature\\nfahrenheit = celcius*9/5 + 32\\nwhat is 10 degrees celcius in fahrenheit",
     "responses": [
       "",
       "",
@@ -18618,4 +18618,4 @@
       "there is no conversion between a1 and b1"
     ]
   }
-]
+]