tpmkms_4wp 8.0.0-beta.7 → 8.0.0-beta.70

package/common/temperature.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 temperature_tests = require('./temperature.test.json')
@@ -14,16 +14,12 @@ const template = {
   ],
 }
 
-const createConfig = () => {
-  const config = new Config({ name: 'temperature' }, module)
-  config.add(dimension())
-  return config
-}
-
 knowledgeModule({ 
+  config: { name: 'temperature' },
+  includes: [dimension],
+
   module,
   description: 'Weight dimension',
-  createConfig,
   test: {
     name: './temperature.test.json',
     contents: temperature_tests,

package/common/tester.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const tester_tests = require('./tester.test.json')
 const ArgumentParser = require('argparse').ArgumentParser
@@ -12,7 +12,7 @@ const [args, unknown] = parser.parse_known_args()
 
 process.argv = [process.argv[0], process.argv[1], ...unknown]
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config({ name: 'tester' })
   global.theprogrammablemind = {
     loadForTesting: {}
@@ -21,15 +21,26 @@ const createConfig = () => {
     global.theprogrammablemind.loadForTesting[module] = true
     const km = require(`./${module}`)
     // km.rebuild({ isModule: false }) // load the usually defaults
-    config.add(km())
+    await config.add(km)
   }
   return config
 }
 
+global.theprogrammablemind = {
+  loadForTesting: {}
+}
+const includes = args.modules.split(',').map((module) => {
+  global.theprogrammablemind.loadForTesting[module] = true
+  const km = require(`./${module}`)
+  return km
+})
+
 knowledgeModule({
+  config: { name: 'tester' },
+  includes,
+
   module,
   description: 'Testing modules loaded together',
-  createConfig,
   test: {
     name: './tester.test.json',
     contents: tester_tests

package/common/testing.js

@@ -1,9 +1,9 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const testing_tests = require('./testing.test.json')
 const gdefaults = require('./gdefaults')
 
-let configStruct = {
+const config = {
   name: 'testing',
   operators: [
     { pattern: "([testingEvaluate] ([testingValue]))" },
@@ -13,9 +13,9 @@ let configStruct = {
     {
       where: where(),
       id: 'testingEvaluate',
-      generatorp: ({context, g}) => `${context.word} ${g(context.value)}`,
-      semantic: ({context, e}) => {
-        context.evalue = e(context.value)
+      generatorp: async ({context, g}) => `${context.word} ${await g(context.value)}`,
+      semantic: async ({context, e}) => {
+        context.evalue = await e(context.value)
         context.isResponse = true
       },
       bridge: "{ ...next(operator), value: after[0] }",
@@ -30,16 +30,12 @@ let configStruct = {
   ],
 };
 
-const createConfig = () => {
-  const config = new Config(configStruct, module)
-  config.add(gdefaults())
-  return config
-}
-
 knowledgeModule({ 
+  config,
+  includes: [gdefaults],
+
   module,
   description: 'code for testing',
-  createConfig,
   test: {
     name: './testing.test.json',
     contents: testing_tests

package/common/time.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const tell = require('./tell')
 const countable = require('./countable')
@@ -14,7 +14,7 @@ const pad = (v, l) => {
 
 class API {
   // gets the contexts for doing the happening
-  semantics({context, isModule, args, kms}) {
+  semantics({context, args, kms}) {
     const api = kms.time.api
     const values = args({ types: ['ampm', 'time'], properties: ['one', 'two']  })
     const ampm = context[values[0]]
@@ -36,9 +36,8 @@ class API {
   initialize() {
   }
 }
-const api = new API()
 
-const configStruct = {
+const config = {
   name: 'time',
   operators: [
     "([time])",
@@ -103,12 +102,12 @@ const configStruct = {
     { 
       where: where(),
       match: ({context}) => context.marker == 'ampm' && context.paraphrase, 
-      apply: ({g, context, gp}) => `${gp(context.hour)} ${context.ampm}` 
+      apply: async ({g, context, gp}) => `${await gp(context.hour)} ${context.ampm}` 
     },
     { 
       where: where(),
       match: ({context}) => context.marker == 'time' && context.evalue && context.format == 12, 
-      apply: ({g, context}) => {
+      apply: ({context}) => {
         let hh = context.evalue.getHours();
         let ampm = 'am'
         if (hh > 12) {
@@ -170,31 +169,27 @@ const configStruct = {
   ],
 };
 
-const createConfig = () => {
-  const config = new Config(configStruct, module)
-  config.stop_auto_rebuild()
-  config.add(tell()).add(numbers()).add(countable())
-  config.api = api
-  config.initializer( ({config, objects, kms, isModule}) => {
-    if (!isModule) {
-      kms.time.api.newDate = () => new Date("December 25, 1995 1:59:58 pm" )
-    }
-    Object.assign(objects, {
-      format: 12  // or 24
-    });
-    config.addSemantic({
-        match: ({context, hierarchy, args}) => context.happening && context.marker == 'is' && args({ types: ['ampm', 'time'], properties: ['one', 'two'] }),
-        apply: api.semantics
-    })
+const initializer = ({api, config, objects, kms, isModule}) => {
+  if (!isModule) {
+    kms.time.api.newDate = () => new Date("December 25, 1995 1:59:58 pm" )
+  }
+  Object.assign(objects, {
+    format: 12  // or 24
+  });
+  config.addSemantic({
+      match: ({context, hierarchy, args}) => context.happening && context.marker == 'is' && args({ types: ['ampm', 'time'], properties: ['one', 'two'] }),
+      apply: api.semantics
   })
-  config.restart_auto_rebuild()
-  return config
 }
 
 knowledgeModule({
+  config,
+  includes: [tell, numbers, countable],
+  api: () => new API(),
+  initializer,
+
   module,
   description: 'Time related concepts',
-  createConfig,
   test: {
     name: './time.test.json',
     contents: time_tests,

package/common/tokenize.js

@@ -1,8 +1,8 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const tokenize_tests = require('./tokenize.test.json')
 
-let configStruct = {
+const config = {
   name: 'tokenize',
   operators: [
     "([unknown])",
@@ -14,7 +14,7 @@ let configStruct = {
   words: {
     patterns: [
       { pattern: [{ type: 'space' }, { repeat: true }], defs: [ { remove: true } ] },
-      { pattern: [{ type: 'alphanumeric' }, { repeat: true }], defs: [ { id: 'unknown', initial: "{ value: text, unknown: true }" } ] },
+      { pattern: [{ type: 'alphanumeric' }, { repeat: true }], scale: 0.8, check_spelling: true, is_unknown: true, defs: [ { id: 'unknown', initial: "{ value: text, unknown: true }" } ] },
     ],
     hierarchy: [
       { child: ' ', parent: 'space' },
@@ -31,11 +31,10 @@ let configStruct = {
   },
 };
 
-createConfig = () => new Config(configStruct, module)
-
 knowledgeModule( { 
+  config,
+
   module,
-  createConfig,
   description: 'tokenize',
   test: {
     name: './tokenize.test.json',