tpmkms_4wp 8.9.1-beta.2 → 8.9.1-beta.21

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,6 +17,8 @@ let config = {
     "(<what> ([whatAble|]))",
     "([what:optional])",
   */
+    "(<each> ([distributable]))",
+    "(<every> ([distributable]))",
     "(<the|> ([theAble]))",
     "(<a|a,an> ([theAble|]))",
   ],
@@ -26,6 +28,20 @@ let config = {
     {
       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', 
       level: 0, 
@@ -79,8 +95,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 +116,7 @@ knowledgeModule( {
     contents: tests,
     checks: {
             objects: ['onNevermindWasCalled', 'nevermindType', 'idSuffix'],
-            context: defaultContextCheck(),
+            context: defaultContextCheck(['distributer']),
           },
 
   },

package/common/articles.test.json

@@ -306,5 +306,343 @@
     "responses": [
       ""
     ]
+  },
+  {
+    "associations": [
+      [
+        [
+          "distributable",
+          0
+        ],
+        [
+          "every",
+          0
+        ]
+      ]
+    ],
+    "config": {
+    },
+    "contexts": [
+      {
+        "concept": true,
+        "dead": true,
+        "default": true,
+        "distributer": {
+          "default": true,
+          "level": 0,
+          "marker": "every",
+          "range": {
+            "end": 4,
+            "start": 0
+          },
+          "text": "every",
+          "value": "every",
+          "word": "every"
+        },
+        "focusableForPhrase": true,
+        "level": 1,
+        "marker": "distributable",
+        "modifiers": [
+          "distributer"
+        ],
+        "pullFromContext": true,
+        "range": {
+          "end": 18,
+          "start": 0
+        },
+        "text": "every distributable",
+        "topLevel": true,
+        "types": [
+          "distributable"
+        ],
+        "value": "distributable",
+        "wantsValue": true,
+        "word": "distributable"
+      }
+    ],
+    "developerTest": false,
+    "generatedParenthesized": [
+      ""
+    ],
+    "metadata": {
+      "opChoices": [
+        {
+          "counter": 1,
+          "op": [
+            "distributable",
+            0
+          ],
+          "ops": [
+            [
+              "distributable",
+              0
+            ],
+            [
+              "every",
+              0
+            ]
+          ]
+        },
+        {
+          "counter": 2,
+          "op": [
+            "every",
+            0
+          ],
+          "ops": [
+            [
+              "every",
+              0
+            ]
+          ]
+        }
+      ]
+    },
+    "objects": {
+      "nameToUUID": {
+        "articles": "articles1",
+        "gdefaults": "gdefaults2",
+        "pos": "pos2",
+        "punctuation": "punctuation2",
+        "tokenize": "tokenize2"
+      },
+      "namespaced": {
+        "articles1": {
+        },
+        "gdefaults2": {
+        },
+        "pos2": {
+        },
+        "punctuation2": {
+        },
+        "tokenize2": {
+        }
+      },
+      "processed": [
+        {
+          "context": {
+            "concept": true,
+            "dead": true,
+            "default": true,
+            "distributer": {
+              "default": true,
+              "level": 0,
+              "marker": "every",
+              "range": {
+                "end": 4,
+                "start": 0
+              },
+              "text": "every",
+              "value": "every",
+              "word": "every"
+            },
+            "focusableForPhrase": true,
+            "level": 1,
+            "marker": "distributable",
+            "modifiers": [
+              "distributer"
+            ],
+            "pullFromContext": true,
+            "range": {
+              "end": 18,
+              "start": 0
+            },
+            "text": "every distributable",
+            "topLevel": true,
+            "types": [
+              "distributable"
+            ],
+            "value": "distributable",
+            "wantsValue": true,
+            "word": "distributable"
+          },
+          "generatedParenthesized": "",
+          "paraphrases": "every distributable",
+          "paraphrasesParenthesized": "((every) (distributable))",
+          "responses": [
+            ""
+          ]
+        }
+      ]
+    },
+    "paraphrases": [
+      "every distributable"
+    ],
+    "paraphrasesParenthesized": [
+      "((every) (distributable))"
+    ],
+    "query": "every distributable",
+    "responses": [
+      ""
+    ]
+  },
+  {
+    "associations": [
+      [
+        [
+          "distributable",
+          0
+        ],
+        [
+          "each",
+          0
+        ]
+      ]
+    ],
+    "config": {
+    },
+    "contexts": [
+      {
+        "concept": true,
+        "dead": true,
+        "default": true,
+        "distributer": {
+          "default": true,
+          "level": 0,
+          "marker": "each",
+          "range": {
+            "end": 3,
+            "start": 0
+          },
+          "text": "each",
+          "value": "each",
+          "word": "each"
+        },
+        "focusableForPhrase": true,
+        "level": 1,
+        "marker": "distributable",
+        "modifiers": [
+          "distributer"
+        ],
+        "pullFromContext": true,
+        "range": {
+          "end": 17,
+          "start": 0
+        },
+        "text": "each distributable",
+        "topLevel": true,
+        "types": [
+          "distributable"
+        ],
+        "value": "distributable",
+        "wantsValue": true,
+        "word": "distributable"
+      }
+    ],
+    "developerTest": false,
+    "generatedParenthesized": [
+      ""
+    ],
+    "metadata": {
+      "opChoices": [
+        {
+          "counter": 1,
+          "op": [
+            "distributable",
+            0
+          ],
+          "ops": [
+            [
+              "distributable",
+              0
+            ],
+            [
+              "each",
+              0
+            ]
+          ]
+        },
+        {
+          "counter": 2,
+          "op": [
+            "each",
+            0
+          ],
+          "ops": [
+            [
+              "each",
+              0
+            ]
+          ]
+        }
+      ]
+    },
+    "objects": {
+      "nameToUUID": {
+        "articles": "articles1",
+        "gdefaults": "gdefaults2",
+        "pos": "pos2",
+        "punctuation": "punctuation2",
+        "tokenize": "tokenize2"
+      },
+      "namespaced": {
+        "articles1": {
+        },
+        "gdefaults2": {
+        },
+        "pos2": {
+        },
+        "punctuation2": {
+        },
+        "tokenize2": {
+        }
+      },
+      "processed": [
+        {
+          "context": {
+            "concept": true,
+            "dead": true,
+            "default": true,
+            "distributer": {
+              "default": true,
+              "level": 0,
+              "marker": "each",
+              "range": {
+                "end": 3,
+                "start": 0
+              },
+              "text": "each",
+              "value": "each",
+              "word": "each"
+            },
+            "focusableForPhrase": true,
+            "level": 1,
+            "marker": "distributable",
+            "modifiers": [
+              "distributer"
+            ],
+            "pullFromContext": true,
+            "range": {
+              "end": 17,
+              "start": 0
+            },
+            "text": "each distributable",
+            "topLevel": true,
+            "types": [
+              "distributable"
+            ],
+            "value": "distributable",
+            "wantsValue": true,
+            "word": "distributable"
+          },
+          "generatedParenthesized": "",
+          "paraphrases": "each distributable",
+          "paraphrasesParenthesized": "((each) (distributable))",
+          "responses": [
+            ""
+          ]
+        }
+      ]
+    },
+    "paraphrases": [
+      "each distributable"
+    ],
+    "paraphrasesParenthesized": [
+      "((each) (distributable))"
+    ],
+    "query": "each distributable",
+    "responses": [
+      ""
+    ]
   }
 ]

package/common/asking.js

@@ -8,7 +8,7 @@ const { defaultContextCheck, indent, focus, requiredArgument } = require('./help
 const pluralize = require('pluralize')
 
 // TODO implement what / what did you say ...
-let config = {
+const config = {
   name: 'asking',
   operators: [
     "([nevermind])",
@@ -40,7 +40,7 @@ let config = {
       id: "whichOnesTestSetup",
       development: true,
       generatorp: async ({context, gs}) => `${context.marker} ${await gs(context.choices)}`,
-      bridge: "{ ...next(operator), choices: after }",
+      bridge: "{ ...next(operator), choices: after[0] }",
       semantic: ({askWhich, context}) => {
         const choices = context.choices
         const chosen = ({ choice, objects }) => {
@@ -191,7 +191,7 @@ const initializer = ({objects, config, isModule}) => {
       return {
         ask,
         askWhich: ({ choices, chosen, question, isChoice, onNevermind }) => {
-          let state = {}
+          const state = {}
 
           requiredArgument(choices, 'choices')
           requiredArgument(chosen, 'chosen')