tpmkms_4wp 8.0.0-beta.2 → 8.0.0-beta.21

package/common/formulas.js

@@ -102,7 +102,7 @@ let configStruct = {
     "(([expression]) [equals] ([expression]))",
   ],
   priorities: [
-    { "context": [['mathematicalOperator', 0], ['number', 0], ], "choose": [0] },
+    { "context": [['mathematical_operator', 0], ['number', 0], ], "choose": [0] },
   ],
   semantics: [
     {
@@ -172,7 +172,7 @@ let configStruct = {
       id: 'equals',
       bridge: "{ ...next(operator), left: before[0], right: after[0] }",
       words: ['='],
-      after: ['mathematicalOperator'],
+      after: ['mathematical_operator'],
       // TODO have this be per argument then 'is' can map to equals where this only applied to before[0] and not after[0]
       localHierarchy: [ ['unknown', 'expression'] ],
       generatorp: ({context, gp}) => `${gp(context.left)} ${context.word} ${gp(context.right)}`,
@@ -192,13 +192,13 @@ const template = {
   ]
 }
 
-const createConfig = () => {
+const createConfig = async () => {
   const api = new API()
   config = new Config({ name: 'formulas' }, module)
   config.stop_auto_rebuild()
-  config.add(dialogues(), pos(), math(), hierarchy(), comparable(), countable())
-  config.api = api
-  config.restart_auto_rebuild()
+  await config.add(dialogues, pos, math, hierarchy, comparable, countable)
+  await config.setApi(api)
+  await config.restart_auto_rebuild()
   return config
 }
 

package/common/gdefaults.js

@@ -181,9 +181,9 @@ let configStruct = {
   ],
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
-  config.add(tokenize())
+  await config.add(tokenize)
   config.initializer( ({config}) => {
     config.addArgs((args) => {
       return {

package/common/help.js

@@ -82,10 +82,10 @@ const configStruct = {
   },
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
   config.stop_auto_rebuild()
-  config.add(dialogues())
+  await config.add(dialogues)
 
   config.initializer( ({ config, addWord, kms }) => {
     const names = new Set()
@@ -96,7 +96,7 @@ const createConfig = () => {
       addWord(name, {id: "km", initial: `{ value: '${name}', word: '${name}' }`})
     }
   })
-  config.restart_auto_rebuild()
+  await config.restart_auto_rebuild()
   return config
 }
 

package/common/help.test.json

@@ -19,24 +19,6 @@
           0
         ]
       ],
-      [
-        [
-          "help",
-          0
-        ],
-        [
-          "km",
-          0
-        ],
-        [
-          "list",
-          0
-        ],
-        [
-          "withKM",
-          0
-        ]
-      ],
       [
         [
           "help",
@@ -216,6 +198,7 @@
         "gdefaults": "gdefaults2",
         "help": "help1",
         "meta": "meta2",
+        "negation": "negation2",
         "pos": "pos2",
         "punctuation": "punctuation2",
         "sdefaults": "sdefaults2",
@@ -236,6 +219,8 @@
         },
         "meta2": {
         },
+        "negation2": {
+        },
         "pos2": {
         },
         "punctuation2": {
@@ -361,7 +346,7 @@
       }
     ],
     "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    setidsuffix greg\n    setidsuffix greg resetidsuffix\n    setidsuffix greg makeObject banana\\nbanana\n    setidsuffix _suffy\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    \"hi man\"\n\n\n  NAME: tokenize\n  DESCRIPTION: tokenize\n\n  SAMPLE SENTENCES\n\n    hello_world\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    setidsuffix greg\n    setidsuffix greg resetidsuffix\n    setidsuffix greg makeObject banana\\nbanana\n    setidsuffix _suffy\n\n\n  NAME: negation\n  DESCRIPTION: negation\n\n  SAMPLE SENTENCES\n\n    not negatable\n    not negatables\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    \"hi man\"\n\n\n\n  NAME: tokenize\n  DESCRIPTION: tokenize\n\n  SAMPLE SENTENCES\n\n    hello_world\n)"
     ],
     "metadata": {
       "opChoices": [
@@ -386,6 +371,7 @@
         "gdefaults": "gdefaults2",
         "help": "help1",
         "meta": "meta2",
+        "negation": "negation2",
         "pos": "pos2",
         "punctuation": "punctuation2",
         "sdefaults": "sdefaults2",
@@ -406,6 +392,8 @@
         },
         "meta2": {
         },
+        "negation2": {
+        },
         "pos2": {
         },
         "punctuation2": {
@@ -440,11 +428,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    setidsuffix greg\n    setidsuffix greg resetidsuffix\n    setidsuffix greg makeObject banana\\nbanana\n    setidsuffix _suffy\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    \"hi man\"\n\n\n  NAME: tokenize\n  DESCRIPTION: tokenize\n\n  SAMPLE SENTENCES\n\n    hello_world\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    setidsuffix greg\n    setidsuffix greg resetidsuffix\n    setidsuffix greg makeObject banana\\nbanana\n    setidsuffix _suffy\n\n\n  NAME: negation\n  DESCRIPTION: negation\n\n  SAMPLE SENTENCES\n\n    not negatable\n    not negatables\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    \"hi man\"\n\n\n\n  NAME: tokenize\n  DESCRIPTION: tokenize\n\n  SAMPLE SENTENCES\n\n    hello_world\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    setidsuffix greg\n    setidsuffix greg resetidsuffix\n    setidsuffix greg makeObject banana\\nbanana\n    setidsuffix _suffy\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    \"hi man\"\n\n\n  NAME: tokenize\n  DESCRIPTION: tokenize\n\n  SAMPLE SENTENCES\n\n    hello_world\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    setidsuffix greg\n    setidsuffix greg resetidsuffix\n    setidsuffix greg makeObject banana\\nbanana\n    setidsuffix _suffy\n\n\n  NAME: negation\n  DESCRIPTION: negation\n\n  SAMPLE SENTENCES\n\n    not negatable\n    not negatables\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    \"hi man\"\n\n\n\n  NAME: tokenize\n  DESCRIPTION: tokenize\n\n  SAMPLE SENTENCES\n\n    hello_world\n"
           ]
         }
       ]
@@ -457,7 +445,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    setidsuffix greg\n    setidsuffix greg resetidsuffix\n    setidsuffix greg makeObject banana\\nbanana\n    setidsuffix _suffy\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    \"hi man\"\n\n\n  NAME: tokenize\n  DESCRIPTION: tokenize\n\n  SAMPLE SENTENCES\n\n    hello_world\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    setidsuffix greg\n    setidsuffix greg resetidsuffix\n    setidsuffix greg makeObject banana\\nbanana\n    setidsuffix _suffy\n\n\n  NAME: negation\n  DESCRIPTION: negation\n\n  SAMPLE SENTENCES\n\n    not negatable\n    not negatables\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    \"hi man\"\n\n\n\n  NAME: tokenize\n  DESCRIPTION: tokenize\n\n  SAMPLE SENTENCES\n\n    hello_world\n"
     ]
   }
 ]

