tpmkms_4wp 8.9.1-beta.2 → 8.9.1-beta.4

package/common/wp.js

@@ -9,6 +9,18 @@ const wp_tests = require('./wp.test.json')
 const instance = require('./wp.instance.json')
 
 /*
+  working on
+    bold the first word
+    bold the first paragraph 
+    bold the first letter
+
+    after
+    bold the first word of every paragraph
+    bold the first letter of every word
+
+    after
+    make the words that start with t blue
+
   the bolded words that start with t
 
   start inserting text until I say banana
@@ -17,7 +29,9 @@ const instance = require('./wp.instance.json')
   stop inserting text
 
   make the text of the 1st to 3rd paragraphs blue
-
+  
+  capitalize the words banana and word
+  capitalize banana and tree
 
   make the words that start with a bold
 
@@ -40,6 +54,8 @@ const instance = require('./wp.instance.json')
   words containing a
   every 5th word
 
+  the words that are capitalized 
+
   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
@@ -99,22 +115,33 @@ const changeState = ({api, isA, context, toArray, element, state}) => {
   let unit = root(context.element.marker)
   let scope
   let conditions = []
-  if (isA(context.element, 'everything')) {
+
+  if (context.element.ordinal) {
+    conditions.push({ ordinals: toArray(context.element.ordinal).map((context) => context.value)})
+  } else 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
-      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 })
-    }
-  } else {
+  } else if (context.element.quantity) {
     scope = context.element.quantity.quantity
   }
+
+  if (context.element.conditions) {
+    for (const condition of context.element.conditions) {
+      if (condition.marker == 'wordComparisonWith_wp') {
+        // with or not with that is the question
+        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 })
+      } else if (isA(condition, 'styleModifier_wp')) {
+        for (const style of toArray(condition)) {
+          conditions.push({ hasStyle: style.marker })
+        }
+      }
+    }
+  }
+
   const update = { unit, scope, conditions }
   setUpdate(isA, update, toArray(context.state))
   api.changeState(update)
@@ -123,10 +150,11 @@ const changeState = ({api, isA, context, toArray, element, state}) => {
 template = {
   configs: [
     'setidsuffix _wp',
-    'words are countable and statefulElements',
-    'characters are countable',
-    'paragraphs are countable and statefulElement',
+    'words are countable orderable and statefulElements',
+    'characters are countable orderable and statefulElements',
+    'paragraphs are countable orderable and statefulElement',
     'text is a statefulElement',
+    'letters means characters',
     'bold, italic, code, capitalize, lowercase and underline are styles',
     'underlined means underline',
     'capitalized means capitalize',
@@ -134,7 +162,7 @@ template = {
     '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',
+    'uppercased, lowercased, capitalized, bolded, italicized and underlined are styleModifiers',
     // 'start end and contain are wordComparisonWiths',
     // 'styles are negatable',
     "resetIdSuffix",
@@ -144,11 +172,13 @@ template = {
         "((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/*))",
+        // this one is "the bolded/underlined/italized/... word"
+        "((styleModifier_wp/*) [modifiedByStyle_wp] (statefulElement_wp/* && context.determiner == undefined))",
       ],
       bridges: [
         { 
           id: 'modifiedByStyle_wp',
+          // parents: ['verb'],
           parents: ['adjective'],
           convolution: true,
           bridge: "{ ...after[0], style: before[0], target: after[0], generate: ['style', 'target'], conditions: append(after[0].conditions, [before[0]]) }",
@@ -240,6 +270,7 @@ template = {
         },
       ],
       priorities: [
+        // { "context": [['underline_wp',0], ['statefulElement_wp', 1], ['thatVerb', 0]], ordered: true, choose: [2] },
         { "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] },
       ],