tpmkms_4wp 8.9.0-beta.13 → 8.9.0-beta.14

package/common/wp.instance.json

@@ -4,7 +4,7 @@
     "words are countable and statefulElements",
     "characters are countable",
     "paragraphs are countable",
-    "bold, italic and underlined are styles",
+    "bold, italic, code and underlined are styles",
     "resetIdSuffix",
     {
       "operators": [
@@ -23,7 +23,7 @@
               "statefulElement"
             ]
           ],
-          "semantic": "({api, context}) => {\n            const unit = context.element.marker\n            const scope = context.element.quantity.quantity\n            const color = context.state.value.split('_')[0]\n            api.changeColor({ unit, scope, color })\n          }"
+          "semantic": "({api, isA, context, toArray}) => {\n            const root = (id) => {\n              return id.split('_')[0]\n            }\n            const unit = root(context.element.marker)\n            const scope = context.element.quantity.quantity\n            let color;\n            const styles = []\n            const update = { unit, scope }\n            for (const state of toArray(context.state)) {\n              if (isA(state, 'style_wp')) {\n                if (!update.styles) {\n                  update.styles = []\n                }\n                let style = root(state.value)\n                if (style == 'underlined') {\n                  style = 'underline'\n                }\n                update.styles.push(root(state.value))\n              } else {\n                update.color = root(state.value)\n              }\n            }\n            api.changeState(update)\n          }"
         },
         {
           "id": "stateValue_wp",
@@ -2244,7 +2244,8 @@
           "level": 1,
           "topLevel": true,
           "touchedBy": [
-            "wp#call2"
+            "wp#call2",
+            "instance0#wp#call2"
           ]
         }
       ],
@@ -4620,7 +4621,8 @@
           "level": 2,
           "topLevel": true,
           "touchedBy": [
-            "wp#call2"
+            "wp#call2",
+            "instance0#wp#call2"
           ]
         }
       ],
@@ -7049,7 +7051,8 @@
           "level": 2,
           "topLevel": true,
           "touchedBy": [
-            "wp#call2"
+            "wp#call2",
+            "instance0#wp#call2"
           ]
         }
       ],
@@ -9470,7 +9473,8 @@
           "level": 2,
           "topLevel": true,
           "touchedBy": [
-            "wp#call2"
+            "wp#call2",
+            "instance0#wp#call2"
           ]
         }
       ],
