tpmkms_4wp 8.0.0-beta.3 → 8.0.0-beta.31

package/common/spock.js

@@ -10,9 +10,9 @@ const template = {
   ]
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config({ name: 'spock', }, module)
-  config.add(crew())
+  await config.add(crew)
   return config
 }
 

package/common/stgame.js

@@ -62,22 +62,26 @@ class SpockAPI {
 }
 
 
-const createConfig = () => {
-  const characters = createCharacters()
-  const kirk = createKirk()
-  const spock = createSpock()
-  characters.api = new KirkAPI(kirk);
-  characters.api = new SpockAPI(spock);
+const createConfig = async () => {
   const config = new Config({ 
       name: 'stgame', 
       operators: [ "([a])" ],
       bridges: [ { id: 'a', level: 0, bridge: "{ ...next(operator) }" } ],
       words: {"?": [{"id": "a", "initial": "{}" }]},
   }, module)
+
+  const createCharactersHelper = async () => {
+    const characters = await createCharacters()
+    const kirk = await createKirk()
+    const spock = await createSpock()
+    await characters.setApi(new KirkAPI(kirk))
+    await characters.setApi(new SpockAPI(spock))
+    return characters
+  }
   config.stop_auto_rebuild()
-  config.api = api
-  config.add(characters)
-  config.restart_auto_rebuild()
+  await config.setApi(api)
+  await config.add(createCharactersHelper)
+  await config.restart_auto_rebuild()
   return config
 }
 

package/common/stm.js

@@ -99,11 +99,11 @@ class API {
 
 const api = new API()
 
-let createConfig = () => {
+let createConfig = async () => {
   const config = new Config({ name: 'stm' }, module)
   config.stop_auto_rebuild()
 
-  config.initializer( ({config}) => {
+  await config.initializer( ({config}) => {
     config.addArgs(({kms}) => ({
       mentioned: (context) => {
         kms.stm.api.mentioned(context)
@@ -113,9 +113,9 @@ let createConfig = () => {
       },
     }))
   })
-  config.api = api
+  await config.setApi(api)
 
-  config.restart_auto_rebuild()
+  await config.restart_auto_rebuild()
   return config
 }
 

package/common/tell.js

@@ -66,25 +66,25 @@ let configStruct = {
     {
       where: where(),
       match: ({context}) => context.marker == 'tell',
-      apply: ({context, g}) => `tell ${g(context.target)} ${g(context.info.info)} ${g(context.event)}`
+      apply: async ({context, g}) => `tell ${await g(context.target)} ${await g(context.info.info)} ${await g(context.event)}`
     },
     {
       where: where(),
       match: ({context}) => context.marker == 'info',
-      apply: ({context, g}) => context.info
+      apply: ({context}) => context.info
     },
     {
       where: where(),
       match: ({context}) => context.marker == 'event' && context.paraphrase,
-      apply: ({context, g}) => 'event'
+      apply: ({context}) => 'event'
     },
   ],
   semantics: [
     {
       where: where(),
       match: ({context, hierarchy}) => !context.happening && hierarchy.isA(context.marker, 'tell'),
-      apply: ({context, api, s, config}) => {
-        const result = config.processContext({ ...context.event, happening: true })
+      apply: async ({context, api, config}) => {
+        const result = await config.processContext({ ...context.event, happening: true })
         const event = result.context.event
         if (event) {
           event.then( (result) => {
@@ -98,12 +98,12 @@ let configStruct = {
   ],
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
   config.stop_auto_rebuild() 
-  config.api = api
-  config.add(dialogues())
-  config.initializer( ({config, isModule}) => {
+  await config.setApi(api)
+  await config.add(dialogues)
+  await config.initializer( ({config, isModule}) => {
       if (!isModule) {
         config.addSemantic({
           match: ({context, hierarchy}) => context.happening && hierarchy.isA(context.marker, 'event'),
@@ -113,7 +113,7 @@ const createConfig = () => {
         })
       }
     })
-  config.restart_auto_rebuild()
+  await config.restart_auto_rebuild()
   return config
 }