tpmkms_4wp 8.9.1-beta.2 → 8.9.1-beta.20

package/common/currency.js

@@ -40,7 +40,7 @@ class API {
 
 const api = new API()
 
-let config = {
+const config = {
   name: 'currency',
   operators: [
     "(([number]) [currency])",
@@ -98,7 +98,7 @@ const initializer = ({config, objects, apis, addWord, addGenerator, baseConfig,
     addWord(word, def)
   }
   unitWords = api.getUnitWords();
-  for (let words of unitWords) {
+  for (const words of unitWords) {
       addGenerator({
         match: ({context}) => context.marker == 'currency' && context.units == words.units && context.value == 1 && context.isAbstract, 
         apply: ({context, g}) => words.one, uuid

package/common/dialogues.js

@@ -36,8 +36,17 @@ const warningSameNotEvaluated = (log, one) => {
   log(indent(message, 4))
 }
 
+const listorama = (type) => {
+  return [
+      { context: [[type, 0], ['list', 0], [type, 0]], choose: 0 },
+      { context: [[type, 1], ['list', 0], [type, 0]], choose: 0 },
+      { context: [[type, 1], ['list', 0], [type, 1]], choose: 0 },
+  ]
+}
+
+
 // TODO implement what / what did you say ...
-let config = {
+const config = {
   name: 'dialogues',
   operators: [
     "(<thatVerb|that> (verb/0))",
@@ -101,28 +110,36 @@ let config = {
     positive: [
       // [['is', 0], ['unknown', 1]],
       // [['isEd', 0], ['means', 0]],
+      // [['unknown', 0], ['list', 0], ['unknown', 0]],
       [['thatVerb', 0], ['verb', 0]],
       [['isEdee', 0], ['isEd', 0], ['isEder', 0], ['by', 0]],
       [['isEdee', 0], ['isEd', 0], ['isEdAble', 0]],
       [['unknown', 1], ['isEd', 0], ['isEdAble', 0]],
       [['unknown', 0], ['isEd', 0], ['isEdAble', 0]],
       [["isEd",0],["unknown",1],["isEdAble",0]],
-
+      // ...listorama('unknown'),
+      // ...listorama('queryable'),
     ]
   },
   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\"], 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: 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]) }' } }",
     },
 
     {
       id: 'queryable',
-      children: [
-        'negatable'
-      ],
+      children: [ 'negatable' ],
     },
+    /*
+    {
+      id: 'queryable',
+      level: 1,
+    },
+    */
     {
       id: 'makeObject',
       bridge: "{ ...next(operator), object: after[0] }",
@@ -334,7 +351,7 @@ let config = {
     { "context": [["isEdAble",0], ["isEd",0],], "choose": [0] },
     { "context": [['a', 0], ['is', 0], ['does', 0], ], "choose": [0] },
     { "context": [['isEd', 0], ['means', 0], ], "choose": [0] },
-    { "context": [['articlePOS', 0], ['isEdAble', 0], ], "choose": [0] },
+    { "context": [['article', 0], ['isEdAble', 0], ], "choose": [0] },
     { "context": [['isEdAble', 0], ['is', 0], ], "choose": [0] },
     { "context": [['isEdAble', 0], ['is', 1], ], "choose": [0] },
   ],
@@ -344,8 +361,8 @@ let config = {
     ['this', 'pronoun'],
     ['questionMark', 'punctuation'],
     // ['questionMark', 'isEd'],
-    ['a', 'articlePOS'],
-    ['the', 'articlePOS'],
+    ['a', 'article'],
+    ['the', 'article'],
     ['unknown', 'theAble'],
     ['theAble', 'queryable'],
     ['unknown', 'queryable'],
@@ -658,7 +675,7 @@ let config = {
         // km('dialogues').api.mentioned(concept)
         // TODO wtf is the next line?
         value = JSON.parse(JSON.stringify(value))
-        let instance = await e(value)
+        const instance = await e(value)
         if (false && instance.evalue) {
           km('stm').api.mentioned({ context: value })
         }
@@ -793,7 +810,7 @@ const initializer = ({objects, config, isModule}) => {
       return api('dialogues').toScopedId(context)
     },
     addWords: (id, word, additional) => {
-      for (let props of words(word, { ...additional })) {
+      for (const props of words(word, { ...additional })) {
         config.addWord(props.word, { id, initial: JSON.stringify(props) }) 
       }
     },

package/common/dimension.instance.json

@@ -123,7 +123,7 @@
       "hierarchy": [
         [
           "a",
-          "articlePOS",
+          "article",
           false
         ],
         [
@@ -137,8 +137,8 @@
           false
         ],
         [
-          "articlePOS",
-          "articlePOS",
+          "article",
+          "article",
           false
         ],
         [
@@ -261,6 +261,11 @@
           "theAble",
           false
         ],
+        [
+          "distributable",
+          "queryable",
+          false
+        ],
         [
           "divideByExpression",
           "mathematicalExpression",
@@ -276,6 +281,11 @@
           "queryable",
           false
         ],
+        [
+          "each",
+          "article",
+          false
+        ],
         [
           "evaluate",
           "verb",
@@ -283,7 +293,7 @@
         ],
         [
           "every",
-          "quantifier",
+          "article",
           false
         ],
         [
@@ -863,7 +873,7 @@
         ],
         [
           "the",
-          "articlePOS",
+          "article",
           false
         ],
         [
@@ -1122,7 +1132,6 @@
             },
             "types": [
               "list",
-              "queryable",
               "unknown"
             ],
             "listable": true,
@@ -1139,7 +1148,6 @@
                   "end": 8
                 },
                 "types": [
-                  "queryable",
                   "unknown"
                 ],
                 "dead": true,
@@ -1156,7 +1164,6 @@
                   "end": 17
                 },
                 "types": [
-                  "queryable",
                   "unknown"
                 ],
                 "dead": true,
@@ -1184,6 +1191,7 @@
           },
           "dead": true,
           "level": 2,
+          "context_index": 1,
           "topLevel": true,
           "touchedBy": [
             "dimension#call2"

package/common/dimension.js

@@ -40,7 +40,7 @@ class API {
     })
 
     // for example, celcius and fahrenheit
-    for (let unit of units) {
+    for (const unit of units) {
       config.addOperator(`([${unit}])`)
       config.addBridge({ 
         id: unit,
@@ -52,7 +52,7 @@ class API {
 
 const api = new API()
 
-let config = {
+const config = {
   name: 'dimension',
   operators: [
     "([dimension])",