tpmkms 9.7.1-beta.12 → 9.7.1-beta.13

package/common/angle.instance.json

@@ -4420,6 +4420,33 @@
               "unit"
             ],
             "propertyOf": true,
+            "interpolate": [
+              {
+                "property": "property"
+              },
+              {
+                "word": "of"
+              },
+              {
+                "property": "object"
+              }
+            ],
+            "property": {
+              "value": "unit",
+              "number": "many",
+              "text": "units",
+              "marker": "unit",
+              "dead": true,
+              "word": "units",
+              "range": {
+                "start": 24,
+                "end": 28
+              },
+              "types": [
+                "unit"
+              ],
+              "level": 0
+            },
             "object": {
               "value": "angle",
               "number": "one",

package/common/articles.js

@@ -1,7 +1,7 @@
 const { knowledgeModule, where, stableId, debug } = require('./runtime').theprogrammablemind
 const gdefaults = require('./gdefaults.js')
 const pos = require('./pos.js')
-const { defaultContextCheck } = require('./helpers')
+const { defaultContextCheckProperties, defaultContextCheck } = require('./helpers')
 const tests = require('./articles.test.json')
 
 const config = {
@@ -32,12 +32,34 @@ const config = {
     { 
       id: 'each', 
       isA: ['article'], 
-      bridge: '{ ...after[0], focusableForPhrase: true, pullFromContext: true, concept: true, wantsValue: true, distributer: operator, modifiers: append(["distributer"], after[0].modifiers)}' 
+      bridge: `{ 
+        ...after[0], 
+        focusableForPhrase: true, 
+        pullFromContext: true, 
+        concept: true, 
+        wantsValue: true, 
+        distributer: operator, 
+        eachArgument: after[0],
+        flatten_ignore: ['eachArgument'],
+        interpolate: [ { property: 'distributer' }, { property: 'eachArgument' } ],
+        modifiers: append(["distributer"], after[0].modifiers)
+      }` 
     },
     { 
       id: 'every', 
       isA: ['article'], 
-      bridge: '{ ...after[0], focusableForPhrase: true, pullFromContext: true, concept: true, wantsValue: true, distributer: operator, modifiers: append(["distributer"], after[0].modifiers)}' 
+      bridge: `{ 
+        ...after[0], 
+        focusableForPhrase: true, 
+        pullFromContext: true, 
+        concept: true, 
+        wantsValue: true, 
+        distributer: operator, 
+        everyArgument: after[0],
+        flatten_ignore: ['everyArgument'],
+        interpolate: [ { property: "distributer" }, { property: 'everyArgument' } ],
+        modifiers: append(["distributer"], after[0].modifiers)
+      }` 
     },
     { 
       id: 'distributable', 
@@ -46,9 +68,21 @@ const config = {
     { 
       id: 'the', 
       isA: ['article'], 
+      check: defaultContextCheckProperties(),
       localHierarchy: [['unknown', 'theAble']],
       level: 0, 
-      bridge: '{ ...after[0], focusableForPhrase: true, pullFromContext: true, concept: true, wantsValue: true, determiner: "the", modifiers: append(["determiner"], after[0].modifiers)}' 
+      bridge: `{ 
+                  ...after[0], 
+                  focusableForPhrase: true, 
+                  pullFromContext: true, 
+                  concept: true, 
+                  wantsValue: true, 
+                  checks: append(after[0].checks, ['determiner']),
+                  determiner: operator, 
+                  theable: after[0],
+                  flatten_ignore: ['theable'],
+                  interpolate: [{ property: 'determiner' }, { property: 'theable' }]
+               }` 
     },
     { 
       id: "a", 

package/common/can.instance.json

@@ -708,7 +708,7 @@
         ""
       ],
       "paraphrases": [
-        "canobject canverbs cansubject"
+        "canobject canPassive beCanPassive canverbs byCanPassive cansubject"
       ],
       "paraphrasesParenthesized": [],
       "generatedParenthesized": [],

package/common/conjunction.js

@@ -64,7 +64,7 @@ const config = {
     {
       where: where(),
       notes: 'handle lists',
-      match: ({context, hierarchy}) => context.marker == 'list' && context.value,
+      match: ({context, hierarchy}) => context.marker == 'list' && context.value && (!context.interpolate || context.isResponse),
       apply: async ({context, gs}) => {
         if (context.newLinesOnly) {
           return await gs(toFinalValue(context), '\n')
@@ -76,7 +76,7 @@ const config = {
 
     {
       where: where(),
-      match: ({context, callId}) => context.listable && context.value,
+      match: ({context, callId}) => context.listable && context.value && (!context.interpolate || context.isResponse),
       apply: ({context, gs}) => {
         return gs(context.value, ' ', ' ' + context.word + ' ')
       },

package/common/countable.js

@@ -27,17 +27,39 @@ const config = {
       id: "counting", 
       convolution: true, 
       before: ['verb', 'article'],
-      bridge: "{ ...after, modifiers: append(['quantity'], after[0].modifiers), quantity: before[0], number: default(before[0].number, before[0].value), instance: true }" 
+      bridge: `{ 
+        ...after, 
+        countable: after[0],
+        interpolate: [{ property: 'quantity', isQuantifier: true }, { property: 'countable', isQuantified: true }],
+        modifiers: append(['quantity'], after[0].modifiers), 
+        quantity: before[0], 
+        number: default(before[0].number, before[0].value), 
+        instance: true 
+      }` 
     },
     { 
       id: "countOfPieces", 
       convolution: true,
-      bridge: "{ ...next(operator), modifiers: append(['count'], after[0].modifiers), count: before[0], word: after.word, instance: true }" 
+      bridge: `{ 
+        ...next(operator), 
+        countOfPiecesOperator: after[0],
+        interpolate: [{ property: 'count' }, { property: 'countOfPiecesOperator' }],
+        modifiers: append(['count'], after[0].modifiers), 
+        count: before[0], 
+        word: after.word, 
+        instance: true }`
     },
     { 
       id: "countingPieces", 
       convolution: true,
-      bridge: "{ ...after, modifiers: append(['pieces'], after[0].modifiers), pieces: before[0], instance: true }" 
+      bridge: `{ 
+        ...after[0], 
+        countingPiecesOperator: after[0],
+        interpolate: [ { property: 'pieces' }, { property: 'countingPiecesOperator' }],
+        modifiers: append(['pieces'], after[0].modifiers), 
+        pieces: before[0], 
+        instance: true 
+      }` 
     },
     { 
       id: "hasCountOfPieces", 
@@ -48,11 +70,23 @@ const config = {
     },
     { 
       id: "more", 
-      bridge: "{ ...next(after[0]), more: operator, modifiers: append(['more'], after[0].modifiers) }",
+      bridge: `{ 
+        ...next(after[0]), 
+        more: operator, 
+        moreOperator: after[0],
+        interpolate: [ { property: 'more' }, { property: 'moreOperator' }],
+        modifiers: append(['more'], after[0].modifiers) 
+      }`,
     },
     { 
       id: "less", 
-      bridge: "{ ...next(after[0]), less: operator, modifiers: append(['less'], after[0].modifiers) }",
+      bridge: `{ 
+        ...next(after[0]), 
+        less: operator, 
+        lessOperator: after[0], 
+        interpolate: [{ property: 'less' }, { property: 'lessOperator' }],
+        modifiers: append(['less'], after[0].modifiers) 
+      }`,
     },
     { 
       id: "quantifier",