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

package/common/currency.js

@@ -90,11 +90,11 @@ let configStruct = {
   ],
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
   config.stop_auto_rebuild()
-  config.add(numbersKM())
-  config.api = api
+  await config.add(numbersKM)
+  await config.setApi(api)
   config.initializer( ({config, objects, apis, addWord, addGenerator, baseConfig, uuid}) => {
     // const api = config.km('currency').api
     // const api = kms.currency.api
@@ -128,7 +128,7 @@ const createConfig = () => {
         })
     }
   })
-  config.restart_auto_rebuild()
+  await config.restart_auto_rebuild()
   return config
 }
 

package/common/dialogues.js

@@ -3,6 +3,7 @@ const meta = require('./meta.js')
 const gdefaults = require('./gdefaults.js')
 const sdefaults = require('./sdefaults.js')
 const pos = require('./pos.js')
+const negation = require('./negation.js')
 const punctuation = require('./punctuation.js')
 const stm = require('./stm.js')
 const _ = require('lodash')
@@ -59,7 +60,6 @@ let configStruct = {
     "(<the|> ([theAble|]))",
     "(<a|a,an> ([theAble|]))",
     // "([unknown])",
-    "([not] ([notAble|]))",
 
     "([be] ([briefOrWordy|]))",
 
@@ -172,9 +172,6 @@ let configStruct = {
     { id: "be", level: 0, bridge: "{ ...next(operator), type: after[0] }" },
     { id: "briefOrWordy", level: 0, bridge: "{ ...next(operator) }" },
 
-    { id: "notAble", level: 0, bridge: "{ ...next(operator) }" },
-    { id: "not", level: 0, bridge: "{ ...after, negated: true }" },
-
     { id: "yesno", level: 0, bridge: "{ ...next(operator) }" },
     { id: "canBeQuestion", level: 0, bridge: "{ ...next(operator) }" },
     { id: "canBeQuestion", level: 1, bridge: "{ ...next(operator) }" },
@@ -337,7 +334,6 @@ let configStruct = {
     // ['questionMark', 'isEd'],
     ['a', 'articlePOS'],
     ['the', 'articlePOS'],
-    ['unknown', 'notAble'],
     ['unknown', 'theAble'],
     ['unknown', 'queryable'],
     ['it', 'queryable'],
@@ -438,18 +434,6 @@ let configStruct = {
       }
     },
 
-    {
-      where: where(),
-      notes: 'paraphrase a negation',
-      match: ({context, hierarchy}) => hierarchy.isA(context.marker, 'notAble') && context.negated, // && !context.isQuery && !context.paraphrase && context.value,
-      apply: ({context, g}) => {
-        context.negated = false
-        const result = g(context.value)
-        context.negated = true
-        return `not ${result}`
-      }
-    },
-
     {
       where: where(),
       notes: 'paraphrase a queryable response',
@@ -1018,11 +1002,11 @@ const getAsk = (config) => (uuid) => {
 }
 
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
   config.stop_auto_rebuild()
-  config.api = api
-  config.add(gdefaults(), sdefaults(), pos(), stm(), meta(), punctuation())
+  await config.setApi(api)
+  await config.add(gdefaults, sdefaults, pos, negation, stm, meta, punctuation)
   config.initializer( ({objects, config, isModule}) => {
     /* TODO add this beck in. some stuff from config needs to be here
     config.addArgs((args) => ({ 
@@ -1063,7 +1047,7 @@ const createConfig = () => {
       config.addWord("doesable", { id: "doesAble", "initial": "{}" })
     }
   })
-  config.restart_auto_rebuild()
+  await config.restart_auto_rebuild()
   return config
 }