tpmkms 9.5.1-beta.11 → 9.5.1-beta.14

package/common/dialogues.js

@@ -16,8 +16,6 @@ const dialogues_tests = require('./dialogues.test.json')
 const { defaultObjectCheck, defaultContextCheck, indent, focus } = require('./helpers')
 const pluralize = require('pluralize')
 
-const api = new API()
-
 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>`
@@ -59,10 +57,6 @@ const config = {
     // who is the car owned by
     "(([queryable]) [(<isEd|> ([isEdAble|]))])",
 
-    /* TODO investigate this:
-      {"pattern":"(([ownee])^ <owned|owned> ([by] ([owner])?))","uuid":"people1"}
-      {"pattern":"(([isEdee])^ <isEdAble|> ([by] ([isEder])?))","uuid":"dialogues2"}
-    */
     "(([isEdee])^ <isEdAble|> ([by] ([isEder])?))",
     "([isEdee|])",
     "([isEder|])",
@@ -175,7 +169,16 @@ const config = {
     },
     { id: "toAble" },
 
-    { id: "be", level: 0, bridge: "{ ...next(operator), type: after[0] }" },
+    { 
+      id: "be", 
+      level: 0, 
+      bridge: `{ 
+        ...next(operator), 
+        form: 'infinitive',
+        type: after[0] 
+      }` 
+    },
+
     { id: "briefOrWordy" },
 
     { id: "yesno" },
@@ -231,7 +234,6 @@ const config = {
   words: {
     "literals": {
       "?": [{"id": "questionMark", "initial": "{}" }],
-      // "the": [{"id": "the", "initial": "{ modifiers: [] }" }],
       "who": [{"id": "what", "initial": "{ modifiers: [], query: true }" }],
       "yes": [{"id": "yesno", "initial": "{ value: true }" }],
       "no": [{"id": "yesno", "initial": "{ value: false }" }],
@@ -240,6 +242,7 @@ const config = {
       "does": [{"id": "does", "initial": "{ number: 'one' }" }],
       "do": [{"id": "does", "initial": "{ number: 'many' }" }],
       "is": [
+        {"id": "be", "initial": "{ form: 'infinitive' }" }, 
         {"id": "is", "initial": "{ number: 'one' }" }, 
         {"id": "isQuery", "initial": "{ number: 'one' }" }, 
         {"id": "isEd", "initial": "{ number: 'one' }" }
@@ -473,7 +476,7 @@ const config = {
         } else {
           // TODO fix this using the assumed and that whole mess. change isResponse to useValue
           if (context.isResponse) {
-            return `${await gp(context.one, { responding: true })} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${await g(context.two)}`
+            return `${await gp(context.one, { assumed: { responding: true } })} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${await g(context.two)}`
           } else {
             return `${await gp(context.one)} ${isMany(context.one) || isMany(context.two) || isMany(context) ? "are" : "is"} ${await gr(context.two)}`
           }

package/common/dimension.instance.json

@@ -1,6 +1,9 @@
 {
   "configs": [
     "dimension and unit are concepts",
+    {
+      "apply": "({apis}) => {\n      apis('properties').addHierarchyWatcher({\n        match: ({parentId}) => parentId == 'unit',\n        apply: ({config, childId, parent}) => {\n          config.updateBridge(childId, ({ bridge }) => {\n            // console.log(JSON.stringify(childId, null, 2))\n            // console.log(JSON.stringify(parentId, null, 2))\n            // debugger\n            // if (!bridge) {\n            //   debugger\n            //   return\n            // }\n            if (!bridge.init) {\n              bridge.init = {}\n            }\n            // bridge.init['dimension'] = parent.object.marker\n            bridge.init['dimension'] = parent.object.value\n          })\n        }\n      })\n    }"
+    },
     {
       "name": "dimension",
       "operators": [
@@ -47,10 +50,9 @@
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:84",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:82",
           "id": "dimension",
           "bridge": "{ ...next(operator) }",
-          "isA": [],
           "generatorpr": {}
         },
         {
@@ -65,7 +67,7 @@
           "id": "amount"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:110",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:107",
           "id": "degree",
           "words": [
             {
@@ -82,10 +84,10 @@
         {
           "id": "amountOfDimension",
           "convolution": true,
-          "bridge": "{ marker: operator('dimension'), unit: after[0], value: before[0].value, amount: before[0] }"
+          "bridge": "{ marker: next(catch(operator(after[0].dimension), operator('dimension'))), dead: true, unit: after[0], value: before[0].value, amount: before[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:123",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:121",
           "id": "convertToUnits",
           "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
           "isA": [
@@ -1546,6 +1548,9 @@
         "query": "dimension and unit are concepts"
       }
     },
+    {
+      "apply": "({apis}) => {\n      apis('properties').addHierarchyWatcher({\n        match: ({parentId}) => parentId == 'unit',\n        apply: ({config, childId, parent}) => {\n          config.updateBridge(childId, ({ bridge }) => {\n            // console.log(JSON.stringify(childId, null, 2))\n            // console.log(JSON.stringify(parentId, null, 2))\n            // debugger\n            // if (!bridge) {\n            //   debugger\n            //   return\n            // }\n            if (!bridge.init) {\n              bridge.init = {}\n            }\n            // bridge.init['dimension'] = parent.object.marker\n            bridge.init['dimension'] = parent.object.value\n          })\n        }\n      })\n    }"
+    },
     {
       "extraConfig": true,
       "name": "dimension",
@@ -1587,15 +1592,14 @@
       ],
       "generators": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:77"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:75"
         }
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:84",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:82",
           "id": "dimension",
           "bridge": "{ ...next(operator) }",
-          "isA": [],
           "generatorpr": {}
         },
         {
@@ -1610,7 +1614,7 @@
           "id": "amount"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:110",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:107",
           "id": "degree",
           "words": [
             {
@@ -1626,10 +1630,10 @@
         {
           "id": "amountOfDimension",
           "convolution": true,
-          "bridge": "{ marker: operator('dimension'), unit: after[0], value: before[0].value, amount: before[0] }"
+          "bridge": "{ marker: next(catch(operator(after[0].dimension), operator('dimension'))), dead: true, unit: after[0], value: before[0].value, amount: before[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:123",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/dimension.js:121",
           "id": "convertToUnits",
           "bridge": "{ ...next(operator), from: before[0], to: after[0] }",
           "isA": [

package/common/dimension.js

@@ -50,8 +50,6 @@ class API {
   }
 }
 
-const api = new API()
-
 const config = {
   name: 'dimension',
   operators: [
@@ -84,7 +82,6 @@ const config = {
       where: where(),
       id: "dimension", 
       bridge: "{ ...next(operator) }",
-      isA: [],
       generatorpr: {
         match: ({context}) => context.amount,
         apply: async ({context, gp, gr}) => `${await gr(context.amount)} ${await gp(context.unit)}`,
@@ -117,7 +114,8 @@ const config = {
     { 
       id: "amountOfDimension", 
       convolution: true, 
-      bridge: "{ marker: operator('dimension'), unit: after[0], value: before[0].value, amount: before[0] }" 
+      bridge: "{ marker: next(catch(operator(after[0].dimension), operator('dimension'))), dead: true, unit: after[0], value: before[0].value, amount: before[0] }" 
+      // bridge: "{ marker: operator('dimension'), unit: after[0], value: before[0].value, amount: before[0] }" 
     },
     { 
       where: where(),
@@ -180,6 +178,27 @@ const config = {
 const template = {
   configs: [
     "dimension and unit are concepts",
+    ({apis}) => {
+      apis('properties').addHierarchyWatcher({
+        match: ({parentId}) => parentId == 'unit',
+        apply: ({config, childId, parent}) => {
+          config.updateBridge(childId, ({ bridge }) => {
+            // console.log(JSON.stringify(childId, null, 2))
+            // console.log(JSON.stringify(parentId, null, 2))
+            // debugger
+            // if (!bridge) {
+            //   debugger
+            //   return
+            // }
+            if (!bridge.init) {
+              bridge.init = {}
+            }
+            // bridge.init['dimension'] = parent.object.marker
+            bridge.init['dimension'] = parent.object.value
+          })
+        }
+      })
+    },
     config,
   ],
 }