tpmkms_4wp 8.9.1-beta.4 → 8.9.1-beta.41

package/common/wp.js

@@ -9,20 +9,57 @@ 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
-
-    after
     bold the first word of every paragraph
+    bold the first word of the second and third paragraph
+    bold the paragraph that contains words that start with t
+    underline the paragraph that contains 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
 
   the bolded words that start with t
 
+  replace better with worse
+
+  change underlines to bolds
+
   start inserting text until I say banana
   ...
   or 
@@ -90,7 +127,7 @@ const setUpdate = (isA, update, states) => {
       if (!update.styles) {
         update.styles = []
       }
-      let style = root(state.value)
+      const style = root(state.value)
       /*
       if (style == 'underlined') {
         style = 'underline'
@@ -107,42 +144,68 @@ const setUpdate = (isA, update, states) => {
 
 const api = new API()
 
-let config = {
+const config = {
   name: 'wp',
 };
 
 const changeState = ({api, isA, context, toArray, element, state}) => {
-  let unit = root(context.element.marker)
   let scope
-  let conditions = []
-
-  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.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 getElement = (selector, update) => {
+    const unit = root(selector.marker)
+    const conditions = []
+    let scope;
+    const condition = []
+    if (selector.ordinal) {
+      // 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) {
+      scope = selector.quantity.quantity
+    } if (selector.distributer) {
+      scope = selector.distributer.value
+    }
+
+    if (selector.conditions) {
+      for (const condition of selector.conditions) {
+        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 })
+        } 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 (condition.marker == 'paragraphComparisonVerb_wp') {
+          // with or not with that is the question
+          const update = { selectors: [] }
+          const words = getElement(condition.words, update)
+          conditions.push({ comparison: condition.comparison, words: update})
+        } else if (isA(condition, 'styleModifier_wp')) {
+          for (const style of toArray(condition)) {
+            conditions.push({ hasStyle: style.marker })
+          }
         }
       }
     }
+
+    if (selector.context) {
+      for (const context of toArray(selector.context)) {
+        getElement(context, update)
+      }
+    }
+
+    update.selectors.push({ unit, scope, conditions })
   }
 
-  const update = { unit, scope, conditions }
+  const update = { selectors: [] }
+  getElement(context.element, update)
+
   setUpdate(isA, update, toArray(context.state))
   api.changeState(update)
 }
@@ -150,9 +213,9 @@ const changeState = ({api, isA, context, toArray, element, state}) => {
 template = {
   configs: [
     'setidsuffix _wp',
-    'words are countable orderable and statefulElements',
-    'characters are countable orderable and statefulElements',
-    'paragraphs are countable orderable and statefulElement',
+    'words are countable distributable orderable textContainers and statefulElements',
+    'characters are countable distributable orderable and statefulElements',
+    'paragraphs are countable distributable orderable textContainers and statefulElement',
     'text is a statefulElement',
     'letters means characters',
     'bold, italic, code, capitalize, lowercase and underline are styles',
@@ -168,14 +231,88 @@ 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,in> (statefulElement_wp/*))",
+        // the paragraph that contains words that start with t
+        "((paragraph_wp/*) [paragraphComparisonVerb_wp] (word_wp/*))",
       ],
+      associations: {
+        negative: [
+        ],
+        positive: [
+          // TODO remove these after crucible work done and fix the associator rules
+          // [['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: [["style_wp",1],["article",0],["statefulElement_wp",1],["thatVerb",0],["paragraphComparisonVerb_wp",0],["styleModifier_wp",0],["statefulElement_wp",0]], choose: 0 },
+          { context: [["style_wp",1],["article",0],["statefulElement_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],["statefulElement_wp",1],["thatVerb",0],["paragraphComparisonVerb_wp",0],["styleModifier_wp",0],["statefulElement_wp",0]], choose: 0 },
+
+          { context: [["style_wp",1],["article",0],["statefulElement_wp",1],["thatVerb",0],["wordComparison_wp",0],["unknown",0]], choose: 0 },
+          { context: [["style_wp",1],["statefulElement_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: 'paragraphComparisonVerb_wp',
+          parents: ['verb'],
+          words: [ 
+            { word: 'contain', comparison: 'include' }, 
+            { word: 'contains', comparison: 'include' },
+            { word: 'include', comparison: 'include' }, 
+            { word: 'includes', comparison: 'include' },
+          ],
+          bridge: "{ ...next(operator), element: before[0], subject: before[0], words: after[0], verb: operator, generate: ['element', 'verb', 'words'] }",
+        },
+        { 
+          id: 'statefulElementInContext_wp',
+          parents: ['preposition'],
+          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',
           // parents: ['verb'],
@@ -184,7 +321,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' }, 
@@ -216,19 +353,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'],
@@ -270,7 +394,15 @@ template = {
         },
       ],
       priorities: [
-        // { "context": [['underline_wp',0], ['statefulElement_wp', 1], ['thatVerb', 0]], ordered: true, choose: [2] },
+        { "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] },
         { "context": [['comparisonWith_wp',0], ['unknown', 0], ['list', 1]], ordered: true, choose: [0] },
       ],
@@ -293,7 +425,7 @@ knowledgeModule({
     contents: wp_tests,
     checks: {
       context: [
-        ...defaultContextCheck(), 
+        ...defaultContextCheck(['distributer', 'subject', 'element', 'letters', 'target', 'conditions' ]), 
       ],
       objects: [
         'changeState',