tpmkms_4wp 8.9.1-beta.1 → 8.9.1

package/common/wp.instance.json

@@ -13,49 +13,24 @@
     "resetIdSuffix",
     {
       "operators": [
+        "(<thatVerb|that> (verb/0))",
         "([changeState_wp|make] ([statefulElement_wp]) ([stateValue_wp|]))",
         "((style_wp/*) [applyStyle_wp] ([statefulElement_wp|]))",
-        "((word_wp/*) [wordComparison_wp] ([startsWith_wp|with] (a/0)? (letters)))"
+        "((word_wp/*) [start_wp] ([startsWith_wp|with] (a/0)? (letters)))"
       ],
       "bridges": [
         {
-          "id": "wordComparison_wp",
+          "id": "thatVerb",
+          "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 }' } }"
+        },
+        {
+          "id": "start_wp",
           "parents": [
             "verb"
           ],
           "words": [
-            {
-              "word": "start",
-              "comparison": "prefix"
-            },
-            {
-              "word": "starts",
-              "comparison": "prefix"
-            },
-            {
-              "word": "end",
-              "comparison": "suffix"
-            },
-            {
-              "word": "ends",
-              "comparison": "suffix"
-            },
-            {
-              "word": "contain",
-              "comparison": "include"
-            },
-            {
-              "word": "contains",
-              "comparison": "include"
-            },
-            {
-              "word": "include",
-              "comparison": "include"
-            },
-            {
-              "word": "includes",
-              "comparison": "include"
-            }
+            "start",
+            "starts"
           ],
           "bridge": "{ ...next(operator), element: before[0], subject: before[0], letters: after[0], verb: operator, generate: ['element', 'verb', 'letters'] }"
         },
@@ -144,26 +119,6 @@
           "choose": [
             0
           ]
-        },
-        {
-          "context": [
-            [
-              "startsWith_wp",
-              0
-            ],
-            [
-              "unknown",
-              0
-            ],
-            [
-              "list",
-              1
-            ]
-          ],
-          "ordered": true,
-          "choose": [
-            0
-          ]
         }
       ]
     }
@@ -12823,6 +12778,20 @@
             1
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            1
+          ]
+        ],
         [
           [
             "is",
@@ -29446,49 +29415,24 @@
     {
       "extraConfig": true,
       "operators": [
+        "(<thatVerb|that> (verb/0))",
         "([changeState_wp|make] ([statefulElement_wp]) ([stateValue_wp|]))",
         "((style_wp/*) [applyStyle_wp] ([statefulElement_wp|]))",
-        "((word_wp/*) [wordComparison_wp] ([startsWith_wp|with] (a/0)? (letters)))"
+        "((word_wp/*) [start_wp] ([startsWith_wp|with] (a/0)? (letters)))"
       ],
       "bridges": [
         {
-          "id": "wordComparison_wp",
+          "id": "thatVerb",
+          "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 }' } }"
+        },
+        {
+          "id": "start_wp",
           "parents": [
             "verb"
           ],
           "words": [
-            {
-              "word": "start",
-              "comparison": "prefix"
-            },
-            {
-              "word": "starts",
-              "comparison": "prefix"
-            },
-            {
-              "word": "end",
-              "comparison": "suffix"
-            },
-            {
-              "word": "ends",
-              "comparison": "suffix"
-            },
-            {
-              "word": "contain",
-              "comparison": "include"
-            },
-            {
-              "word": "contains",
-              "comparison": "include"
-            },
-            {
-              "word": "include",
-              "comparison": "include"
-            },
-            {
-              "word": "includes",
-              "comparison": "include"
-            }
+            "start",
+            "starts"
           ],
           "bridge": "{ ...next(operator), element: before[0], subject: before[0], letters: after[0], verb: operator, generate: ['element', 'verb', 'letters'] }"
         },
@@ -29547,10 +29491,10 @@
       ],
       "semantics": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/wp.js:184"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/wp.js:179"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/wp.js:193"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/wp.js:188"
         }
       ],
       "priorities": [
@@ -29573,26 +29517,6 @@
           "choose": [
             0
           ]
-        },
-        {
-          "context": [
-            [
-              "startsWith_wp",
-              0
-            ],
-            [
-              "unknown",
-              0
-            ],
-            [
-              "list",
-              1
-            ]
-          ],
-          "ordered": true,
-          "choose": [
-            0
-          ]
         }
       ]
     }
@@ -29888,6 +29812,20 @@
         1
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        1
+      ]
+    ],
     [
       [
         "is",

package/common/wp.js

@@ -37,7 +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
 */
 
 class API {
@@ -92,14 +91,9 @@ const changeState = ({api, isA, context, toArray, element, state}) => {
     scope = 'all'
   } else if (context.element.condition) {
     const condition = context.element.condition
-    if (condition.marker == 'wordComparisonWith_wp') {
-      // with or not with that is the question
+    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
@@ -121,44 +115,40 @@ template = {
     'uppercase means capitalize',
     'italicize means italic',
     'italicized means italic',
-    // '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))",
+        "((word_wp/*) [start_wp] ([startsWith_wp|with] (a/0)? (letters)))",
       ],
       bridges: [
         { 
-          id: 'wordComparisonWith_wp',
-          parents: ['verb'],
-          words: [ 
-            { word: 'start', comparison: 'prefix' }, 
-            { word: 'starts', comparison: 'prefix', },
-            { word: 'end', comparison: 'suffix' },
-            { word: 'ends', comparison: 'suffix' },
-          ],
-          bridge: "{ ...next(operator), element: before[0], subject: before[0], letters: after[0], verb: operator, generate: ['element', 'verb', 'letters'] }",
+          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: 'wordComparison_wp',
+          id: 'start_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'] }",
+          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: 'comparisonWith_wp',
+          id: 'startsWith_wp',
           parents: ['preposition'],
           optional: {
             1: "{ marker: 'a' }",
@@ -220,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|]))",