tpmkms 8.0.0-beta.42 → 8.0.0-beta.43

package/common/fastfood.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, ensureTestFile, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, ensureTestFile, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck, propertyToArray } = require('./helpers')
 const edible = require('./edible')
 const events = require('./events')
@@ -935,75 +935,65 @@ class State {
   }
 }
 
-const createConfig = async (additionalConfig) => {
-  const config = new Config({ 
-    name: 'fastfood',
-    operators: [
-      "([orderNoun|order])",
-      "([showOrder|show] ([orderNoun/1]))",
-    ],
-    // flatten: ['list'],
-    // TODO use node naming not python
-    semantics: [
-      {
-        where: where(),
-        priority: -10,
-        match: ({context}) => context.marker == 'compound_operator',
-        apply: async ({context, s}) => {
-          context.marker = 'list'
-          context.flatten = true
-          await s(context)
-        }
-      },
-      {
-        where: where(),
-        match: ({context, isAListable}) => isAListable(context, 'edible') && context.marker !== 'edible' && !context.same && !context.isResponse && !context.evaluate,
-        apply: ({context, km, api, instance}) => {
-          for (const element of propertyToArray(context)) {
-            km('fastfood').api.state.add(element)
-          }
-        }
-      },
-    ],
-    floaters: ['quantity'],
-    bridges: [
-      { 
-        id: 'orderNoun',
-        parents: ['noun', 'queryable'],
-        evaluator: ({context, api}) => {
-          context.evalue = { marker: 'list', value: api.objects.items }
-          api.show()
+const config = { 
+  name: 'fastfood',
+  operators: [
+    "([orderNoun|order])",
+    "([showOrder|show] ([orderNoun/1]))",
+  ],
+  // flatten: ['list'],
+  // TODO use node naming not python
+  semantics: [
+    {
+      where: where(),
+      priority: -10,
+      match: ({context}) => context.marker == 'compound_operator',
+      apply: async ({context, s}) => {
+        context.marker = 'list'
+        context.flatten = true
+        await s(context)
+      }
+    },
+    {
+      where: where(),
+      match: ({context, isAListable}) => isAListable(context, 'edible') && context.marker !== 'edible' && !context.same && !context.isResponse && !context.evaluate,
+      apply: ({context, km, api, instance}) => {
+        for (const element of propertyToArray(context)) {
+          km('fastfood').api.state.add(element)
         }
+      }
+    },
+  ],
+  floaters: ['quantity'],
+  bridges: [
+    { 
+      id: 'orderNoun',
+      parents: ['noun', 'queryable'],
+      evaluator: ({context, api}) => {
+        context.evalue = { marker: 'list', value: api.objects.items }
+        api.show()
+      }
+    },
+    { 
+      id: 'showOrder',
+      parents: ['verby'],
+      bridge: "{ ...next(operator), order: after[0] }",
+      generatorp: async ({context, g}) => `show ${await g(context.order)}`,
+      semantic: ({api}) => {
+        api.state.show()
       },
-      { 
-        id: 'showOrder',
-        parents: ['verby'],
-        bridge: "{ ...next(operator), order: after[0] }",
-        generatorp: async ({context, g}) => `show ${await g(context.order)}`,
-        semantic: ({api}) => {
-          api.state.show()
-        },
-      },
-    ],
-  }, module)
-  config.stop_auto_rebuild()
-  await config.add(edible, countable, events, sizeable)
-  await config.setApi(api)
-  await config.initializer( ({api}) => {
-    api.state = new State(api)
-  })
-  if (additionalConfig) {
-    additionalConfig(config)
-  }
-  await config.restart_auto_rebuild()
-  return config
+    },
+  ],
 }
 
 knowledgeModule( {
+    config,
+    includes: [edible, countable, events, sizeable],
+    api: () => new API(),
+    initializer: ({api}) => { api.state = new State(api) },
+
     module,
     description: 'fastfood related concepts',
-    createConfig,
-    acceptsAdditionalConfig: true,
     test: {
             name: './fastfood.test.json',
             contents: fastfood_tests,

package/common/formulas.instance.json

@@ -29,14 +29,14 @@
       ],
       "semantics": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:109",
+          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
           "match": "({context, api}) => context.evaluate && api.get(context)",
           "apply": "async ({context, api, e}) => {\n        const { formula } = api.get(context)\n        // console.log('greg24 -----------', JSON.stringify(formula, null, 2))\n        context.evalue = await e(formula) \n      }"
         }
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:120",
+          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
           "id": "formulaForVariable",
           "isA": [
             "preposition",
@@ -48,7 +48,7 @@
           "evaluator": "({context, api, objects}) => {\n        const formulas = api.gets(context.variable).map((f) => { return { ...f.equality, paraphrase: true } })\n        context.evalue = { marker: 'list', value: formulas }\n      }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:132",
+          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
           "id": "solve",
           "bridge": "{ ...next(operator), equality: after[0], variable: after[2] }",
           "generatorp": "async ({context, gp}) => `${context.word} ${await gp(context.equality)} for ${await gp(context.variable)}`",
@@ -74,7 +74,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:159",
+          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
           "id": "calculate",
           "isA": [
             "verby"
@@ -90,7 +90,7 @@
           "semantic": "async ({context, e}) => {\n        context.evalue = await e(context.expression)\n        context.isResponse = true\n      }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:171",
+          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
           "id": "equals",
           "bridge": "{ ...next(operator), left: before[0], right: after[0] }",
           "words": [
@@ -868,12 +868,12 @@
       ],
       "semantics": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:109"
+          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5"
         }
       ],
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:120",
+          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
           "id": "formulaForVariable",
           "isA": [
             "preposition",
@@ -883,7 +883,7 @@
           "bridge": "{ number: before[0].number, ...next(operator), what: before[0], equality: after[0], variable: after[1] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:132",
+          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
           "id": "solve",
           "bridge": "{ ...next(operator), equality: after[0], variable: after[2] }"
         },
@@ -907,7 +907,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:159",
+          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
           "id": "calculate",
           "isA": [
             "verby"
@@ -921,7 +921,7 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:171",
+          "where": "/home/dev/code/theprogrammablemind/kms/node_modules/theprogrammablemind/src/helpers.js:5",
           "id": "equals",
           "bridge": "{ ...next(operator), left: before[0], right: after[0] }",
           "words": [

package/common/formulas.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const dialogues = require('./dialogues.js')
 const pos = require('./pos.js')
@@ -91,7 +91,7 @@ class API {
 }
 */
 
-let configStruct = {
+let config = {
   name: 'formulas',
   operators: [
     // TODO notations like (([arg1:]) [op] ([arg2:nameOfArg2}|word1])) -> just make the bridge + operators. put this in the bridge def / also calculate generators
@@ -188,24 +188,17 @@ let configStruct = {
 const template = {
   configs: [
     "formulas are concepts",
-    configStruct,
+    config,
   ]
 }
 
-const createConfig = async () => {
-  const api = new API()
-  config = new Config({ name: 'formulas' }, module)
-  config.stop_auto_rebuild()
-  await config.add(dialogues, pos, math, hierarchy, comparable, countable)
-  await config.setApi(api)
-  await config.restart_auto_rebuild()
-  return config
-}
-
 knowledgeModule({ 
+  config: { name: 'formulas' },
+  includes: [dialogues, pos, math, hierarchy, comparable, countable],
+  api: () => new API(),
+
   module,
   description: 'Formulas using math',
-  createConfig,
   template: { template, instance },
   test: {
     name: './formulas.test.json',

package/common/gdefaults.js

@@ -1,11 +1,11 @@
 const pluralize = require('pluralize')
 const { defaultContextCheck } = require('./helpers')
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const tokenize = require('./tokenize.js')
 const gdefaults_tests = require('./gdefaults.test.json')
 const { isMany } = require('./helpers.js')
 
-let configStruct = {
+let config = {
   name: 'gdefaults',
   generators: [
   /* TODO save for later
@@ -181,10 +181,7 @@ let configStruct = {
   ],
 };
 
-const createConfig = async () => {
-  const config = new Config(configStruct, module)
-  await config.add(tokenize)
-  await config.initializer( ({config}) => {
+const initializer = ({config}) => {
     config.addArgs((args) => {
       return {
         number: (context) => isMany(context) ? "many" : "one",
@@ -198,14 +195,15 @@ const createConfig = async () => {
         },
       }
     })
-  })
-  return config
-}
+  }
 
 knowledgeModule({ 
+  config,
+  includes: [tokenize],
+  initializer,
+
   module,
   description: 'defaults for generators',
-  createConfig,
   test: {
     name: './gdefaults.test.json',
     contents: gdefaults_tests,

package/common/help.js

@@ -22,7 +22,7 @@ const getHelp = (config, indent=2) => {
   return help
 }
 
-const configStruct = {
+const config = {
   name: 'help',
   operators: [
     "([help] ([withKM|with] ([km]))?)",
@@ -82,12 +82,7 @@ const configStruct = {
   },
 };
 
-const createConfig = async () => {
-  const config = new Config(configStruct, module)
-  config.stop_auto_rebuild()
-  await config.add(dialogues)
-
-  await config.initializer( ({ config, addWord, kms }) => {
+const initializer = ({ config, addWord, kms }) => {
     const names = new Set()
     for (let name in kms) {
       names.add(name);
@@ -95,15 +90,15 @@ const createConfig = async () => {
     for (let name of names) {
       addWord(name, {id: "km", initial: `{ value: '${name}', word: '${name}' }`})
     }
-  })
-  await config.restart_auto_rebuild()
-  return config
-}
+  }
 
 knowledgeModule({
+  config,
+  includes: [dialogues],
+  initializer,
+
   module,
   description: 'Help the user with the current knowledge modules',
-  createConfig,
   test: {
     name: './help.test.json',
     contents: help_tests,

package/common/hierarchy.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const properties = require('./properties')
 const hierarchy_tests = require('./hierarchy.test.json')
@@ -32,7 +32,7 @@ const getTypes = ( km, concept, instance ) => {
 
 // TODO the types of rank are x y z ....
 // TODO x is a kind of y
-let configStruct = {
+let config = {
   name: 'hierarchy',
   operators: [
     // "([hierarchyAble|])",
@@ -284,23 +284,19 @@ let configStruct = {
   ]
 };
 
-const createConfig = async () => {
-  const config = new Config(configStruct, module)
-  config.stop_auto_rebuild()
-  await config.add(properties)
-  await config.initializer( ({apis, hierarchy}) => {
+const initializer = ({apis, hierarchy}) => {
     apis('stm').addIsA( (child, parent) => {
       return hierarchy.isA(child, parent) 
     })
-  })
-  await config.restart_auto_rebuild()
-  return config
-}
+  }
 
 knowledgeModule( { 
+  config,
+  includes: [properties],
+  initializer,
+
   module,
   description: 'hierarchy of objects',
-  createConfig,
   test: {
     name: './hierarchy.test.json',
     contents: hierarchy_tests,

package/common/javascript.js

@@ -1,9 +1,9 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const dialogues = require('./dialogues')
 const javascript_tests = require('./javascript.test.json')
 
-let configStruct = {
+let config = {
   name: 'javascript',
   operators: [
     "((<let> ([variable|])) [assignment|] (value))",
@@ -60,22 +60,15 @@ let configStruct = {
   ],
 };
 
-const createConfig = async () => {
-  const config = new Config(configStruct, module)
-  config.stop_auto_rebuild()
-  await config.add(dialogues)
-
-  await config.initializer( ({objects, uuid}) => {
+knowledgeModule( { 
+  config,
+  includes: [dialogues],
+  initializer: ({objects, uuid}) => {
     objects.variables = {}
-  })
-  await config.restart_auto_rebuild()
-  return config
-}
+  },
 
-knowledgeModule( { 
   module,
   description: 'javascript interpreter',
-  createConfig,
   test: {
     name: './javascript.test.json',
     contents: javascript_tests,

package/common/kirk.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const crew = require('./crew')
 const kirk_tests = require('./kirk.test.json')
@@ -14,18 +14,15 @@ const template = {
 // TODO what is the name of you
 // TODO crew members -> who are the crew members
 
-const createConfig = async () => {
-  const config = new Config({ name: 'kirk', }, module)
-  await config.add(crew)
-  return config
-}
-
 kirk_instance.base = 'crew'
+
 // config.load(template, kirk_instance)
 knowledgeModule( {
+  config: { name: 'kirk', },
+  includes: [crew],
+
   module,
   description: 'Captain Kirk Simulator using a KM template',
-  createConfig,
   test: {
           name: './kirk.test.json',
           contents: kirk_tests,

package/common/length.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const dimension = require('./dimension.js')
 const length_tests = require('./length.test.json')
@@ -36,16 +36,12 @@ const template = {
   ],
 }
 
-const createConfig = async () => {
-  const config = new Config({ name: 'length' }, module)
-  await config.add(dimension)
-  return config
-}
-
 knowledgeModule({ 
+  config: { name: 'length' },
+  includes: [dimension],
+
   module,
   description: 'Length dimension',
-  createConfig,
   test: {
     name: './length.test.json',
     contents: length_tests,

package/common/listener.js

@@ -1,10 +1,10 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const helpers = require('./helpers')
 const gdefaults = require('./gdefaults')
 const listener_tests = require('./listener.test.json')
 
-const configStruct = {
+const config = {
   name: 'listener',
   operators: [
     { pattern: "([call])", development: true },
@@ -31,18 +31,12 @@ const configStruct = {
   ],
 }
 
-let createConfig = async () => {
-  const config = new Config(configStruct, module)
-  config.stop_auto_rebuild()
-  await config.add(gdefaults)
-  await config.restart_auto_rebuild()
-  return config
-}
-
 knowledgeModule( { 
+  config,
+  includes: [gdefaults],
+
   module,
   description: 'test of listeners',
-  createConfig,
   test: {
     name: './listener.test.json',
     contents: listener_tests,