package/common/helpers/concept.js

@@ -34,10 +34,9 @@ class API {
     // TODO make the modifiers objects then below for add words for modifiers only do if !unknown
     // const objectId = pluralize.singular(object)
     const objectId = this.args.kms.dialogues.api.toScopedId(object)
-
     // const modifierIds = modifiers.map( (modifier) => pluralize.singular(modifier) )
     const modifierIds = modifiers.map( (modifier) => this.args.kms.dialogues.api.toScopedId(modifier) )
-    const modifiersObjectId = `${modifiers.join("_")}_${objectId}`
+    const modifiersObjectId = `${modifierIds.join("_")}_${objectId}`
 
     const toWord = (object) => {
       if (typeof object == 'string') {
@@ -76,11 +75,14 @@ class API {
       config.addWord(objectPlural, { id: objectId, initial: `{ value: '${objectId}', number: 'many' }`})
     }
 
-    zip(modifiers, modifierIds).forEach(([modifierWord, modifierId]) => {
+    zip(modifiers, modifierIds).forEach(([modifier, modifierId]) => {
       // config.addWord(modifier, { id: modifierId, initial: `{ value: '${modifierId}' }`})
       // TODO call evaluator to pick up overrides
-      config.addWord(pluralize.singular(modifierWord), { id: modifierId, initial: `{ value: '${modifierId}', number: 'one' }`})
-      config.addWord(pluralize.plural(modifierWord), { id: modifierId, initial: `{ value: '${modifierId}', number: 'many' }`})
+      if (modifier.unknown) {
+        const modifierWord = modifier.text
+        config.addWord(pluralize.singular(modifierWord), { id: modifierId, initial: `{ value: '${modifierId}', number: 'one' }`})
+        config.addWord(pluralize.plural(modifierWord), { id: modifierId, initial: `{ value: '${modifierId}', number: 'many' }`})
+      }
     })
     // modifierds.forEach((modifierId) => config.addWord(modifierId, { id: modifierId, initial: `{ value: '${modifierId}' }`}))
 
@@ -94,7 +96,8 @@ class API {
       id: modifiersObjectId, 
       level: 0, 
       convolution: true,
-      isA: ['adjective'],
+      isA: [{ parent: 'adjective', instance: true }],
+      // isA: ['adjective'],
       before: ['verby'],
       bridge: `{ ...after[0], ${modifierProperties}, atomic: true, dead: true, marker: next(operator('${modifiersObjectId}')), value: '${modifiersObjectId}', modifiers: append([${modifierList}], after[0].modifiers)}`, 
       allowDups: true })

package/common/hierarchy.js

@@ -288,16 +288,16 @@ let configStruct = {
   ]
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
   config.stop_auto_rebuild()
-  config.add(properties())
+  await config.add(properties)
   config.initializer( ({apis, hierarchy}) => {
     apis('stm').addIsA( (child, parent) => {
       return hierarchy.isA(child, parent) 
     })
   })
-  config.restart_auto_rebuild()
+  await config.restart_auto_rebuild()
   return config
 }
 

package/common/javascript.js

@@ -60,15 +60,15 @@ let configStruct = {
   ],
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
   config.stop_auto_rebuild()
-  config.add(dialogues())
+  await config.add(dialogues)
 
   config.initializer( ({objects, uuid}) => {
     objects.variables = {}
   })
-  config.restart_auto_rebuild()
+  await config.restart_auto_rebuild()
   return config
 }