@@ -11822,6 +11826,10 @@
               0
             ],
             "ops": [
+              [
+                "comma",
+                0
+              ],
               [
                 "comma",
                 0
@@ -11846,6 +11854,10 @@
                 "unknown",
                 0
               ],
+              [
+                "unknown",
+                0
+              ],
               [
                 "unknown",
                 0
@@ -11859,6 +11871,10 @@
               0
             ],
             "ops": [
+              [
+                "comma",
+                0
+              ],
               [
                 "comma",
                 0
@@ -11879,6 +11895,10 @@
                 "unknown",
                 0
               ],
+              [
+                "unknown",
+                0
+              ],
               [
                 "unknown",
                 0
@@ -11892,6 +11912,10 @@
               0
             ],
             "ops": [
+              [
+                "comma",
+                0
+              ],
               [
                 "comma",
                 0
@@ -11908,6 +11932,10 @@
                 "unknown",
                 0
               ],
+              [
+                "unknown",
+                0
+              ],
               [
                 "unknown",
                 0
@@ -11921,6 +11949,10 @@
               0
             ],
             "ops": [
+              [
+                "comma",
+                0
+              ],
               [
                 "comma",
                 0
@@ -11933,6 +11965,10 @@
                 "list",
                 0
               ],
+              [
+                "unknown",
+                0
+              ],
               [
                 "unknown",
                 0
@@ -11942,10 +11978,14 @@
           },
           {
             "op": [
-              "list",
+              "unknown",
               0
             ],
             "ops": [
+              [
+                "comma",
+                0
+              ],
               [
                 "comma",
                 0
@@ -11957,16 +11997,24 @@
               [
                 "list",
                 0
+              ],
+              [
+                "unknown",
+                0
               ]
             ],
             "counter": 5
           },
           {
             "op": [
-              "comma",
+              "list",
               0
             ],
             "ops": [
+              [
+                "comma",
+                0
+              ],
               [
                 "comma",
                 0
@@ -11974,10 +12022,52 @@
               [
                 "is",
                 0
+              ],
+              [
+                "list",
+                0
               ]
             ],
             "counter": 6
           },
+          {
+            "op": [
+              "comma",
+              0
+            ],
+            "ops": [
+              [
+                "comma",
+                0
+              ],
+              [
+                "comma",
+                0
+              ],
+              [
+                "is",
+                0
+              ]
+            ],
+            "counter": 7
+          },
+          {
+            "op": [
+              "comma",
+              0
+            ],
+            "ops": [
+              [
+                "comma",
+                0
+              ],
+              [
+                "is",
+                0
+              ]
+            ],
+            "counter": 8
+          },
           {
             "op": [
               "list",
@@ -11993,7 +12083,24 @@
                 1
               ]
             ],
-            "counter": 7
+            "counter": 9
+          },
+          {
+            "op": [
+              "list",
+              1
+            ],
+            "ops": [
+              [
+                "is",
+                0
+              ],
+              [
+                "list",
+                1
+              ]
+            ],
+            "counter": 10
           },
           {
             "op": [
@@ -12006,7 +12113,7 @@
                 0
               ]
             ],
-            "counter": 8
+            "counter": 11
           },
           {
             "op": [
@@ -12019,7 +12126,7 @@
                 1
               ]
             ],
-            "counter": 9
+            "counter": 12
           }
         ]
       },
@@ -12027,22 +12134,22 @@
       "contexts": [
         {
           "number": "many",
-          "text": "bold, italic and underlined are styles",
+          "text": "bold, italic, code and underlined are styles",
           "marker": "is",
           "word": "are",
           "range": {
             "start": 0,
-            "end": 37
+            "end": 43
           },
           "one": {
             "number": "many",
             "marker": "list",
             "default": true,
             "word": "and",
-            "text": "bold, italic and underlined",
+            "text": "bold, italic, code and underlined",
             "range": {
               "start": 0,
-              "end": 37
+              "end": 43
             },
             "types": [
               "list",
@@ -12087,12 +12194,44 @@
               {
                 "value": "italic",
                 "unknown": true,
-                "text": "italic",
+                "text": "italic,",
                 "marker": "unknown",
                 "word": "italic",
                 "range": {
                   "start": 6,
-                  "end": 11
+                  "end": 12
+                },
+                "dead": true,
+                "decorators": {
+                  "after": {
+                    "word": ",",
+                    "value": ",",
+                    "depth": "+",
+                    "text": ",",
+                    "marker": "comma",
+                    "range": {
+                      "start": 12,
+                      "end": 12
+                    },
+                    "level": 0
+                  }
+                },
+                "no_convolutions": true,
+                "types": [
+                  "queryable",
+                  "unknown"
+                ],
+                "level": 1
+              },
+              {
+                "value": "code",
+                "unknown": true,
+                "text": "code",
+                "marker": "unknown",
+                "word": "code",
+                "range": {
+                  "start": 14,
+                  "end": 17
                 },
                 "types": [
                   "queryable",
@@ -12108,8 +12247,8 @@
                 "marker": "unknown",
                 "word": "underlined",
                 "range": {
-                  "start": 17,
-                  "end": 26
+                  "start": 23,
+                  "end": 32
                 },
                 "types": [
                   "queryable",
@@ -12128,8 +12267,8 @@
             "marker": "unknown",
             "word": "styles",
             "range": {
-              "start": 32,
-              "end": 37
+              "start": 38,
+              "end": 43
             },
             "dead": true,
             "types": [
@@ -12150,7 +12289,7 @@
         ""
       ],
       "paraphrases": [
-        "bold, italic and underlined are styles"
+        "bold, italic, code and underlined are styles"
       ],
       "paraphrasesParenthesized": [],
       "generatedParenthesized": [],
@@ -12250,9 +12389,9 @@
         ]
       ],
       "learned_contextual_priorities": [],
-      "query": "bold, italic and underlined are styles",
+      "query": "bold, italic, code and underlined are styles",
       "key": {
-        "query": "bold, italic and underlined are styles"
+        "query": "bold, italic, code and underlined are styles"
       }
     },
     {
@@ -12792,6 +12931,46 @@
           "theAble",
           false
         ],
+        [
+          "code_wp",
+          "hierarchyAble",
+          false
+        ],
+        [
+          "code_wp",
+          "isEdee",
+          false
+        ],
+        [
+          "code_wp",
+          "isEder",
+          false
+        ],
+        [
+          "code_wp",
+          "object",
+          false
+        ],
+        [
+          "code_wp",
+          "property",
+          false
+        ],
+        [
+          "code_wp",
+          "queryable",
+          false
+        ],
+        [
+          "code_wp",
+          "style_wp",
+          false
+        ],
+        [
+          "code_wp",
+          "theAble",
+          false
+        ],
         [
           "color_colors",
           "concept",

package/common/wp.js

@@ -23,10 +23,34 @@ const instance = require('./wp.instance.json')
 class API {
   initialize({ objects }) {
     this._objects = objects
+    this._objects.changeState = []
   }
 
   changeState(value) {
-    this._objects.changeState = value
+    this._objects.changeState.push(value)
+  }
+}
+
+const root = (id) => {
+  return id.split('_')[0]
+}
+
+const setUpdate = (isA, update, states) => {
+  let color;
+  const styles = []
+  for (const state of states) {
+    if (isA(state, 'style_wp')) {
+      if (!update.styles) {
+        update.styles = []
+      }
+      let style = root(state.value)
+      if (style == 'underlined') {
+        style = 'underline'
+      }
+      update.styles.push(style)
+    } else {
+      update.color = root(state.value)
+    }
   }
 }
 
@@ -42,7 +66,7 @@ template = {
     'words are countable and statefulElements',
     'characters are countable',
     'paragraphs are countable',
-    'bold, italic and underlined are styles',
+    'bold, italic, code and underlined are styles',
     "resetIdSuffix",
     {
       operators: [
@@ -58,24 +82,10 @@ template = {
             ['thisitthat', 'statefulElement'],
           ],
           semantic: ({api, isA, context, toArray}) => {
-            const root = (id) => {
-              return id.split('_')[0]
-            }
             const unit = root(context.element.marker)
             const scope = context.element.quantity.quantity
-            let color;
-            const styles = []
             const update = { unit, scope }
-            for (const state of toArray(context.state)) {
-              if (isA(state, 'style_wp')) {
-                if (!update.styles) {
-                  update.styles = []
-                }
-                update.styles.push(root(state.value))
-              } else {
-                update.color = root(state.value)
-              }
-            }
+            setUpdate(isA, update, toArray(context.state))
             api.changeState(update)
           }
         },
@@ -84,6 +94,29 @@ template = {
           children: ['color_colors', 'style_wp'],
         },
       ],
+      semantics: [
+        {
+          where: where(),
+          match: ({context, isA}) => isA(context, 'style_wp') && !context.same && !context.isResponse && !context.evaluate,
+          apply: ({context, api, isA, toArray}) => {
+            const update = { scope: 'selection' }
+            setUpdate(isA, update, toArray(context))
+            api.changeState(update)
+          }
+        },
+        {
+          where: where(),
+          match: ({context, isA}) => isA(context, 'statefulElement_wp') && !context.same && !context.isResponse && !context.evaluate,
+          apply: ({context, api, isA, toArray}) => {
+            const unit = root(context.marker)
+            let scope
+            if (context.quantity) {
+              scope = context.quantity.quantity
+            }
+            // TODO set default scope for "every word bold underlined etc"
+          }
+        },
+      ],
       priorities: [
         { "context": [['changeState_wp',0], ['statefulElement_wp', 0], ['list', 0]], ordered: true, choose: [0] },
       ],