tpmkms_4wp 8.9.1-beta.4 → 8.9.1-beta.40

package/common/articles.js

@@ -4,7 +4,7 @@ const pos = require('./pos.js')
 const { defaultContextCheck } = require('./helpers')
 const tests = require('./articles.test.json')
 
-let config = {
+const config = {
   name: 'articles',
   operators: [
     "([thisitthat|])",
@@ -17,22 +17,38 @@ let config = {
     "(<what> ([whatAble|]))",
     "([what:optional])",
   */
+    "(<each> ([distributable]))",
+    "(<every> ([distributable]))",
     "(<the|> ([theAble]))",
     "(<a|a,an> ([theAble|]))",
   ],
   bridges: [
-    // { id: "what", level: 0, optional: "{ ...next(operator), query: ['what'], determined: true }", bridge: "{ ...after, query: ['what'], modifiers: ['what'], what: operator }" },
-    // { id: "whatAble", level: 0, bridge: "{ ...next(operator) }" },
     {
       id: 'everything',
     },
+    { 
+      id: 'each', 
+      isA: ['article'], 
+      bridge: '{ ...after[0], focusableForPhrase: true, pullFromContext: true, concept: true, wantsValue: true, distributer: operator, 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)}' 
+    },
+    { 
+      id: 'distributable', 
+      isA: ['queryable'], 
+    },
     { 
       id: 'the', 
+      isA: ['article'], 
       level: 0, 
       bridge: '{ ...after[0], focusableForPhrase: true, pullFromContext: true, concept: true, wantsValue: true, determiner: "the", modifiers: append(["determiner"], after[0].modifiers)}' 
     },
     { 
       id: "a", 
+      isA: ['article'], 
       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, instance: true, concept: true, number: 'one', wantsValue: true, determiner: operator, modifiers: append(['determiner'], after[0].modifiers) }" 
@@ -41,15 +57,12 @@ let config = {
     { 
       id: "theAble", 
       children: ['noun'],
-      bridge: "{ ...next(operator) }" 
     },
 
     { 
       id: "thisitthat", 
-      level: 0, 
       isA: ['queryable'], 
       before: ['verb'],
-      bridge: "{ ...next(operator) }" 
     },
     { 
       id: "it", 
@@ -79,8 +92,8 @@ let config = {
     ['it', 'pronoun'],
     ['this', 'pronoun'],
     // ['questionMark', 'isEd'],
-    ['a', 'articlePOS'],
-    ['the', 'articlePOS'],
+    // ['a', 'article'],
+    // ['the', 'article'],
     ['it', 'queryable'],
     // ['it', 'toAble'],
     ['this', 'queryable'],
@@ -100,7 +113,7 @@ knowledgeModule( {
     contents: tests,
     checks: {
             objects: ['onNevermindWasCalled', 'nevermindType', 'idSuffix'],
-            context: defaultContextCheck(),
+            context: defaultContextCheck(['distributer']),
           },
 
   },