tpmkms_4wp 9.5.1-beta.2 → 9.5.1-beta.21

package/common/helpers.js

@@ -1,13 +1,14 @@
 const pluralize = require('pluralize')
+const { flatten } = require('./runtime').theprogrammablemind
 
-const unshiftL = (list, element, max) => {
+function unshiftL(list, element, max) {
   if (list.length >= max) {
     list.pop()
   }
   list.unshift(element)
 }
 
-const pushL = (list, element, max) => {
+function pushL(list, element, max) {
   if (list.length >= max) {
     list.shift()
   }
@@ -15,11 +16,11 @@ const pushL = (list, element, max) => {
 }
 
 // X pm today or tomorrow
-const millisecondsUntilHourOfDay = (newDate, hour) => {
+function millisecondsUntilHourOfDay(newDate, hour) {
   const now = newDate()
   const target = newDate(now)
 
-  const addHours = (date, h) => {
+  function addHours(date, h) {
     date.setTime(date.getTime() + (h*60*60*1000));
   }
   const hours = target.getHours()
@@ -34,11 +35,11 @@ const millisecondsUntilHourOfDay = (newDate, hour) => {
   return diff;
 }
 
-const indent = (string, indent) => {
+function indent(string, indent) {
   return string.replace(/^/gm, ' '.repeat(indent));
 }
 
-const getCount = (context) => {
+function getCount(context) {
   if (context.quantity) {
     return context.quantity.value
   }
@@ -47,13 +48,23 @@ const getCount = (context) => {
   }
 }
 
-const words = (word, additional = {}) => {
+function words(word, additional = {}) {
   return [{ word: pluralize.singular(word), number: 'one', ...additional }, { word: pluralize.plural(word), number: 'many', ...additional }]
 }
 
-const isMany = (context) => {
-  if (((context || {}).value || {}).marker == 'list' && (((context || {}).value || {}).value || []).length > 1) {
-    return true
+function isMany(context) {
+  if (!context) {
+    return
+  }
+  // if (((context || {}).value || {}).marker == 'list' && (((context || {}).value || {}).value || []).length > 1) {
+  const isList = context.marker == 'list' || context.value?.marker == 'list'
+  if (isList) {
+    if (context.value?.length > 1) {
+      return true
+    }
+    if (context.value?.value?.length > 1) {
+      return true
+    }
   }
 
   let number = context.number
@@ -77,13 +88,13 @@ const isMany = (context) => {
   return false
 }
 
-const requiredArgument = (value, name) => {
+function requiredArgument(value, name) {
   if (!value) {
     throw new Error(`${name} is a required argument`)
   }
 }
 
-const chooseNumber = (context, one, many) => {
+function chooseNumber(context, one, many) {
   if (isMany(context)) {
     return many;
   } else {
@@ -91,7 +102,7 @@ const chooseNumber = (context, one, many) => {
   }
 }
 
-const zip = (...arrays) => {
+function zip(...arrays) {
   if (arrays == []) {
     return []
   }
@@ -107,15 +118,21 @@ const zip = (...arrays) => {
 }
 
 
-const focus = (context) => {
-  const helper = (context) => {
+function focus(context) {
+  function helper(context) {
     if (!context || !context.focusable) {
       return null
     }
     for (const property of context.focusable) {
       let focus = helper(context[property])
-      if (!focus && (context[property] || {}).focus) {
-        focus = context[property]
+      if (!focus) {
+        const flat = flatten(['list'], context[property])[0]
+        for (const element of flat) {
+          if (element.focus) {
+            focus = context[property]
+            break
+          }
+        }
       }
       return focus
     }
@@ -126,7 +143,7 @@ const focus = (context) => {
 
 // if property is a list make array of elements of the list, if not return an array with the property value
 // fromList
-const propertyToArray = (value) => {
+function propertyToArray(value) {
   if (Array.isArray(value)) {
     return value
   } else if (value.marker == 'list') {
@@ -136,7 +153,23 @@ const propertyToArray = (value) => {
   }
 }
 
-wordNumber = (word, toPlural) => {
+// values is marker: 'list' or some context
+function concats(values) {
+  combined = []
+  for (const value of values) {
+    if (value.marker == 'list') {
+      combined = combined.concat(value.value)
+    } else {
+      combined.push(value)
+    }
+  }
+  return {
+    marker: 'list',
+    value: combined
+  }
+}
+
+function wordNumber(word, toPlural) {
   if (toPlural) {
     return pluralize.plural(word)
   } else {
@@ -144,14 +177,14 @@ wordNumber = (word, toPlural) => {
   }
 }
 
-const toEValue = (context) => {
+function toEValue(context) {
   while( context.evalue ) {
     context = context.evalue
   }
 	return context;
 }
 
-const defaultObjectCheck = (extra = []) => {
+function defaultObjectCheck(extra = []) {
   return {
     objects: [
       {
@@ -162,11 +195,11 @@ const defaultObjectCheck = (extra = []) => {
   }
 }
 
-const defaultContextCheckProperties = (extra) => {
+function defaultContextCheckProperties(extra) {
   return ['marker', 'text', 'verbatim', 'value', 'evalue', 'isResponse', { properties: 'modifiers' }, { properties: 'postModifiers' }, ...extra]
 }
 
-const defaultContextCheck = ({marker, extra = [], exported = false} = {}) => {
+function defaultContextCheck({marker, extra = [], exported = false} = {}) {
   let match
   if (marker) {
     match = ({context}) => context.marker == marker
@@ -180,35 +213,37 @@ const defaultContextCheck = ({marker, extra = [], exported = 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 {
-    if (hierarchy.isA(child.marker || child, parent.marker || parent)) {
-      return true
+function isA(hierarchy) {
+  return (child, parent, { strict=false } = {}) => {
+    if (!child || !parent) {
+      return false
     }
-    for (const childT of child.types || [child]) {
-      for (const parentT of parent.types || [parent]) {
-        if (hierarchy.isA(childT, parentT)) {
-          return true
+
+    if (strict) {
+      if (child.marker) {
+        child = child.marker
+      }
+      if (parent.marker) {
+        parent = parent.marker
+      }
+      return hierarchy.isA(child, parent)
+    } else {
+      if (hierarchy.isA(child.marker || child, parent.marker || parent)) {
+        return true
+      }
+      for (const childT of child.types || [child]) {
+        for (const parentT of parent.types || [parent]) {
+          if (hierarchy.isA(childT, parentT)) {
+            return true
+          }
         }
       }
+      return false
     }
-    return false
   }
 }
 
-const getValue = (propertyPath, object) => {
+function getValue(propertyPath, object) {
   if (!propertyPath) {
     return
   }
@@ -223,7 +258,7 @@ const getValue = (propertyPath, object) => {
   return value
 }
 
-const processTemplateString = async (template, evaluate) => {
+async function processTemplateString(template, evaluate) {
   async function resolveWithCallback(strings, ...keys) {
     // const resolvedValues = await Promise.all(keys.map(key => lookupVariable(key)));
     const resolvedValues = await Promise.all(keys.map(async (key) => {
@@ -337,4 +372,5 @@ module.exports = {
   requiredArgument,
   isA,
   removeProp,
+  concats
 }

package/common/hierarchy.js

@@ -6,11 +6,11 @@ const pluralize = require('pluralize')
 const _ = require('lodash')
 const { isMany } = require('./helpers')
 
-const getTypes = ( km, concept, instance ) => {
+function getTypes( km, concept, instance ) {
   const propertiesAPI = km('properties').api;
   const conceptAPI = km('concept').api;
   const digraph = propertiesAPI.digraph;
-  const intersect = (set1, set2) => {
+  function intersect(set1, set2) {
     return new Set([...set1].filter(x => set2.has(x)))
   }
   const descendants = digraph.descendants(concept.value)
@@ -256,6 +256,7 @@ const config = {
             oneConceptId = await api.makeObject({...args, context: oneConcept})
             twoConceptId = await api.makeObject({...args, context: twoConcept})
             api.rememberIsA(oneConceptId, twoConceptId)
+            api.seenHierarchyWatcher({ childId: oneConceptId, child: oneConcept, parentId: twoConceptId, parent: twoConcept })
             context.sameWasProcessed = true
           }
         }
@@ -286,7 +287,7 @@ const config = {
   ]
 };
 
-const initializer = ({apis, hierarchy}) => {
+function initializer({apis, hierarchy}) {
     apis('stm').addIsA( (child, parent) => {
       return hierarchy.isA(child, parent) 
     })

package/common/kirk.instance.json

@@ -1666,7 +1666,7 @@
             "dead": true,
             "range": {
               "start": 0,
-              "end": 11
+              "end": 2
             },
             "types": [
               "self"

package/common/latin.instance.json

@@ -70,7 +70,7 @@
               "person": "third"
             }
           ],
-          "bridge": "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, operator] }",
+          "bridge": "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, { context: operator }] }",
           "selector": {
             "arguments": {
               "nominative": "(context.declension == 'nominative' && context.number == operator.number)",
@@ -83,7 +83,7 @@
         {
           "id": "dare",
           "level": 0,
-          "bridge": "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, operator] }",
+          "bridge": "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, { context: operator }] }",
           "selector": {
             "arguments": {
               "nominative": "(context.declension == 'nominative' && context.number == operator.number)",
@@ -159,7 +159,7 @@
         },
         {
           "id": "queryMarker",
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], question: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], question: true }",
           "separators": "|",
           "before": [
             "hierarchy"
@@ -173,7 +173,7 @@
               "listable"
             ]
           ],
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], isList: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], isList: true }",
           "separators": "|"
         },
         {
@@ -187,7 +187,7 @@
               "hierarchiable"
             ]
           ],
-          "bridge": "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: all }",
+          "bridge": "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: map(all, { context: element }) }",
           "words": [
             {
               "word": "sum",
@@ -305,7 +305,7 @@
               "person": "third"
             }
           ],
-          "bridge": "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, operator] }",
+          "bridge": "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, { context: operator }] }",
           "selector": {
             "arguments": {
               "nominative": "(context.declension == 'nominative' && context.number == operator.number)",
@@ -318,7 +318,7 @@
         {
           "id": "dare",
           "level": 0,
-          "bridge": "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, operator] }",
+          "bridge": "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, { context: operator }] }",
           "selector": {
             "arguments": {
               "nominative": "(context.declension == 'nominative' && context.number == operator.number)",
@@ -394,7 +394,7 @@
         },
         {
           "id": "queryMarker",
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], question: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], question: true }",
           "separators": "|",
           "before": [
             "hierarchy"
@@ -408,7 +408,7 @@
               "listable"
             ]
           ],
-          "bridge": "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], isList: true }",
+          "bridge": "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], isList: true }",
           "separators": "|"
         },
         {
@@ -422,7 +422,7 @@
               "hierarchiable"
             ]
           ],
-          "bridge": "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: all }",
+          "bridge": "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: map(all, { context: element }) }",
           "words": [
             {
               "word": "sum",

package/common/latin.js

@@ -56,7 +56,7 @@ const config = {
       words: [
         ...conjugateVerb('iacere'),
       ],
-      bridge: "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, operator] }",
+      bridge: "{ ...next(operator), thrower: nominative?, receiver: dative?, object: object?, location: location?, interpolate: [{ property: 'thrower' }, { property: 'receiver' }, { property: 'location' }, { property: 'object' }, { context: operator }] }",
       selector: {
         arguments: {
           nominative: "(context.declension == 'nominative' && context.number == operator.number)",
@@ -69,7 +69,7 @@ const config = {
     {
       id: "dare",
       level: 0,
-      bridge: "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, operator] }",
+      bridge: "{ ...next(operator), giver: nominative?, receiver: dative?, object: accusative?, interpolate: [{ property: 'giver' }, { property: 'receiver' }, { property: 'object' }, { context: operator }] }",
       selector: {
         arguments: {
           nominative: "(context.declension == 'nominative' && context.number == operator.number)",
@@ -105,21 +105,21 @@ const config = {
 
     { 
       id: "queryMarker",
-      bridge: "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], question: true }",
+      bridge: "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], question: true }",
       separators: '|',
       before: ['hierarchy'],
     },
     { 
       id: "listMarker",
       localHierarchy: [['unknown', 'listable']],
-      bridge: "{ ...before[0], verb: before[0], interpolate: [before[0], '', operator], isList: true }",
+      bridge: "{ ...before[0], verb: before[0], interpolate: [{ context: before[0] }, '', { context: operator }], isList: true }",
       separators: '|',
     },
     { id: "hierarchiable" },
     { 
       id: "hierarchy",
       localHierarchy: [['unknown', 'hierarchiable']],
-      bridge:  "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: all }",
+      bridge:  "{ ...next(operator), child: arguments[0], parent: arguments[1], question: less_than(indexes.operator, indexes.arguments[0]), interpolate: map(all, { context: element }) }",
       words: [
         { word: 'sum', number: 'singular', person: 'first' },
         { word: 'es', number: 'singular', person: 'second' },

package/common/length.instance.json

@@ -1123,7 +1123,7 @@
             "word": "length",
             "range": {
               "start": 0,
-              "end": 20
+              "end": 5
             },
             "dead": true,
             "types": [
@@ -2756,7 +2756,7 @@
             "text": "meter centimeter foot and inch",
             "range": {
               "start": 0,
-              "end": 49
+              "end": 29
             },
             "types": [
               "list",
@@ -5173,6 +5173,7 @@
             "value": "meter",
             "number": "many",
             "text": "meters",
+            "dimension": "length",
             "marker": "meter",
             "word": "meters",
             "range": {
@@ -5203,6 +5204,7 @@
               "value": "centimeter",
               "number": "many",
               "text": "centimeters",
+              "dimension": "length",
               "marker": "centimeter",
               "word": "centimeters",
               "range": {
@@ -6870,6 +6872,7 @@
             "value": "centimeter",
             "number": "many",
             "text": "centimeters",
+            "dimension": "length",
             "marker": "centimeter",
             "word": "centimeters",
             "range": {
@@ -6900,6 +6903,7 @@
               "value": "meter",
               "number": "many",
               "text": "meters",
+              "dimension": "length",
               "marker": "meter",
               "word": "meters",
               "range": {
@@ -8567,6 +8571,7 @@
             "value": "centimeter",
             "number": "many",
             "text": "centimeters",
+            "dimension": "length",
             "marker": "centimeter",
             "word": "centimeters",
             "range": {
@@ -10296,6 +10301,7 @@
               "value": "centimeter",
               "number": "many",
               "text": "centimeters",
+              "dimension": "length",
               "marker": "centimeter",
               "word": "centimeters",
               "range": {
@@ -11994,6 +12000,7 @@
               "value": "meter",
               "number": "many",
               "text": "meters",
+              "dimension": "length",
               "marker": "meter",
               "word": "meters",
               "range": {
@@ -13661,6 +13668,7 @@
             "value": "meter",
             "number": "many",
             "text": "meters",
+            "dimension": "length",
             "marker": "meter",
             "word": "meters",
             "range": {
@@ -15359,6 +15367,7 @@
             "value": "foot",
             "number": "many",
             "text": "feet",
+            "dimension": "length",
             "marker": "foot",
             "word": "feet",
             "range": {
@@ -15389,6 +15398,7 @@
               "value": "inch",
               "number": "many",
               "text": "inches",
+              "dimension": "length",
               "marker": "inch",
               "word": "inches",
               "range": {
@@ -17056,6 +17066,7 @@
             "value": "inch",
             "number": "many",
             "text": "inches",
+            "dimension": "length",
             "marker": "inch",
             "word": "inches",
             "range": {
@@ -17086,6 +17097,7 @@
               "value": "foot",
               "number": "many",
               "text": "feet",
+              "dimension": "length",
               "marker": "foot",
               "word": "feet",
               "range": {
@@ -18753,6 +18765,7 @@
             "value": "meter",
             "number": "many",
             "text": "meters",
+            "dimension": "length",
             "marker": "meter",
             "word": "meters",
             "range": {
@@ -18783,6 +18796,7 @@
               "value": "foot",
               "number": "many",
               "text": "feet",
+              "dimension": "length",
               "marker": "foot",
               "word": "feet",
               "range": {
@@ -20480,6 +20494,7 @@
               "value": "foot",
               "number": "many",
               "text": "feet",
+              "dimension": "length",
               "marker": "foot",
               "word": "feet",
               "range": {
@@ -22075,6 +22090,7 @@
             "value": "foot",
             "number": "many",
             "text": "feet",
+            "dimension": "length",
             "marker": "foot",
             "word": "feet",
             "range": {
@@ -23804,6 +23820,7 @@
               "value": "meter",
               "number": "many",
               "text": "meters",
+              "dimension": "length",
               "marker": "meter",
               "word": "meters",
               "range": {
@@ -25471,6 +25488,7 @@
             "value": "meter",
             "number": "many",
             "text": "meters",
+            "dimension": "length",
             "marker": "meter",
             "word": "meters",
             "range": {