tpmkms_4wp 9.1.1 → 9.2.0

package/common/helpers/concept.js

@@ -50,7 +50,11 @@ class API {
     const objectSingular = pluralize.singular(objectWord)
     const objectPlural = pluralize.plural(objectWord)
     // config.addOperator({ pattern: `(${modifierIds.map((modifierId) => `(${modifierId}/*)`).join(' ')} [${modifiersObjectId}] (${objectId}/0))`, allowDups: true })
-    config.addOperator({ pattern: `(${modifierIds.map((modifierId) => `(${modifierId}/*)`).join(' ')} [${modifiersObjectId}] (${objectId}/*))`, allowDups: true })
+    if (false) {
+      config.addOperator({ pattern: `(${modifierIds.map((modifierId) => `(${modifierId}/*)`).join(' ')} [${modifiersObjectId}] (${objectId}/*))`, allowDups: true })
+    } else {
+      config.addOperator({ pattern: `(${modifierIds.map((modifierId) => `(@==${modifierId})`).join(' ')} [${modifiersObjectId}] (@==${objectId}))`, allowDups: true })
+    }
     // config.addOperator({ pattern: `(<${modifierId}|> ([${objectId}|]))`, allowDups: true })
     // config.addOperator({ pattern: `([${modifierObjectId}|])`, allowDups: true })
 
@@ -91,7 +95,7 @@ class API {
     })
     // modifierds.forEach((modifierId) => config.addWord(modifierId, { id: modifierId, initial: `{ value: '${modifierId}' }`}))
 
-    modifierIds.forEach((modifierId) => config.addBridge({ id: modifierId, level: 0, bridge: `{ ...next(operator), value: '${modifierId}' }`,  allowDups: true }))
+    modifierIds.forEach((modifierId) => config.addBridge({ id: modifierId, level: 0, bridge: `{ ...next(operator), value: or(operator.value, '${modifierId}') }`,  allowDups: true }))
     config.addBridge({ id: objectId, level: 0, bridge: `{ ...next(operator), value: '${objectId}' }`,  allowDups: true })
     // config.addBridge({ id: modifierObjectId, level: 0, bridge: `{ ...next(operator), value: '${modifierObjectId}' }`, allowDups: true })
     const modifierProperties = modifierIds.map((modifierId, index) => `'modifier_${modifierId}': before[${index}]`).join(', ')

package/common/helpers/dialogues.js

@@ -102,7 +102,7 @@ class API {
     }
     // config.addOperator({ pattern: `(["${fixUps(concept)}"])`, allowDups: true })
     config.addOperator({ pattern: `(["${concept}"])`, allowDups: true })
-    config.addBridge({ id: concept, level: 0, bridge: `{ ...next(operator), value: '${source_value || concept}' }` , allowDups: true })
+    config.addBridge({ id: concept, level: 0, bridge: `{ ...next(operator), value: or(operator.value, '${source_value || concept}') }` , allowDups: true })
     const addConcept = (word, number) => {
       config.addWord(word, { id: concept, initial: `{ value: "${source_value || concept}", number: "${number}" }` } )
       const baseTypes = [

package/common/helpers/menus.js

@@ -0,0 +1,154 @@
+const calculateLefts = (defs) => {
+  const lefts = {}
+  calculateLeftsHelper(defs, lefts)
+  return lefts
+}
+
+const calculateLeftsHelper = (defs, lefts) => {
+  if (Array.isArray(defs)) {
+    let previous
+    for (const def of defs) {
+      if (previous) {
+        lefts[def.key] = previous.key
+        previous = def
+      } else {
+        previous = def
+      }
+    }
+  }
+  return lefts
+}
+
+const calculateRights = (defs) => {
+  const rights = {}
+  calculateRightsHelper(defs, rights)
+  return rights
+}
+
+const calculateRightsHelper = (defs, rights) => {
+  if (Array.isArray(defs)) {
+    let previous
+    for (const def of defs) {
+      if (previous) {
+        rights[previous.key] = def.key
+        previous = def
+      } else {
+        previous = def
+      }
+    }
+  }
+  return rights
+}
+
+const calculateDowns = (defs) => {
+  const downs = {}
+  calculateDownsHelper(defs, downs)
+  return downs
+}
+
+const calculateDownsHelper = (defs, downs) => {
+  if (Array.isArray(defs)) {
+    for (const def of defs) {
+      calculateDownsHelper(def, downs)
+    }
+  } else if (defs.children) {
+    if (defs.children.length > 0) {
+      downs[defs.key] = defs.children[0].key
+    }
+
+    let previous
+    for (const child of defs.children) {
+      if (child.divider) {
+        continue
+      }
+      if (previous) {
+        downs[previous.key] = child.key
+        previous = child
+      } else {
+        previous = child
+      }
+    }
+  }
+  return downs
+}
+
+const calculateUps = (defs) => {
+  const ups = {}
+  calculateUpsHelper(defs, ups)
+  return ups
+}
+
+const calculateUpsHelper = (defs, ups) => {
+  if (Array.isArray(defs)) {
+    for (const def of defs) {
+      calculateUpsHelper(def, ups)
+    }
+  } else if (defs.children) {
+    let previous
+    for (const child of defs.children) {
+      if (child.divider) {
+        continue
+      }
+      if (previous) {
+        ups[child.key] = previous.key
+        previous = child
+      } else {
+        previous = child
+      }
+    }
+  }
+  return ups
+}
+
+const calculateParents = (defs) => {
+  const parents = {}
+  calculateParentsHelper(defs, parents)
+  return parents
+}
+
+const calculateParentsHelper = (defs, parents) => {
+  if (Array.isArray(defs)) {
+    for (const def of defs) {
+      parents[def.key] = def.key
+      calculateParentsHelper(def, parents)
+    }
+  } else if (defs.children) {
+    for (const child of defs.children) {
+      if (child.divider) {
+        continue
+      }
+      parents[child.key] = defs.key
+    }
+  }
+  return parents
+}
+
+const calculatePaths = (defs) => {
+  const paths = {}
+  calculatePathsHelper(defs, paths)
+  return paths
+}
+
+const calculatePathsHelper = (defs, paths) => {
+  if (Array.isArray(defs)) {
+    for (const def of defs) {
+      calculatePathsHelper(def, paths)
+    }
+  } else {
+    paths[defs.key] = [defs.key]
+    for (const child of (defs.children || [])) {
+      paths[child.key] = [defs.key, child.key]
+    }
+  }
+  return paths
+}
+
+
+module.exports = {
+  calculateRights,
+  calculateLefts,
+  calculateDowns,
+  calculateUps,
+  calculateParents,
+  calculatePaths,
+}

package/common/helpers.js

@@ -1,5 +1,19 @@
 const pluralize = require('pluralize')
 
+const unshiftL = (list, element, max) => {
+  if (list.length >= max) {
+    list.pop()
+  }
+  list.unshift(element)
+}
+
+const pushL = (list, element, max) => {
+  if (list.length >= max) {
+    list.shift()
+  }
+  list.push(element)
+}
+
 // X pm today or tomorrow
 const millisecondsUntilHourOfDay = (newDate, hour) => {
   const now = newDate()
@@ -207,6 +221,8 @@ const getValue = (propertyPath, object) => {
 }
 
 module.exports = {
+  unshiftL,
+  pushL,
   getValue,
   defaultContextCheck,
   defaultContextCheckProperties,

package/common/kirk.instance.json

@@ -1567,6 +1567,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "kirk#call2"
           ]

package/common/length.instance.json

@@ -1174,6 +1174,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -2911,6 +2912,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -5250,6 +5252,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -6964,6 +6967,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -8679,6 +8683,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -10384,6 +10389,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -12099,6 +12105,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -13814,6 +13821,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -15518,6 +15526,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -17232,6 +17241,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -18946,6 +18956,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -20643,6 +20654,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -22289,6 +22301,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -23994,6 +24007,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]
@@ -25709,6 +25723,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "length#call2"
           ]

package/common/math.instance.json

@@ -914,6 +914,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "math#call2"
           ]