tpmkms_4wp 9.5.1-beta.2 → 9.5.1-beta.20

package/common/crew.js

@@ -37,7 +37,7 @@ const template = {
   ],
 };
 
-const initializer = ({config, apis}) => {
+function initializer({config, apis}) {
   const api = apis('properties')
   const conceptApi = apis('concept')
   // conceptApi.kindOfConcept({ config, modifiers: ['photon'], object: 'torpedo' })

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

@@ -16,9 +16,7 @@ const dialogues_tests = require('./dialogues.test.json')
 const { defaultObjectCheck, defaultContextCheck, indent, focus } = require('./helpers')
 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 +25,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 +34,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 },
@@ -56,38 +54,23 @@ const config = {
 
     "(([queryable]) [is|] ([queryable|]))",
     "([isQuery|] ([queryable]) ([queryable]))",
-    // "(([queryable]) [is:isEdBridge|is,are] ([isEdAble|]))",
     // 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|])",
 
-    // "([nevermind])",
-    // { pattern: "([nevermindTestSetup] (allowed))", scope: "testing" },
     "([why])",
     "([reason])",
-    // "([thisitthat|])",
-    // "([it])",
-    // "([this])",
-    // "([that])",
 
     "(<what> ([whatAble|]))",
     "([what:optional])",
-    // "(<the|> ([theAble|]))",
-    // "(<a|a,an> ([theAble|]))",
-    // "([unknown])",
 
     "([be] ([briefOrWordy|]))",
 
     "([([canBeQuestion])])",
     "(([canBeQuestion/1,2]) <questionMark|>)",
-    // "(([is/2]) <questionMark|>)",
 
     "(([what]) [(<does|> ([doesAble|]))])",
     "([canBeDoQuestion])",
@@ -101,46 +84,29 @@ const config = {
 
     "([to] ([toAble|]))",
   ],
-  associations: {
-    positive: [
-      { context: [['unknown', 0], ['isEdAble', 0]], choose: 1 },
-      { context: [['isQuery', 0], ['a', 0], ['unknown', 0], ['a', 0], ['unknown', 0]], choose: { index: 0, increment: true } },
-
-      { context: [["unknown",0],["isEd",0],["isEdAble",0],["by",0],["unknown",0]], choose: { index: 0, increment: true } },
-      { context: [["unknown",0],["isEd",0],["isEdAble",0],["by",1]], choose: { index: 0, increment: true } },
-      { context: [["unknown",0],["isEd",0],["isEdAble",0]], choose: { index: 0, increment: true } },
-
-
-      // ...listorama('unknown'),
-      // ...listorama('queryable'),
-      { context: [['unknown', 0], ['list', 0], ['unknown', 0]], choose: 0 },
-      { context: [['unknown', 0], ['list', 0], ['unknown', 1]], choose: 0 },
-      { context: [['unknown', 1], ['list', 0], ['unknown', 0]], choose: 0 },
-      { context: [['unknown', 1], ['list', 0], ['unknown', 1]], choose: 0 },
-
-      { context: [['queryable', 0], ['list', 0], ['unknown', 0]], choose: 1 },
-      { context: [['queryable', 0], ['list', 0], ['unknown', 1]], choose: 1 },
-      { context: [['queryable', 1], ['list', 0], ['unknown', 0]], choose: 1 },
-      { context: [['queryable', 1], ['list', 0], ['unknown', 1]], choose: 1 },
-
-      { context: [['unknown', 0], ['list', 0], ['queryable', 0]], choose: 2 },
-      { context: [['unknown', 0], ['list', 0], ['queryable', 1]], choose: 2 },
-      { context: [['unknown', 1], ['list', 0], ['queryable', 0]], choose: 2 },
-      { context: [['unknown', 1], ['list', 0], ['queryable', 1]], choose: 2 },
-
-      { context: [['queryable', 0], ['list', 0], ['queryable', 0]], choose: 0 },
-      { context: [['queryable', 0], ['list', 0], ['queryable', 1]], choose: 0 },
-      { context: [['queryable', 1], ['list', 0], ['queryable', 0]], choose: 0 },
-      { context: [['queryable', 1], ['list', 0], ['queryable', 1]], choose: 0 },
-    ]
-  },
   bridges: [
     {
       id: 'thatVerb',
       before: ['verb'],
-      // bridge: "{ ...after[0], verb: after[0], that: operator, generate: ['that', 'verb'], localPriorities: { before: [\"verb\"] }, bridge_override: { operator: after[0].marker, bridge: '{ ...bridge.subject, postModifiers: [\"conditions\"], generate: append(before[0].generate, concatm(\"thatClause.\", operator.generate)), thatClause: bridge, conditions: append(after[0].conditions, [bridge]) }' } }",
-      // bridge: "{ ...after[0], verb: after[0], that: operator, generate: ['that', 'verb'], localPriorities: { before: [\"verb\"] }, bridge_override: { operator: after[0].marker, bridge: '{ ...bridge.subject, postModifiers: [\"conditions\"], generate: concatm(\"thatClause.\", bridge.generate), thatClause: bridge, conditions: append(bridge.subject.conditions, [bridge]) }' } }",
-      bridge: "{ ...after[0], verb: after[0], that: operator, generate: ['that', 'verb'], localPriorities: { actLike: [\"subordinatedVerb\", 0] }, bridge_override: { operator: after[0].marker, bridge: '{ ...bridge.subject, postModifiers: [\"conditions\"], modifiers: [], generate: concatm(\"thatClause.\", bridge.generate), thatClause: bridge, conditions: append(bridge.subject.conditions, [bridge]) }' } }",
+      bridge: `
+      { 
+        ...after[0], 
+        verb: after[0], 
+        that: operator, 
+        generate: ['that', 'verb'], 
+        localPriorities: { actLike: ["subordinatedVerb", 0] }, 
+        bridge_override: { 
+          operator: after[0].marker, 
+          bridge: '{ 
+            ...bridge.subject, 
+            postModifiers: ["conditions"], 
+            modifiers: [], 
+            generate: concatm("thatClause.", bridge.generate), 
+            thatClause: bridge, 
+            conditions: append(bridge.subject.conditions, [bridge]) 
+          }' 
+        } 
+      }`,
     },
 
     {
@@ -203,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" },
@@ -246,38 +221,6 @@ const config = {
     { id: "doesAble", level: 0, bridge: "{ ...next(operator) }" },
     { id: "doesAble", level: 1, bridge: "{ ...next(operator), before: before[0] }" },
     { id: "does", level: 0, bridge: "{ query: true, what: operator.marker, ...context, number: operator.number, object.number: operator.number }*" },
-
-    /*
-    { 
-      id: 'the', 
-      level: 0, 
-      bridge: '{ ...after[0], focusableForPhrase: true, pullFromContext: true, concept: true, wantsValue: true, determiner: "the", modifiers: append(["determiner"], after[0].modifiers)}' 
-    },
-    { 
-      id: "a", 
-      level: 0, 
-      // bridge: "{ ...after[0], pullFromContext: false, instance: true, concept: true, number: 'one', wantsValue: true, determiner: operator, modifiers: append(['determiner'], after[0].modifiers) }" 
-      bridge: "{ ...after[0], pullFromContext: false, concept: true, number: 'one', wantsValue: true, determiner: operator, modifiers: append(['determiner'], after[0].modifiers) }" 
-    },
-    */
-    /*
-    { 
-      id: "theAble", 
-      children: ['noun'],
-      bridge: "{ ...next(operator) }" 
-    },
-    */
-
-    // TODO make this hierarchy thing work
-    /*
-    { 
-      id: "thisitthat", 
-      level: 0, 
-      isA: ['queryable'], 
-      before: ['verby'],
-      bridge: "{ ...next(operator) }" 
-    },
-    */
     { 
       id: "why", 
       level: 0, 
@@ -287,31 +230,10 @@ const config = {
       id: "reason", 
       isA: ['theAble', 'queryable'], 
     },
-    /*
-    { 
-      id: "it", 
-      level: 0, 
-      isA: ['thisitthat'], 
-      bridge: "{ ...next(operator), pullFromContext: true, unknown: true, determined: true }" 
-    },
-    { 
-      id: "this", 
-      level: 0, 
-      isA: ['thisitthat'], 
-      bridge: "{ ...next(operator), unknown: true, pullFromContext: true }" 
-    },
-    { 
-      id: "that", 
-      level: 0, 
-      isA: ['thisitthat'], 
-      bridge: "{ ...next(operator), unknown: true, pullFromContext: true }" 
-    },
-    */
   ],
   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 }" }],
@@ -320,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' }" }
@@ -347,12 +270,9 @@ const config = {
     ['it', 'pronoun'],
     ['this', 'pronoun'],
     ['questionMark', 'punctuation'],
-    // ['questionMark', 'isEd'],
     ['a', 'article'],
     ['the', 'article'],
-    // ['unknown', 'theAble'],
     ['theAble', 'queryable'],
-    // ['unknown', 'queryable'],
     ['it', 'queryable'],
     ['what', 'queryable'],
     ['whatAble', 'queryable'],
@@ -369,11 +289,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 +315,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 +450,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
           }
@@ -554,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)}`
           }
@@ -788,7 +710,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

@@ -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": [
@@ -1135,7 +1137,7 @@
             "text": "dimension and unit",
             "range": {
               "start": 0,
-              "end": 30
+              "end": 17
             },
             "types": [
               "list",
@@ -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,
   ],
 }