tpmkms_4wp 8.9.1-beta.2 → 8.9.1

package/common/wp.js

@@ -9,8 +9,6 @@ const wp_tests = require('./wp.test.json')
 const instance = require('./wp.instance.json')
 
 /*
-  the bolded words that start with t
-
   start inserting text until I say banana
   ...
   or 
@@ -19,16 +17,12 @@ const instance = require('./wp.instance.json')
   make the text of the 1st to 3rd paragraphs blue
 
 
-  make the words that start with a bold
-
   make every word bold and underlines and blue -> weirdly "bold underlined and blue" works
 
   make the font ... 
   make the color blue
   make the color of the first paragraph blue
 
-  undeline the bolded text / the text that is bolded
-
   words that start with a
   make all the bold text uppercase
   underline all the bold text
@@ -43,12 +37,6 @@ const instance = require('./wp.instance.json')
   in the first paragraph make the words that start with abc bold
   bold the first three words that start with t
   bold much and many
-  make the words that start with t bold and underlined
-  make all the capital letters|punctuation bold
-
-  move this paragraph up 2
-  move the next paragraph up 1
-  move the last paragraph before this one
 */
 
 class API {
@@ -101,16 +89,11 @@ const changeState = ({api, isA, context, toArray, element, state}) => {
   let conditions = []
   if (isA(context.element, 'everything')) {
     scope = 'all'
-  } else if (context.element.conditions) {
-    const condition = context.element.conditions[0]
-    if (condition.marker == 'wordComparisonWith_wp') {
-      // with or not with that is the question
+  } else if (context.element.condition) {
+    const condition = context.element.condition
+    if (condition.marker == 'start_wp') {
       const letters = condition.letters.letters.text
-      conditions.push({ comparison: condition.comparison, letters })
-    } else if (condition.marker == 'wordComparison_wp') {
-      // with or not with that is the question
-      const letters = condition.letters.text
-      conditions.push({ comparison: condition.comparison, letters })
+      conditions.push({ comparison: 'prefix', letters })
     }
   } else {
     scope = context.element.quantity.quantity
@@ -125,61 +108,47 @@ template = {
     'setidsuffix _wp',
     'words are countable and statefulElements',
     'characters are countable',
-    'paragraphs are countable and statefulElement',
-    'text is a statefulElement',
+    'paragraphs are countable',
     'bold, italic, code, capitalize, lowercase and underline are styles',
     'underlined means underline',
     'capitalized means capitalize',
     'uppercase means capitalize',
     'italicize means italic',
     'italicized means italic',
-    // TODO have a mode where I can stay this is a definition sentence then just say style modifies and it will do it right
-    'capitalized, bolded, italicized and underlined are styleModifiers',
-    // 'start end and contain are wordComparisonWiths',
     // 'styles are negatable',
     "resetIdSuffix",
     {
       operators: [
+        // TODO write a parser for this so I can use statefulElement as the id
+        "(<thatVerb|that> (verb/0))",
         "([changeState_wp|make] ([statefulElement_wp]) ([stateValue_wp|]))",
         "((style_wp/*) [applyStyle_wp] ([statefulElement_wp|]))",
-        "((word_wp/*) [wordComparisonWith_wp] ([comparisonWith_wp|with] (a/0)? (letters)))",
-        "((word_wp/*) [wordComparison_wp] (a/0)? (letters))",
-        "((styleModifier_wp/*) [modifiedByStyle_wp] (statefulElement_wp/*))",
+        "((word_wp/*) [start_wp] ([startsWith_wp|with] (a/0)? (letters)))",
       ],
       bridges: [
         { 
-          id: 'modifiedByStyle_wp',
-          parents: ['adjective'],
-          convolution: true,
-          bridge: "{ ...after[0], style: before[0], target: after[0], generate: ['style', 'target'], conditions: append(after[0].conditions, [before[0]]) }",
+          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: [\"condition\"], condition: bridge }' } }",
+          /*
+          semantic: (args) => {
+            changeState({...args, element: args.context.element, state: args.context.state})
+          }
+          */
         },
         { 
-          id: 'wordComparisonWith_wp',
+          id: 'start_wp',
           parents: ['verb'],
-          words: [ 
-            { word: 'start', comparison: 'prefix' }, 
-            { word: 'starts', comparison: 'prefix', },
-            { word: 'end', comparison: 'suffix' },
-            { word: 'ends', comparison: 'suffix' },
-          ],
+          words: ['start', 'starts'],
           bridge: "{ ...next(operator), element: before[0], subject: before[0], letters: after[0], verb: operator, generate: ['element', 'verb', 'letters'] }",
+          /*
+          semantic: (args) => {
+            changeState({...args, element: args.context.element, state: args.context.state})
+          }
+          */
         },
         { 
-          id: 'wordComparison_wp',
-          parents: ['verb'],
-          words: [ 
-            { word: 'contain', comparison: 'include' }, 
-            { word: 'contains', comparison: 'include' },
-            { word: 'include', comparison: 'include' }, 
-            { word: 'includes', comparison: 'include' },
-          ],
-          optional: {
-            1: "{ marker: 'a' }",
-          },
-          bridge: "{ ...next(operator), element: before[0], subject: before[0], letters: after[1], verb: operator, generate: ['element', 'verb', 'letters'] }",
-        },
-        { 
-          id: 'comparisonWith_wp',
+          id: 'startsWith_wp',
           parents: ['preposition'],
           optional: {
             1: "{ marker: 'a' }",
@@ -241,7 +210,6 @@ template = {
       ],
       priorities: [
         { "context": [['changeState_wp',0], ['statefulElement_wp', 0], ['list', 0]], ordered: true, choose: [0] },
-        { "context": [['comparisonWith_wp',0], ['unknown', 0], ['list', 1]], ordered: true, choose: [0] },
       ],
     },
     // "([changeState_wp|make] ([statefulElement_wp]) ([stateValue_wp|]))",