tpmkms_4wp 9.5.1 → 9.6.0-beta.1

package/common/characters.js

@@ -7,7 +7,7 @@ const { table } = require('table')
 const _ = require('lodash')
 const characters_tests = require('./characters.test.json')
 
-const getHelp = (config, indent=2) => {
+function getHelp(config, indent=2) {
   indent = ' '.repeat(indent)
   let help = ''
   help += `${indent}NAME: ${config.name}\n`
@@ -42,8 +42,8 @@ const config = {
   ],
   "words": {
     "literals": {
-      "sally": [{"id": "character", development: true, "initial": "{ value: 'sally' }" }],
-      "bob": [{"id": "character", development: true, "initial": "{ value: 'bob' }" }],
+      "sally": [{"id": "character", scope: "testing", "initial": "{ value: 'sally' }" }],
+      "bob": [{"id": "character", scope: "testing", "initial": "{ value: 'bob' }" }],
     },
   },
 
@@ -167,13 +167,13 @@ class Bob {
   }
 }
 
-const initializeApi = (config, api) => {
+function initializeApi(config, api) {
   const name = api.getName();
   config.addWord(name, {"id": "character", "initial": "{ value: '" + name + `', api: '${name}'}` })
 }
 
 
-const initializer = async ({isModule, km}) => {
+async function initializer({isModule, km}) {
   if (!isModule) {
     const timeKM = await createTimeKM()
     const currencyKM = await createCurrencyKM()

package/common/colors.instance.json

@@ -359,6 +359,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -848,6 +858,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -1080,7 +1100,7 @@
             "text": "dark and light",
             "range": {
               "start": 0,
-              "end": 28
+              "end": 13
             },
             "types": [
               "list",
@@ -1843,6 +1863,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -3219,7 +3249,7 @@
             "text": "red, pink, orange, yellow, purple, green, blue, brown, white and gray",
             "range": {
               "start": 0,
-              "end": 79
+              "end": 68
             },
             "types": [
               "list",
@@ -8887,6 +8917,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -9171,7 +9211,7 @@
             "word": "crimson",
             "range": {
               "start": 0,
-              "end": 15
+              "end": 6
             },
             "dead": true,
             "types": [
@@ -10229,6 +10269,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -10574,7 +10624,7 @@
             "text": "gold and khaki",
             "range": {
               "start": 0,
-              "end": 25
+              "end": 13
             },
             "types": [
               "list",
@@ -11920,6 +11970,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -12487,7 +12547,7 @@
             "text": "lavender, violet, magenta and indigo",
             "range": {
               "start": 0,
-              "end": 47
+              "end": 35
             },
             "types": [
               "list",
@@ -14677,6 +14737,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -15284,7 +15354,7 @@
             "text": "lime, chartruese, olive and teal",
             "range": {
               "start": 0,
-              "end": 43
+              "end": 31
             },
             "types": [
               "list",
@@ -17594,6 +17664,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "teal_colors",
           "green_colors",
@@ -18376,7 +18456,7 @@
             "text": "aqua, cyan, aquamarine, turquoise and navy",
             "range": {
               "start": 0,
-              "end": 52
+              "end": 41
             },
             "types": [
               "list",
@@ -21302,6 +21382,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "teal_colors",
           "green_colors",
@@ -21870,7 +21960,7 @@
             "text": "tan, sienna and maroon",
             "range": {
               "start": 0,
-              "end": 33
+              "end": 21
             },
             "types": [
               "list",
@@ -24044,6 +24134,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "tan_colors",
           "brown_colors",
@@ -24771,7 +24871,7 @@
             "text": "snow, azure, beige and ivory",
             "range": {
               "start": 0,
-              "end": 39
+              "end": 27
             },
             "types": [
               "list",
@@ -27481,6 +27581,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "tan_colors",
           "brown_colors",
@@ -27986,7 +28096,7 @@
             "text": "silver and black",
             "range": {
               "start": 0,
-              "end": 26
+              "end": 15
             },
             "types": [
               "list",
@@ -30052,6 +30162,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "tan_colors",
           "brown_colors",
@@ -30451,7 +30571,7 @@
             "end": 25
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "brightness_colors",
               "number": "one",
@@ -32261,6 +32381,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "tan_colors",
           "brown_colors",
@@ -32660,7 +32790,7 @@
             "end": 17
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "hex",
               "unknown": true,
@@ -34677,6 +34807,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "tan_colors",
           "brown_colors",

package/common/colors.js

@@ -1,7 +1,7 @@
 const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const colors_tests = require('./colors.test.json')
-const colors_instance = require('./colors.instance.json')
+const instance = require('./colors.instance.json')
 const hierarchy = require('./hierarchy')
 
 const template = {
@@ -59,9 +59,6 @@ knowledgeModule( {
       context: [defaultContextCheck()],
     }
   },
-  template: {
-    template,
-    instance: colors_instance,
-  },
-
+  instance,
+  template,
 })

package/common/comparable.instance.json

@@ -223,6 +223,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -352,7 +362,7 @@
             "end": 21
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "sort",
               "unknown": true,
@@ -773,6 +783,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -963,7 +983,7 @@
             "word": "ascending",
             "range": {
               "start": 0,
-              "end": 27
+              "end": 8
             },
             "dead": true,
             "types": [
@@ -1602,6 +1622,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -1792,7 +1822,7 @@
             "word": "descending",
             "range": {
               "start": 0,
-              "end": 28
+              "end": 9
             },
             "dead": true,
             "types": [

package/common/comparable.js

@@ -4,7 +4,7 @@ const dialogues = require("./dialogues")
 const concept = require("./concept")
 const numbers = require("./numbers")
 const comparable_tests = require('./comparable.test.json')
-const comparable_instance = require('./comparable.instance.json')
+const instance = require('./comparable.instance.json')
 
 
 const config = {
@@ -70,11 +70,8 @@ const template = {
 knowledgeModule({ 
   config,
   includes: [dialogues, numbers, concept],
-  template: {
-    template,
-    instance: comparable_instance
-  },
-
+  instance,
+  template,
   module,
   description: 'Comparable things',
   test: {

package/common/concept.js

@@ -1,5 +1,5 @@
 const { knowledgeModule, flatten, where, Digraph } = require('./runtime').theprogrammablemind
-const { defaultContextCheck } = require('./helpers')
+const { defaultContextCheck, defaultContextCheckProperties } = require('./helpers')
 const { API }= require('./helpers/concept')
 const dialogues = require('./dialogues.js')
 const concept_tests = require('./concept.test.json')
@@ -27,7 +27,26 @@ config = {
       isA: ['verb'],
       words: [{ word: 'modifies', number: 'one', flatten: false }, { word: 'modify', number: 'many', flatten: true }],
       // bridge: "{ ...next(operator), modifiers: before, concept: after[0], flatten: true }"
-      bridge: "{ ...next(operator), modifiers: before[0], concept: after[0] }"
+      bridge: "{ ...next(operator), conceptModifiers: before[0], concept: after[0] }",
+      semantic: {
+        notes: 'define a modifier',
+        where: where(),
+        apply: ({config, query, km, context}) => {
+          let modifiers
+          if (context.literally) {
+            literalModifiers = context.conceptModifiers[0]
+            // modifiers = literalModifiers.value.map(modifier => modifier.value)
+            modifiers = literalModifiers.value
+            modifiers = modifiers.slice(0, -1).concat([literalModifiers.marker]).concat(modifiers.slice(-1))
+          } else {
+            modifiers = context.conceptModifiers
+            // modifiers = context.modifiers.map(modifier => modifier.value)
+          }
+          // km('concept').api.kindOfConcept({ config, modifiers, object: context.concept.value || context.concept.marker })
+          km('concept').api.kindOfConcept({ config, modifiers, object: context.concept })
+        }
+      },
+      check: defaultContextCheckProperties(['concept', 'conceptModifiers']),
     },
     { id: "literally", bridge: "{ ...after[0], flatten: false, literally: true }" },
     { id: "concept" },
@@ -62,7 +81,7 @@ config = {
         },
       */
       where: where(),
-      match: ({context}) => {
+      match: ({context, callId}) => {
         if (!context.paraphrase) {
           return
         }
@@ -103,39 +122,18 @@ config = {
       match: ({context}) => context.marker == 'modifies' && context.paraphrase,
       apply: async ({context, gp, gw}) => {
         const modifiers = []
-        for (modifier of context.modifiers) {
+        for (modifier of context.conceptModifiers) {
           modifiers.push(await gp(modifier))
         }
         if (context.literally) {
-          return `${modifiers.join(" ")} literally ${await gw(context, { number: context.modifiers[context.modifiers.length - 1] })} ${await gp(context.concept)}`
+          return `${modifiers.join(" ")} literally ${await gw(context, { number: context.conceptModifiers[context.conceptModifiers.length - 1] })} ${await gp(context.concept)}`
         } else {
-          return `${modifiers.join(" ")} ${await gw(context, { number: context.modifiers[context.modifiers.length - 1] })} ${await gp(context.concept)}`
+          return `${modifiers.join(" ")} ${await gw(context, { number: context.conceptModifiers[context.conceptModifiers.length - 1] })} ${await gp(context.concept)}`
         }
       }
       // const chosen = chooseNumber(context, word.singular, word.plural)
     },
   ],
-  semantics: [
-    {
-      notes: 'define a modifier',
-      where: where(),
-      match: ({context}) => context.marker == 'modifies',
-      apply: ({config, query, km, context}) => {
-        let modifiers
-        if (context.literally) {
-          literalModifiers = context.modifiers[0]
-          // modifiers = literalModifiers.value.map(modifier => modifier.value)
-          modifiers = literalModifiers.value
-          modifiers = modifiers.slice(0, -1).concat([literalModifiers.marker]).concat(modifiers.slice(-1))
-        } else {
-          modifiers = context.modifiers
-          // modifiers = context.modifiers.map(modifier => modifier.value)
-        }
-        // km('concept').api.kindOfConcept({ config, modifiers, object: context.concept.value || context.concept.marker })
-        km('concept').api.kindOfConcept({ config, modifiers, object: context.concept })
-      }
-    },
-  ],
 }
 
 knowledgeModule({