ekms 7.12.8-beta.5 → 7.12.8-beta.7

package/common/fastfood.js

@@ -35,7 +35,7 @@ const fastfood_instance = require('./fastfood.instance.json')
 */
 
 const template = {
-  "queries": [
+  configs: [
     "food is countable",
     "drinks are countable",
     "bacon modifies deluxe",

package/common/formulas.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [
+  "configs": [
     "formulas are concepts",
     {
       "name": "formulas",
@@ -756,15 +756,15 @@
           },
           "one": {
             "number": "many",
+            "value": "formulas",
+            "unknown": true,
+            "text": "formulas",
             "marker": "unknown",
+            "word": "formulas",
             "range": {
               "start": 0,
               "end": 20
             },
-            "word": "formulas",
-            "text": "formulas",
-            "value": "formulas",
-            "unknown": true,
             "dead": true,
             "types": [
               "unknown"
@@ -772,15 +772,15 @@
             "level": 1
           },
           "two": {
+            "value": "concepts",
+            "unknown": true,
+            "text": "concepts",
             "marker": "unknown",
+            "word": "concepts",
             "range": {
               "start": 13,
               "end": 20
             },
-            "word": "concepts",
-            "text": "concepts",
-            "value": "concepts",
-            "unknown": true,
             "dead": true,
             "types": [
               "unknown"

package/common/formulas.js

@@ -12,7 +12,7 @@ const instance = require('./formulas.instance.json')
 
 /*
 const template = {
-  queries: [
+  configs: [
     // { query: "x equals y + 4", development: true },
   ]
 }
@@ -186,7 +186,7 @@ let configStruct = {
 };
 
 const template = {
-  queries: [
+  configs: [
     "formulas are concepts",
     configStruct,
   ]

package/common/gdefaults.js

@@ -1,6 +1,7 @@
 const pluralize = require('pluralize')
 const { defaultContextCheck } = require('./helpers')
 const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const tokenize = require('./tokenize.js')
 const gdefaults_tests = require('./gdefaults.test.json')
 const { isMany } = require('./helpers.js')
 
@@ -182,6 +183,7 @@ let configStruct = {
 
 const createConfig = () => {
   const config = new Config(configStruct, module)
+  config.add(tokenize())
   config.initializer( ({config}) => {
     config.addArgs((args) => {
       return {

package/common/help.js

@@ -7,6 +7,9 @@ const helpers = require('./helpers')
 const getHelp = (config, indent=2) => {
   indent = ' '.repeat(indent)
   let help = ''
+  if (config.tests.length == 0) {
+    return ''
+  }
   help += `${indent}NAME: ${config.name}\n`
   help += `${indent}DESCRIPTION: ${config.description}\n\n`
   help += `${indent}SAMPLE SENTENCES\n\n`
@@ -72,8 +75,10 @@ const configStruct = {
   debug: false,
   version: '3',
   words: {
-    // "km1": { "the": [{"id": "the", "initial": "{ modifiers: [] }" }],
-    'km1': [{id: "km", initial: "{ value: 'km1', word: 'km1' }", development: true }],
+    "literals": {
+      // "km1": { "the": [{"id": "the", "initial": "{ modifiers: [] }" }],
+      'km1': [{id: "km", initial: "{ value: 'km1', word: 'km1' }", development: true }],
+    }
   },
 };
 

package/common/help.test.json

@@ -356,8 +356,9 @@
         "word": "help"
       }
     ],
+    "developerTest": false,
     "generatedParenthesized": [
-      "(  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n  NAME: sdefaults\n  DESCRIPTION: defaults for semantics\n\n  SAMPLE SENTENCES\n\n\n  NAME: pos\n  DESCRIPTION: parts of speech\n\n  SAMPLE SENTENCES\n\n\n  NAME: stm\n  DESCRIPTION: short term memory\n\n  SAMPLE SENTENCES\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n  NAME: gdefaults\n  DESCRIPTION: defaults for generators\n\n  SAMPLE SENTENCES\n\n)"
+      "(  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n\n)"
     ],
     "metadata": {
       "opChoices": [
@@ -385,7 +386,8 @@
         "pos": "pos2",
         "punctuation": "punctuation2",
         "sdefaults": "sdefaults2",
-        "stm": "stm2"
+        "stm": "stm2",
+        "tokenize": "tokenize2"
       },
       "namespaced": {
         "dialogues2": {
@@ -411,6 +413,8 @@
           ],
           "variables": {
           }
+        },
+        "tokenize2": {
         }
       },
       "processed": [
@@ -432,11 +436,11 @@
             "value": "help",
             "word": "help"
           },
-          "generatedParenthesized": "(  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n  NAME: sdefaults\n  DESCRIPTION: defaults for semantics\n\n  SAMPLE SENTENCES\n\n\n  NAME: pos\n  DESCRIPTION: parts of speech\n\n  SAMPLE SENTENCES\n\n\n  NAME: stm\n  DESCRIPTION: short term memory\n\n  SAMPLE SENTENCES\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n  NAME: gdefaults\n  DESCRIPTION: defaults for generators\n\n  SAMPLE SENTENCES\n\n)",
+          "generatedParenthesized": "(  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n\n)",
           "paraphrases": "help",
           "paraphrasesParenthesized": "(help)",
           "responses": [
-            "  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n  NAME: sdefaults\n  DESCRIPTION: defaults for semantics\n\n  SAMPLE SENTENCES\n\n\n  NAME: pos\n  DESCRIPTION: parts of speech\n\n  SAMPLE SENTENCES\n\n\n  NAME: stm\n  DESCRIPTION: short term memory\n\n  SAMPLE SENTENCES\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n  NAME: gdefaults\n  DESCRIPTION: defaults for generators\n\n  SAMPLE SENTENCES\n\n"
+            "  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n\n"
           ]
         }
       ]
@@ -449,7 +453,7 @@
     ],
     "query": "help",
     "responses": [
-      "  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n  NAME: sdefaults\n  DESCRIPTION: defaults for semantics\n\n  SAMPLE SENTENCES\n\n\n  NAME: pos\n  DESCRIPTION: parts of speech\n\n  SAMPLE SENTENCES\n\n\n  NAME: stm\n  DESCRIPTION: short term memory\n\n  SAMPLE SENTENCES\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n  NAME: gdefaults\n  DESCRIPTION: defaults for generators\n\n  SAMPLE SENTENCES\n\n"
+      "  NAME: help\n  DESCRIPTION: Help the user with the current knowledge modules\n\n  SAMPLE SENTENCES\n\n    help with help and dialogues\n    help\n\n  NAME: dialogues\n  DESCRIPTION: framework for dialogues\n\n  SAMPLE SENTENCES\n\n    1 2 and 3\n    be brief\n    be brief greg\n    is x y\n    no\n    what is it\n    x is y?\n    yes\n    x is 3 what is x\n    x is 3 what is x what is it\n    be brief x is 3 what is x what is it\n    to it\n    why\n    nevermindTestSetup accept nevermind hi\n    nevermindTestSetup reject nevermind hi\n\n\n\n\n  NAME: meta\n  DESCRIPTION: Ways of defining new language elements\n\n  SAMPLE SENTENCES\n\n    a means b\n    a means x\n    if f then g gq\n    undefined means defined\n\n  NAME: punctuation\n  DESCRIPTION: punctuation\n\n  SAMPLE SENTENCES\n\n    (a)\n    :\n\n\n"
     ]
   }
 ]

package/common/helpers.js

@@ -33,6 +33,10 @@ const getCount = (context) => {
   }
 }
 
+const words = (base, additional = {}) => {
+  return [{ word: pluralize.singular(base), number: 'one', ...additional }, { word: pluralize.plural(base), number: 'many', ...additional }]
+}
+
 const isMany = (context) => {
   if (((context || {}).value || {}).marker == 'list' && (((context || {}).value || {}).value || []).length > 1) {
     return true
@@ -160,6 +164,7 @@ module.exports = {
   chooseNumber,
   zip,
   focus,
+  words,
   propertyToArray,
   wordNumber,
 }

package/common/javascript.js

@@ -18,12 +18,14 @@ let configStruct = {
   debug: false,
   version: '3',
   words: {
-    "=": [{"id": "assignment", "initial": "{ value: 1 }" }],
-    /*
-    " ([0-9]+)": [{"id": "number", "initial": "{ value: int(group[0]) }" }],
-    "one": [{"id": "number", "initial": "{ value: 1 }" }],
-    "ten": [{"id": "number", "initial": "{ value: 10 }" }],
-    */
+    "literals": {
+      "=": [{"id": "assignment", "initial": "{ value: 1 }" }],
+      /*
+      " ([0-9]+)": [{"id": "number", "initial": "{ value: int(group[0]) }" }],
+      "one": [{"id": "number", "initial": "{ value: 1 }" }],
+      "ten": [{"id": "number", "initial": "{ value: 10 }" }],
+      */
+    }
   },
 
   hierarchy: [

package/common/kirk.instance.json

@@ -1,5 +1,5 @@
 {
-  "queries": [
+  "configs": [
     "you are kirk"
   ],
   "resultss": [

package/common/kirk.js

@@ -5,7 +5,7 @@ const kirk_tests = require('./kirk.test.json')
 const kirk_instance = require('./kirk.instance.json')
 
 const template = {
-  "queries": [
+  configs: [
     "you are kirk",
   ]
 };