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

package/common/currency.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 numbersKM = require('./numbers.js')
 const currency_tests = require('./currency.test.json')
@@ -40,7 +40,7 @@ class API {
 
 const api = new API()
 
-let configStruct = {
+let config = {
   name: 'currency',
   operators: [
     "(([number]) [currency])",
@@ -60,14 +60,14 @@ let configStruct = {
     { 
       where: where(),
       match: ({context}) => context.marker == 'currency' && !context.isAbstract, 
-      apply: ({context, g}) => {
+      apply: async ({context, g}) => {
         word = Object.assign({}, context.amount)
         word.isAbstract = true
         word.marker = 'currency'
         word.units = context.units
         word.value = context.amount.value
         // generator = [({context}) => context.marker == 'currency' && context.units == words.units && context.value > 1 && context.isAbstract, ({context, g}) => words.many ]
-        return `${g(context.amount.value)} ${g(word)}`
+        return `${await g(context.amount.value)} ${await g(word)}`
       } 
     },
   ],
@@ -90,52 +90,34 @@ let configStruct = {
   ],
 };
 
-const createConfig = () => {
-  const config = new Config(configStruct, module)
-  config.stop_auto_rebuild()
-  config.add(numbersKM())
-  config.api = api
-  config.initializer( ({config, objects, apis, addWord, addGenerator, baseConfig, uuid}) => {
-    // const api = config.km('currency').api
-    // const api = kms.currency.api
-    const api = apis('currency')
-    units = api.getUnits()
-    for (word in units) {
-      def = {"id": "currency", "initial": { units: units[word] }, uuid}
-      addWord(word, def)
-    }
-    /*
-    for (word in units) {
-      words = config.get('words')
-      def = {"id": "currency", "initial": { units: units[word] }, uuid}
-      if (words[word]) {
-        words[word].push(def)
-      } else {
-        words[word] = [def]
-      }
-    }
-    */
-
-    unitWords = api.getUnitWords();
-    for (let words of unitWords) {
-        addGenerator({
-          match: ({context}) => context.marker == 'currency' && context.units == words.units && context.value == 1 && context.isAbstract, 
-          apply: ({context, g}) => words.one, uuid
-        });
-        addGenerator({
-          match: ({context}) => context.marker == 'currency' && context.units == words.units && !isNaN(context.value) && (context.value != 1) && context.isAbstract, 
-          apply: ({context, g}) => words.many, uuid
-        })
-    }
-  })
-  config.restart_auto_rebuild()
-  return config
+const initializer = ({config, objects, apis, addWord, addGenerator, baseConfig, uuid}) => {
+  const api = apis('currency')
+  units = api.getUnits()
+  for (word in units) {
+    def = {"id": "currency", "initial": { units: units[word] }, uuid}
+    addWord(word, def)
+  }
+  unitWords = api.getUnitWords();
+  for (let words of unitWords) {
+      addGenerator({
+        match: ({context}) => context.marker == 'currency' && context.units == words.units && context.value == 1 && context.isAbstract, 
+        apply: ({context, g}) => words.one, uuid
+      });
+      addGenerator({
+        match: ({context}) => context.marker == 'currency' && context.units == words.units && !isNaN(context.value) && (context.value != 1) && context.isAbstract, 
+        apply: ({context, g}) => words.many, uuid
+      })
+  }
 }
 
 knowledgeModule({ 
+  config,
+  includes: [numbersKM],
+  api: () => api, 
+  initializer,
+
   module,
   description: 'Ways of specifying currency amount',
-  createConfig,
   test: {
     name: './currency.test.json',
     contents: currency_tests,