tpmkms_4wp 8.9.1-beta.9 → 9.0.0-beta.0

package/common/wp.js

@@ -9,26 +9,47 @@ const wp_tests = require('./wp.test.json')
 const instance = require('./wp.instance.json')
 
 /*
-  working on
+  done
+
     bold the first word
     bold the first paragraph 
     bold the first letter
-
-    current
-
-      underline the bolded paragraphs
-      underline the paragraphs that contain bolded words
-
-    after
     bold the first word of every paragraph
     bold the first word of the second and third paragraph
-    bold the first word of the second paragraph and third paragraph
-    bold the first letter of every word
-    bold the first letter of every word that starts with t
-    bold the first letter of the words that start with t in the third paragraph
     bold the paragraph that contains words that start with t
     underline the paragraph that contains bolded words
-    bold the paragraph that contains three bolded words
+    underline the paragraphs that contain bolded words
+    bold the first letter of every word
+    bold the third letter of the second paragraph
+    bold the first letter of every word that starts with t
+    underline the bolded words in the second paragraph
+    bold the words that start with t in the second paragraph
+    bold the first letter of the words that start with t in the second paragraph
+    in the second paragraph bold the first word
+    in the second paragraph bold the first letter of the words that start with t
+    underline the first bolded word
+    underline the first three words
+    in the first and second paragraph bold the second word
+    underline the first three bolded words
+    capitalize the first letter of the words that start with t
+
+  current
+ 
+    change is editable to is really editable 
+
+  todo
+
+    the first to fifth word
+    underline the last three words
+    for paragraph 1 and 2 bold the first word
+    in the second paragraph for the words that start with t bold the first letter
+    underline the bolded paragraphs
+    bold the first three words after the second bolded letter
+    underline the words that start with t in the paragraph with 3 bolded words
+    underline the paragraph that contains three bolded words
+    underline the first bolded word that start with t
+    bold the first word of the second paragraph and third paragraph
+    the paragraph that contains the word boobies
 
     after
     make the words that start with t blue
@@ -136,7 +157,12 @@ const changeState = ({api, isA, context, toArray, element, state}) => {
     let scope;
     const condition = []
     if (selector.ordinal) {
-      conditions.push({ ordinals: toArray(selector.ordinal).map((context) => context.value)})
+      // TODO think this out better but its just POC so good enough for now
+      const condition = { ordinals: toArray(selector.ordinal).map((context) => context.value) }
+      if (selector.quantity) {
+        condition.count = selector.quantity.value
+      }
+      conditions.push(condition)
     } else if (isA(selector, 'everything')) {
       scope = 'all'
     } else if (selector.quantity) {
@@ -147,7 +173,7 @@ const changeState = ({api, isA, context, toArray, element, state}) => {
 
     if (selector.conditions) {
       for (const condition of selector.conditions) {
-        if (condition.marker == 'wordComparisonWith_wp') {
+        if (condition.marker == 'wordComparisonWithVerb_wp') {
           // with or not with that is the question
           const letters = condition.letters.letters.text
           conditions.push({ comparison: condition.comparison, letters })
@@ -155,7 +181,7 @@ const changeState = ({api, isA, context, toArray, element, state}) => {
           // with or not with that is the question
           const letters = condition.letters.text
           conditions.push({ comparison: condition.comparison, letters })
-        } else if (condition.marker == 'paragraphComparison_wp') {
+        } else if (condition.marker == 'paragraphComparisonVerb_wp') {
           // with or not with that is the question
           const update = { selectors: [] }
           const words = getElement(condition.words, update)
@@ -205,31 +231,49 @@ template = {
     "resetIdSuffix",
     {
       operators: [
+        "([change_wp|change] (context.text !== 'to')* (context.text == 'to'))",
         "([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/*) [wordComparisonWithVerb_wp] ([comparisonWith_wp|with] (a/0)? (letters)))",
         "((word_wp/*) [wordComparison_wp] (a/0)? (letters))",
         // this one is "the bolded/underlined/italized/... word"
         "((styleModifier_wp/*) [modifiedByStyle_wp] (statefulElement_wp/* && context.determiner == undefined))",
         // the first letter of each paragraph 
-        "((statefulElement_wp/*) <statefulElementInContext_wp|of> (statefulElement_wp/*))",
+        "((statefulElement_wp/*)? <statefulElementInContext_wp|of,in> (statefulElement_wp/*))",
         // the paragraph that contains words that start with t
-        "((paragraph_wp/*) [paragraphComparison_wp] (word_wp/*))",
+        "((paragraph_wp/*) [paragraphComparisonVerb_wp] (word_wp/*))",
       ],
       associations: {
         negative: [
         ],
         positive: [
           // TODO remove these after crucible work done and fix the associator rules
-          [['paragraph_wp', 0], ['thatVerb', 0], ['paragraphComparison_wp', 0], ['word_wp', 0]],
-          [['paragraph_wp', 0], ['thatVerb', 0], ['paragraphComparison_wp', 0], ['styleModifier_wp', 0], ['word_wp', 0]],
-          [['word_wp', 0], ['thatVerb', 0], ['wordComparison_wp', 0]],
+          // [['style_wp', 0], ['statefulElement_wp', 0], ['statefulElementInContext_wp', 0], ['every', 0], ['statefulElement_wp', 0]],
+          { context: [['style_wp', 0], ['word_wp', 0], ['statefulElementInContext_wp', 0], ['paragraph_wp', 0]], choose: 0 },
+          { context: [['style_wp', 0], ['letter_wp', 0], ['statefulElementInContext_wp', 0], ['word_wp', 0]], choose: 0 },
+          { context: [['paragraph_wp', 0], ['thatVerb', 0], ['paragraphComparisonVerb_wp', 0], ['word_wp', 0]], choose: 0 },
+          { context: [['paragraph_wp', 0], ['thatVerb', 0], ['paragraphComparisonVerb_wp', 0], ['styleModifier_wp', 0], ['word_wp', 0]], choose: 0 },
+          { context: [['word_wp', 0], ['thatVerb', 0], ['wordComparison_wp', 0]], choose: 0 },
+
+          { context: [["article",0],["paragraph_wp",1],["thatVerb",0],["paragraphComparisonVerb_wp",0],["styleModifier_wp",0],["statefulElement_wp",0]], choose: 0 },
+          { context: [["article",0],["paragraph_wp",1],["thatVerb",0],["paragraphComparisonVerb_wp",0],["word_wp",0],["thatVerb",0],["wordComparisonWithVerb_wp",0],["comparisonWith_wp",0],["unknown",0]], choose: 0 },
+          { context: [["article",0],["paragraph_wp",1],["thatVerb",0],["paragraphComparisonVerb_wp",0],["styleModifier_wp",0],["statefulElement_wp",0]], choose: 0 },
+
+          { context: [["article",0],["word_wp",0],["thatVerb",0],["wordComparison_wp",0],["unknown",0]], choose: 0 },
+          { context: [["article",0],["word_wp",1],["thatVerb",0],["wordComparison_wp",0],["unknown",0]], choose: 0 },
+          { context: [["article",0],["word_wp",1],["thatVerb",0],["wordComparison_wp",0],["unknown",1]], choose: 0 },
+
+          { context: [["word_wp",1],["thatVerb",0],["wordComparison_wp",0],["unknown",0]], choose: 0 },
         ]
       },
 
       bridges: [
+        {
+          id: 'change_wp',
+          bridge: "{ ...next(operator), from: after[0][0], generate: [operator, 'from', after[1]] }",
+        },
         { 
-          id: 'paragraphComparison_wp',
+          id: 'paragraphComparisonVerb_wp',
           parents: ['verb'],
           words: [ 
             { word: 'contain', comparison: 'include' }, 
@@ -242,7 +286,36 @@ template = {
         { 
           id: 'statefulElementInContext_wp',
           parents: ['preposition'],
-          bridge: "{ ...before[0], context: append(before[0].context, [after[0]]), generate: [before[0], operator, after[0]] }",
+          optional: {
+            '-1': "{ ...operator, invisible: true }",
+          },
+          bridge: "{ ...next(before[0]), context: append(before[0].context, [after[0]]), generate: [before[0], operator, after[0]], modifiers: [] }",
+          semantic: (args) => {
+            const { context, contexts } = args
+            for (let i = context.context_index + 1; i < contexts.length; ++i) {
+              if (contexts[i].marker == 'applyStyle_wp') {
+                const element = contexts[i].element
+                if (!element.context) {
+                  element.context = []
+                }
+                element.context = element.context.concat(context.context)
+              }
+            }
+            console.log(JSON.stringify(Object.keys(args)))
+          },
+        },
+        { 
+          id: 'applyStyle_wp',
+          parents: ['verb'],
+          convolution: true,
+          bridge: "{ ...next(operator), element: after[0], state: before[0], operator: operator, generate: ['state', 'element'] }",
+          localHierarchy: [
+            ['thisitthat', 'statefulElement_wp'],
+            ['everything', 'statefulElement_wp'],
+          ],
+          semantic: (args) => {
+            changeState({...args, element: args.context.element, state: args.context.state})
+          }
         },
         { 
           id: 'modifiedByStyle_wp',
@@ -252,7 +325,7 @@ template = {
           bridge: "{ ...after[0], style: before[0], target: after[0], generate: ['style', 'target'], conditions: append(after[0].conditions, [before[0]]) }",
         },
         { 
-          id: 'wordComparisonWith_wp',
+          id: 'wordComparisonWithVerb_wp',
           parents: ['verb'],
           words: [ 
             { word: 'start', comparison: 'prefix' }, 
@@ -284,19 +357,6 @@ template = {
           },
           bridge: "{ ...next(operator), operator: operator, letters: after[1], generate: ['operator', 'letters'] }",
         },
-        { 
-          id: 'applyStyle_wp',
-          parents: ['verb'],
-          convolution: true,
-          bridge: "{ ...next(operator), element: after[0], state: before[0], operator: operator, generate: ['state', 'element'] }",
-          localHierarchy: [
-            ['thisitthat', 'statefulElement_wp'],
-            ['everything', 'statefulElement_wp'],
-          ],
-          semantic: (args) => {
-            changeState({...args, element: args.context.element, state: args.context.state})
-          }
-        },
         { 
           id: 'changeState_wp',
           parents: ['verb'],
@@ -338,6 +398,13 @@ template = {
         },
       ],
       priorities: [
+        { "context": [['ordinal', 1], ['list', 0], ['ordinal', 1], ['statefulElement_wp', 0]], ordered: true, choose: [1] },
+        { "context": [['word_wp', 1], ['wordComparisonWithVerb_wp', 0], ['comparisonWith_wp', 1], ['statefulElementInContext_wp', 0]], ordered: true, choose: [1] },
+        { "context": [['paragraphComparisonVerb_wp', 0], ['word_wp', 0], ['wordComparisonWithVerb_wp', 0]], ordered: true, choose: [2] },
+        { "context": [['statefulElementInContext_wp', 0], ['word_wp', 0], ['wordComparisonWithVerb_wp', 0]], ordered: true, choose: [2] },
+        { "context": [['statefulElementInContext_wp', 0], ['word_wp', 1], ['wordComparisonWithVerb_wp', 0], ['comparisonWith_wp', 1]], ordered: true, choose: [2,3] },
+        { "context": [['statefulElementInContext_wp', 0], ['comparisonWith_wp', 0]], choose: [1] },
+        { "context": [['paragraphComparisonVerb_wp', 0], ['wordComparisonWithVerb_wp', 0]], choose: [1] },
         { "context": [['ordinal',1], ['list', 0], ['ordinal', 1], ['word_wp', 1]], ordered: true, choose: [1] },
         { "context": [['changeState_wp',0], ['every', 0], ['word_wp', 1], ['list', 1]], ordered: true, choose: [1] },
         { "context": [['changeState_wp',0], ['statefulElement_wp', 0], ['list', 0]], ordered: true, choose: [0] },