tpmkms_4wp 8.0.0-beta.76 → 8.0.0-beta.77

package/common/comparable.instance.json

@@ -5,7 +5,7 @@
     "descending is a sort ordering",
     {
       "operators": [
-        "((comparable/*) [sortOrdering] (<sort_ordering/*))"
+        "((comparable/*) [sortOrdering] (sort_ordering/*))"
       ],
       "bridges": [
         {
@@ -1552,7 +1552,7 @@
     {
       "extraConfig": true,
       "operators": [
-        "((comparable/*) [sortOrdering] (<sort_ordering/*))"
+        "((comparable/*) [sortOrdering] (sort_ordering/*))"
       ],
       "bridges": [
         {

package/common/comparable.js

@@ -53,7 +53,7 @@ const template = {
     "descending is a sort ordering",
     {
       operators: [
-        "((comparable/*) [sortOrdering] (<sort_ordering/*))",
+        "((comparable/*) [sortOrdering] (sort_ordering/*))",
       ],
       bridges: [
         {

package/common/comparable.test.json

@@ -896,5 +896,763 @@
     "responses": [
       ""
     ]
+  },
+  {
+    "associations": [
+      [
+        [
+          "ascending",
+          0
+        ],
+        [
+          "unknown",
+          0
+        ]
+      ],
+      [
+        [
+          "ascending",
+          0
+        ],
+        [
+          "unknown",
+          1
+        ]
+      ]
+    ],
+    "config": {
+    },
+    "contexts": [
+      {
+        "dead": true,
+        "level": 2,
+        "marker": "unknown",
+        "ordering": "ascending",
+        "postModifiers": [
+          "sortOrder"
+        ],
+        "range": {
+          "end": 14,
+          "start": 0
+        },
+        "sortOrder": {
+          "dead": true,
+          "level": 1,
+          "marker": "ascending",
+          "number": "one",
+          "range": {
+            "end": 14,
+            "start": 6
+          },
+          "text": "ascending",
+          "types": [
+            "ascending"
+          ],
+          "value": "ascending",
+          "word": "ascending"
+        },
+        "text": "email ascending",
+        "topLevel": true,
+        "types": [
+          "comparable",
+          "unknown"
+        ],
+        "unknown": true,
+        "value": "email",
+        "word": "email"
+      }
+    ],
+    "developerTest": false,
+    "generatedParenthesized": [
+      ""
+    ],
+    "metadata": {
+      "opChoices": [
+        {
+          "counter": 1,
+          "op": [
+            "unknown",
+            0
+          ],
+          "ops": [
+            [
+              "ascending",
+              0
+            ],
+            [
+              "sortOrdering",
+              0
+            ],
+            [
+              "unknown",
+              0
+            ]
+          ]
+        },
+        {
+          "counter": 2,
+          "op": [
+            "ascending",
+            0
+          ],
+          "ops": [
+            [
+              "ascending",
+              0
+            ],
+            [
+              "sortOrdering",
+              0
+            ]
+          ]
+        },
+        {
+          "counter": 3,
+          "op": [
+            "sortOrdering",
+            0
+          ],
+          "ops": [
+            [
+              "sortOrdering",
+              0
+            ]
+          ]
+        }
+      ]
+    },
+    "objects": {
+      "nameToUUID": {
+        "articles": "articles2",
+        "comparable": "comparable1",
+        "concept": "concept2",
+        "dialogues": "dialogues2",
+        "evaluate": "evaluate2",
+        "gdefaults": "gdefaults2",
+        "meta": "meta2",
+        "negation": "negation2",
+        "numbers": "numbers2",
+        "pos": "pos2",
+        "punctuation": "punctuation2",
+        "sdefaults": "sdefaults2",
+        "stm": "stm2",
+        "tokenize": "tokenize2"
+      },
+      "namespaced": {
+        "articles2": {
+        },
+        "comparable1": {
+        },
+        "concept2": {
+          "defaultTypesForHierarchy": {
+          },
+          "valueToWords": [
+          ]
+        },
+        "dialogues2": {
+          "idSuffix": "",
+          "mentioned": [
+          ],
+          "variables": {
+          }
+        },
+        "evaluate2": {
+        },
+        "gdefaults2": {
+        },
+        "meta2": {
+        },
+        "negation2": {
+        },
+        "numbers2": {
+        },
+        "pos2": {
+        },
+        "punctuation2": {
+        },
+        "sdefaults2": {
+        },
+        "stm2": {
+          "mentioned": [
+            {
+              "dead": true,
+              "fromSTM": true,
+              "level": 1,
+              "marker": "descending",
+              "number": "one",
+              "pullFromContext": false,
+              "range": {
+                "end": 28,
+                "start": 0
+              },
+              "stm": {
+                "id": 4
+              },
+              "text": "descending",
+              "types": [
+                "unknown"
+              ],
+              "unknown": true,
+              "value": {
+                "atomic": true,
+                "concept": true,
+                "dead": true,
+                "determiner": {
+                  "default": true,
+                  "level": 0,
+                  "marker": "a",
+                  "range": {
+                    "end": 14,
+                    "start": 14
+                  },
+                  "text": "a",
+                  "word": "a"
+                },
+                "instance": true,
+                "level": 1,
+                "marker": "sort_ordering",
+                "modifier_sort": {
+                  "level": 0,
+                  "marker": "sort",
+                  "number": "one",
+                  "range": {
+                    "end": 19,
+                    "start": 16
+                  },
+                  "text": "sort",
+                  "types": [
+                    "sort"
+                  ],
+                  "value": "sort",
+                  "word": "sort"
+                },
+                "modifiers": [
+                  "determiner",
+                  "modifier_sort"
+                ],
+                "number": "one",
+                "pullFromContext": false,
+                "range": {
+                  "end": 28,
+                  "start": 14
+                },
+                "text": "a sort ordering",
+                "types": [
+                  "ordering",
+                  "sort_ordering"
+                ],
+                "value": "sort_ordering",
+                "wantsValue": true,
+                "word": "ordering"
+              },
+              "word": "descending"
+            },
+            {
+              "fromSTM": true,
+              "marker": "descending",
+              "pullFromContext": false,
+              "stm": {
+                "id": 3
+              },
+              "value": {
+                "atomic": true,
+                "concept": true,
+                "dead": true,
+                "determiner": {
+                  "default": true,
+                  "level": 0,
+                  "marker": "a",
+                  "range": {
+                    "end": 14,
+                    "start": 14
+                  },
+                  "text": "a",
+                  "word": "a"
+                },
+                "instance": true,
+                "level": 1,
+                "marker": "sort_ordering",
+                "modifier_sort": {
+                  "level": 0,
+                  "marker": "sort",
+                  "number": "one",
+                  "range": {
+                    "end": 19,
+                    "start": 16
+                  },
+                  "text": "sort",
+                  "types": [
+                    "sort"
+                  ],
+                  "value": "sort",
+                  "word": "sort"
+                },
+                "modifiers": [
+                  "determiner",
+                  "modifier_sort"
+                ],
+                "number": "one",
+                "pullFromContext": false,
+                "range": {
+                  "end": 28,
+                  "start": 14
+                },
+                "text": "a sort ordering",
+                "types": [
+                  "ordering",
+                  "sort_ordering"
+                ],
+                "value": "sort_ordering",
+                "wantsValue": true,
+                "word": "ordering"
+              }
+            },
+            {
+              "dead": true,
+              "fromSTM": true,
+              "level": 1,
+              "marker": "ascending",
+              "number": "one",
+              "pullFromContext": false,
+              "range": {
+                "end": 27,
+                "start": 0
+              },
+              "stm": {
+                "id": 2
+              },
+              "text": "ascending",
+              "types": [
+                "unknown"
+              ],
+              "unknown": true,
+              "value": {
+                "atomic": true,
+                "concept": true,
+                "dead": true,
+                "determiner": {
+                  "default": true,
+                  "level": 0,
+                  "marker": "a",
+                  "range": {
+                    "end": 13,
+                    "start": 13
+                  },
+                  "text": "a",
+                  "word": "a"
+                },
+                "instance": true,
+                "level": 1,
+                "marker": "sort_ordering",
+                "modifier_sort": {
+                  "level": 0,
+                  "marker": "sort",
+                  "number": "one",
+                  "range": {
+                    "end": 18,
+                    "start": 15
+                  },
+                  "text": "sort",
+                  "types": [
+                    "sort"
+                  ],
+                  "value": "sort",
+                  "word": "sort"
+                },
+                "modifiers": [
+                  "determiner",
+                  "modifier_sort"
+                ],
+                "number": "one",
+                "pullFromContext": false,
+                "range": {
+                  "end": 27,
+                  "start": 13
+                },
+                "text": "a sort ordering",
+                "types": [
+                  "ordering",
+                  "sort_ordering"
+                ],
+                "value": "sort_ordering",
+                "wantsValue": true,
+                "word": "ordering"
+              },
+              "word": "ascending"
+            },
+            {
+              "fromSTM": true,
+              "marker": "ascending",
+              "pullFromContext": false,
+              "stm": {
+                "id": 1
+              },
+              "value": {
+                "atomic": true,
+                "concept": true,
+                "dead": true,
+                "determiner": {
+                  "default": true,
+                  "level": 0,
+                  "marker": "a",
+                  "range": {
+                    "end": 13,
+                    "start": 13
+                  },
+                  "text": "a",
+                  "word": "a"
+                },
+                "instance": true,
+                "level": 1,
+                "marker": "sort_ordering",
+                "modifier_sort": {
+                  "level": 0,
+                  "marker": "sort",
+                  "number": "one",
+                  "range": {
+                    "end": 18,
+                    "start": 15
+                  },
+                  "text": "sort",
+                  "types": [
+                    "sort"
+                  ],
+                  "value": "sort",
+                  "word": "sort"
+                },
+                "modifiers": [
+                  "determiner",
+                  "modifier_sort"
+                ],
+                "number": "one",
+                "pullFromContext": false,
+                "range": {
+                  "end": 27,
+                  "start": 13
+                },
+                "text": "a sort ordering",
+                "types": [
+                  "ordering",
+                  "sort_ordering"
+                ],
+                "value": "sort_ordering",
+                "wantsValue": true,
+                "word": "ordering"
+              }
+            }
+          ],
+          "variables": {
+          }
+        },
+        "tokenize2": {
+        }
+      },
+      "processed": [
+        {
+          "context": {
+            "dead": true,
+            "level": 2,
+            "marker": "unknown",
+            "ordering": "ascending",
+            "postModifiers": [
+              "sortOrder"
+            ],
+            "range": {
+              "end": 14,
+              "start": 0
+            },
+            "sortOrder": {
+              "dead": true,
+              "level": 1,
+              "marker": "ascending",
+              "number": "one",
+              "range": {
+                "end": 14,
+                "start": 6
+              },
+              "text": "ascending",
+              "types": [
+                "ascending"
+              ],
+              "value": "ascending",
+              "word": "ascending"
+            },
+            "text": "email ascending",
+            "topLevel": true,
+            "types": [
+              "comparable",
+              "unknown"
+            ],
+            "unknown": true,
+            "value": "email",
+            "word": "email"
+          },
+          "generatedParenthesized": "",
+          "paraphrases": "email ascending",
+          "paraphrasesParenthesized": "((email) (ascending))",
+          "responses": [
+            ""
+          ]
+        },
+        {
+          "context": {
+            "dead": true,
+            "level": 2,
+            "marker": "is",
+            "number": "one",
+            "one": {
+              "dead": true,
+              "level": 1,
+              "marker": "unknown",
+              "number": "one",
+              "range": {
+                "end": 28,
+                "start": 0
+              },
+              "text": "descending",
+              "types": [
+                "unknown"
+              ],
+              "unknown": true,
+              "value": "descending",
+              "word": "descending"
+            },
+            "range": {
+              "end": 28,
+              "start": 0
+            },
+            "text": "descending is a sort ordering",
+            "topLevel": true,
+            "touchedBy": [
+              "comparable#call2",
+              "instance2#comparable#call2"
+            ],
+            "two": {
+              "atomic": true,
+              "concept": true,
+              "dead": true,
+              "determiner": {
+                "default": true,
+                "level": 0,
+                "marker": "a",
+                "range": {
+                  "end": 14,
+                  "start": 14
+                },
+                "text": "a",
+                "word": "a"
+              },
+              "instance": true,
+              "level": 1,
+              "marker": "sort_ordering",
+              "modifier_sort": {
+                "level": 0,
+                "marker": "sort",
+                "number": "one",
+                "range": {
+                  "end": 19,
+                  "start": 16
+                },
+                "text": "sort",
+                "types": [
+                  "sort"
+                ],
+                "value": "sort",
+                "word": "sort"
+              },
+              "modifiers": [
+                "determiner",
+                "modifier_sort"
+              ],
+              "number": "one",
+              "pullFromContext": false,
+              "range": {
+                "end": 28,
+                "start": 14
+              },
+              "text": "a sort ordering",
+              "types": [
+                "ordering",
+                "sort_ordering"
+              ],
+              "value": "sort_ordering",
+              "wantsValue": true,
+              "word": "ordering"
+            },
+            "word": "is"
+          },
+          "generatedParenthesized": [
+          ],
+          "paraphrases": "descending is a sort ordering",
+          "paraphrasesParenthesized": [
+          ],
+          "responses": [
+            ""
+          ]
+        },
+        {
+          "context": {
+            "dead": true,
+            "level": 2,
+            "marker": "is",
+            "number": "one",
+            "one": {
+              "dead": true,
+              "level": 1,
+              "marker": "unknown",
+              "number": "one",
+              "range": {
+                "end": 27,
+                "start": 0
+              },
+              "text": "ascending",
+              "types": [
+                "unknown"
+              ],
+              "unknown": true,
+              "value": "ascending",
+              "word": "ascending"
+            },
+            "range": {
+              "end": 27,
+              "start": 0
+            },
+            "text": "ascending is a sort ordering",
+            "topLevel": true,
+            "touchedBy": [
+              "comparable#call2",
+              "instance1#comparable#call2"
+            ],
+            "two": {
+              "atomic": true,
+              "concept": true,
+              "dead": true,
+              "determiner": {
+                "default": true,
+                "level": 0,
+                "marker": "a",
+                "range": {
+                  "end": 13,
+                  "start": 13
+                },
+                "text": "a",
+                "word": "a"
+              },
+              "instance": true,
+              "level": 1,
+              "marker": "sort_ordering",
+              "modifier_sort": {
+                "level": 0,
+                "marker": "sort",
+                "number": "one",
+                "range": {
+                  "end": 18,
+                  "start": 15
+                },
+                "text": "sort",
+                "types": [
+                  "sort"
+                ],
+                "value": "sort",
+                "word": "sort"
+              },
+              "modifiers": [
+                "determiner",
+                "modifier_sort"
+              ],
+              "number": "one",
+              "pullFromContext": false,
+              "range": {
+                "end": 27,
+                "start": 13
+              },
+              "text": "a sort ordering",
+              "types": [
+                "ordering",
+                "sort_ordering"
+              ],
+              "value": "sort_ordering",
+              "wantsValue": true,
+              "word": "ordering"
+            },
+            "word": "is"
+          },
+          "generatedParenthesized": [
+          ],
+          "paraphrases": "ascending is a sort ordering",
+          "paraphrasesParenthesized": [
+          ],
+          "responses": [
+            ""
+          ]
+        },
+        {
+          "context": {
+            "concept": {
+              "dead": true,
+              "level": 1,
+              "marker": "unknown",
+              "range": {
+                "end": 21,
+                "start": 14
+              },
+              "text": "ordering",
+              "unknown": true,
+              "value": "ordering",
+              "word": "ordering"
+            },
+            "dead": true,
+            "flatten": false,
+            "level": 1,
+            "marker": "modifies",
+            "modifiers": [
+              {
+                "dead": true,
+                "level": 1,
+                "marker": "unknown",
+                "range": {
+                  "end": 3,
+                  "start": 0
+                },
+                "text": "sort",
+                "unknown": true,
+                "value": "sort",
+                "word": "sort"
+              }
+            ],
+            "number": "one",
+            "range": {
+              "end": 21,
+              "start": 0
+            },
+            "text": "sort modifies ordering",
+            "topLevel": true,
+            "touchedBy": [
+              "comparable#call2",
+              "instance0#comparable#call2"
+            ],
+            "word": "modifies"
+          },
+          "generatedParenthesized": [
+          ],
+          "paraphrases": "sort modifies ordering",
+          "paraphrasesParenthesized": [
+          ],
+          "responses": [
+            ""
+          ]
+        }
+      ]
+    },
+    "paraphrases": [
+      "email ascending"
+    ],
+    "paraphrasesParenthesized": [
+      "((email) (ascending))"
+    ],
+    "query": "email ascending",
+    "responses": [
+      ""
+    ]
   }
 ]

package/common/dialogues.js

@@ -9,7 +9,7 @@ const punctuation = require('./punctuation.js')
 const stm = require('./stm.js')
 const _ = require('lodash')
 const { API } = require('./helpers/dialogues')
-const { isMany, propertyToArray } = require('./helpers')
+const { isMany, propertyToArray, words } = require('./helpers')
 const dialogues_tests = require('./dialogues.test.json')
 const { defaultContextCheck, indent, focus } = require('./helpers')
 const pluralize = require('pluralize')
@@ -929,6 +929,11 @@ const initializer = ({objects, config, isModule}) => {
     toScopedId: (context) => {
       return api('dialogues').toScopedId(context)
     },
+    addWords: (id, word, additional) => {
+      for (let props of words(word, additional)) {
+        config.addWord(id, props) 
+      }
+    }
   }))
   objects.mentioned = []
   objects.variables = {

package/common/helpers.js

@@ -33,8 +33,8 @@ const getCount = (context) => {
   }
 }
 
-const words = (base, additional = {}) => {
-  return [{ word: pluralize.singular(base), number: 'one', ...additional }, { word: pluralize.plural(base), number: 'many', ...additional }]
+const words = (word, additional = {}) => {
+  return [{ word: pluralize.singular(word), number: 'one', ...additional }, { word: pluralize.plural(word), number: 'many', ...additional }]
 }
 
 const isMany = (context) => {

package/package.json

@@ -295,8 +295,8 @@
     "table": "^6.7.1",
     "base-64": "^1.0.0",
     "argparse": "^2.0.1",
-    "theprogrammablemind_4wp": "8.0.0-beta.76"
+    "theprogrammablemind_4wp": "8.0.0-beta.77"
   },
-  "version": "8.0.0-beta.76",
+  "version": "8.0.0-beta.77",
   "license": "UNLICENSED"
 }