tpmkms_4wp 8.0.0-beta.74 → 8.0.0-beta.76

package/common/formulas.instance.json

@@ -29,14 +29,14 @@
       ],
       "semantics": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:109",
           "match": "({context, api}) => context.evaluate && api.get(context)",
           "apply": "async ({context, api, e}) => {\n        const { formula } = api.get(context)\n        // console.log('greg24 -----------', JSON.stringify(formula, null, 2))\n        context.evalue = await e(formula) \n      }"
         }
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:120",
           "id": "formulaForVariable",
           "isA": [
             "preposition",
@@ -48,7 +48,7 @@
           "evaluator": "({context, api, objects}) => {\n        const formulas = api.gets(context.variable).map((f) => { return { ...f.equality, paraphrase: true } })\n        context.evalue = { marker: 'list', value: formulas }\n      }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:132",
           "id": "solve",
           "bridge": "{ ...next(operator), equality: after[0], variable: after[2] }",
           "generatorp": "async ({context, gp}) => `${context.word} ${await gp(context.equality)} for ${await gp(context.variable)}`",
@@ -74,7 +74,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:159",
           "id": "calculate",
           "isA": [
             "verb"
@@ -90,7 +90,7 @@
           "semantic": "async ({context, e}) => {\n        context.evalue = await e(context.expression)\n        context.isResponse = true\n      }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:171",
           "id": "equals",
           "bridge": "{ ...next(operator), left: before[0], right: after[0] }",
           "words": [
@@ -614,11 +614,6 @@
           "theAble",
           false
         ],
-        [
-          "property",
-          "unknown",
-          false
-        ],
         [
           "punctuation",
           "punctuation",
@@ -829,11 +824,6 @@
           "hierarchyAble",
           false
         ],
-        [
-          "unknown",
-          "object",
-          false
-        ],
         [
           "unknown",
           "queryable",
@@ -1088,12 +1078,12 @@
       ],
       "semantics": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:109"
         }
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:120",
           "id": "formulaForVariable",
           "isA": [
             "preposition",
@@ -1103,7 +1093,7 @@
           "bridge": "{ number: before[0].number, ...next(operator), what: before[0], equality: after[0], variable: after[1] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:132",
           "id": "solve",
           "bridge": "{ ...next(operator), equality: after[0], variable: after[2] }"
         },
@@ -1127,7 +1117,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:159",
           "id": "calculate",
           "isA": [
             "verb"
@@ -1141,7 +1131,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:171",
           "id": "equals",
           "bridge": "{ ...next(operator), left: before[0], right: after[0] }",
           "words": [

package/common/helpers/dialogues.js

@@ -63,6 +63,9 @@ class API {
 
   setupObjectHierarchy(config, id, { types } = {}) {
     for (let type of types) {
+      if (typeof type !== 'string') {
+        type = type.word
+      }
       config.addHierarchy(id, type)
     }
   }

package/common/helpers/properties.js

@@ -316,7 +316,12 @@ class API {
         allowDups: true,
       })
       // config.addOperator({ id: operator, level: 1, words: [operator] })
-      config.addBridge({ id: operator, level: 1, bridge: '{ ...next(operator) }', allowDups: true })
+      config.addBridge({ 
+        id: operator, 
+        level: 1, 
+        bridge: '{ ...next(operator) }', 
+        allowDups: true,
+      })
       config.addPriority({ "context": [['does', 0], [operator, 1], ], "choose": [0] })
       config.addPriority({ "context": [['doesnt', 0], [operator, 1], ], "choose": [0] })
       config.addPriority({ "context": [[operator, 0], ['does', 0], ], "choose": [0] })
@@ -355,7 +360,13 @@ class API {
 
         const unflattenArgs = [ ...before.map( (arg) => arg.tag ), ...after.map( (arg) => arg.tag ) ] 
         const focusable = [ ...before.map( (arg) => arg.tag ), ...after.map( (arg) => arg.tag ) ] 
-        config.addBridge({ id: operator, level: 0, localHierarchy, bridge: `{ ... next(operator) ${doParams} ${beforeArgs} ${afterArgs}, unflatten: ${JSON.stringify(unflattenArgs)}, focusable: ${JSON.stringify(focusable)} }`, allowDups: true })
+        config.addBridge({ 
+          id: operator, 
+          level: 0, 
+          localHierarchy: [...localHierarchy, ['object', 'unknown']],
+          bridge: `{ ... next(operator) ${doParams} ${beforeArgs} ${afterArgs}, unflatten: ${JSON.stringify(unflattenArgs)}, focusable: ${JSON.stringify(focusable)} }`, 
+          allowDups: true 
+        })
         if (words.length > 0) {
           for (const word of words) {
             config.addWord(word, { id: operator, initial: `{ value: "${operator}" }` })

package/common/kirk.instance.json

@@ -1130,11 +1130,6 @@
           "theAble",
           false
         ],
-        [
-          "property",
-          "unknown",
-          false
-        ],
         [
           "punctuation",
           "punctuation",
@@ -1340,11 +1335,6 @@
           "hierarchyAble",
           false
         ],
-        [
-          "unknown",
-          "object",
-          false
-        ],
         [
           "unknown",
           "queryable",