tpmkms_4wp 8.9.0-beta.11 → 8.9.0-beta.13

package/common/helpers/conjunction.js

@@ -0,0 +1,75 @@
+const { propertyToArray } = require('../helpers.js')
+
+const asList = (context) => {
+  if (context.marker === 'list') {
+    return context
+  }
+  return {
+    marker: 'list',
+    types: [context.marker],
+    value: [context]
+  }
+}
+
+const listable = (hierarchy) => (c, type) => {
+  if (!c) {
+    return false
+  }
+  if (hierarchy.isA(c.marker, type)) {
+    return true
+  }
+  if (c.marker === 'list') {
+    for (const t of c.types) {
+      if (hierarchy.isA(t, type)) {
+        return true
+      }
+    }
+  }
+  return false
+}
+
+const isA = (hierarchy) => (child, parent, { strict=false } = {}) => {
+  if (!child || !parent) {
+    return false
+  }
+
+  if (strict) {
+    if (child.marker) {
+      child = child.marker
+    }
+    if (parent.marker) {
+      parent = parent.marker
+    }
+    return hierarchy.isA(child, parent)
+  } else {
+    const children = propertyToArray(child)
+    for (let child of children) {
+      let okay = false
+      if (hierarchy.isA(child.marker || child, parent.marker || parent)) {
+        okay = true
+      } else {
+        for (const childT of child.types || [child]) {
+          if (okay) {
+            break
+          }
+          for (const parentT of parent.types || [parent]) {
+            if (hierarchy.isA(childT, parentT)) {
+              okay = true
+              break
+            }
+          }
+        }
+      }
+      if (!okay) {
+        return false
+      }
+    }
+    return true
+  }
+}
+
+module.exports = {
+  asList,
+  isA,
+  listable,
+}

package/common/wp.js

@@ -58,7 +58,10 @@ template = {
             ['thisitthat', 'statefulElement'],
           ],
           semantic: ({api, isA, context, toArray}) => {
-            const unit = context.element.marker
+            const root = (id) => {
+              return id.split('_')[0]
+            }
+            const unit = root(context.element.marker)
             const scope = context.element.quantity.quantity
             let color;
             const styles = []
@@ -68,9 +71,9 @@ template = {
                 if (!update.styles) {
                   update.styles = []
                 }
-                update.styles.push(state.value.split('_')[0])
+                update.styles.push(root(state.value))
               } else {
-                update.color = state.value.split('_')[0]
+                update.color = root(state.value)
               }
             }
             api.changeState(update)

package/common/wp.test.json

@@ -7647,7 +7647,7 @@
           "changeState": {
             "color": "blue",
             "scope": "every",
-            "unit": "word_wp"
+            "unit": "word"
           }
         }
       },
@@ -8276,7 +8276,6 @@
         "word": "make"
       }
     ],
-    "developerTest": false,
     "generatedParenthesized": [
       ""
     ],
@@ -8868,7 +8867,7 @@
             "styles": [
               "bold"
             ],
-            "unit": "word_wp"
+            "unit": "word"
           }
         }
       },
@@ -9573,7 +9572,6 @@
         "word": "make"
       }
     ],
-    "developerTest": false,
     "generatedParenthesized": [
       ""
     ],
@@ -10219,7 +10217,7 @@
               "bold",
               "underlined"
             ],
-            "unit": "word_wp"
+            "unit": "word"
           }
         }
       },
@@ -10952,7 +10950,6 @@
         "word": "make"
       }
     ],
-    "developerTest": false,
     "generatedParenthesized": [
       ""
     ],
@@ -11598,7 +11595,7 @@
             "styles": [
               "bold"
             ],
-            "unit": "word_wp"
+            "unit": "word"
           }
         }
       },
@@ -12374,7 +12371,6 @@
         "word": "make"
       }
     ],
-    "developerTest": false,
     "generatedParenthesized": [
       ""
     ],
@@ -13079,7 +13075,7 @@
               "bold",
               "underlined"
             ],
-            "unit": "word_wp"
+            "unit": "word"
           }
         }
       },

package/package.json

@@ -196,6 +196,7 @@
     "common/help.test.json",
     "common/helpers.js",
     "common/helpers/concept.js",
+    "common/helpers/conjunction.js",
     "common/helpers/dialogues.js",
     "common/helpers/formulas.js",
     "common/helpers/frankenhash.js",
@@ -314,8 +315,8 @@
     "table": "^6.7.1",
     "base-64": "^1.0.0",
     "argparse": "^2.0.1",
-    "theprogrammablemind_4wp": "8.9.0-beta.11"
+    "theprogrammablemind_4wp": "8.9.0-beta.13"
   },
-  "version": "8.9.0-beta.11",
+  "version": "8.9.0-beta.13",
   "license": "UNLICENSED"
 }