tpmkms_4wp 8.0.0-beta.3 → 8.0.0-beta.30

package/common/comparable.js

@@ -45,24 +45,11 @@ let configStruct = {
       bridge: "{ ...next(operator) }" 
     },
   ],
-
-/*
-  generators: [
-    { 
-      where: where(),
-      match: ({context}) => false && context.quantity,
-      apply: ({context, g}) => {
-        const countable = g({ ...context, quantity: undefined, number: context.quanity == 1 ? 'one' : 'many' })
-        return `${g(context.quantity)} ${countable}`
-      }
-    },
-  ]
-*/
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
-  config.add(dialogues(), numbers())
+  await config.add(dialogues, numbers)
   return config
 }
 

package/common/concept.js

@@ -14,7 +14,7 @@ const concept_instance = require('./concept.instance.json')
   plain and regular fries mean the same thing
 */
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config({
     name: 'concept',
     operators: [
@@ -85,7 +85,7 @@ const createConfig = () => {
           }
           return true
         },
-        apply: ({g, context}) => {
+        apply: async ({g, context}) => {
           const modifiers = context.value.map( (p) => p[p.modifiers[0]] )
           context.word = context.value[0].word
           context.value = null
@@ -96,17 +96,21 @@ const createConfig = () => {
             value: modifiers
           }
           context.paraphrase = true
-          return g(context)
+          return await g(context)
         }
       },
       {
         where: where(),
         match: ({context}) => context.marker == 'modifies' && context.paraphrase,
-        apply: ({context, gp, gw}) => {
+        apply: async ({context, gp, gw}) => {
+          const modifiers = []
+          for (modifier of context.modifiers) {
+            modifiers.push(await gp(modifier))
+          }
           if (context.literally) {
-            return `${context.modifiers.map(gp).join(" ")} literally ${gw(context, { number: context.modifiers[context.modifiers.length - 1] })} ${gp(context.concept)}`
+            return `${modifiers.join(" ")} literally ${await gw(context, { number: context.modifiers[context.modifiers.length - 1] })} ${await gp(context.concept)}`
           } else {
-            return `${context.modifiers.map(gp).join(" ")} ${gw(context, { number: context.modifiers[context.modifiers.length - 1] })} ${gp(context.concept)}`
+            return `${modifiers.join(" ")} ${await gw(context, { number: context.modifiers[context.modifiers.length - 1] })} ${await gp(context.concept)}`
           }
         }
         // const chosen = chooseNumber(context, word.singular, word.plural)
@@ -121,10 +125,12 @@ const createConfig = () => {
           let modifiers
           if (context.literally) {
             literalModifiers = context.modifiers[0]
-            modifiers = literalModifiers.value.map(modifier => modifier.value)
+            // modifiers = literalModifiers.value.map(modifier => modifier.value)
+            modifiers = literalModifiers.value
             modifiers = modifiers.slice(0, -1).concat([literalModifiers.marker]).concat(modifiers.slice(-1))
           } else {
-            modifiers = context.modifiers.map(modifier => modifier.value)
+            modifiers = context.modifiers
+            // modifiers = context.modifiers.map(modifier => modifier.value)
           }
           // km('concept').api.kindOfConcept({ config, modifiers, object: context.concept.value || context.concept.marker })
           km('concept').api.kindOfConcept({ config, modifiers, object: context.concept })
@@ -133,9 +139,9 @@ const createConfig = () => {
     ],
   }, module)
   config.stop_auto_rebuild()
-  config.api = new API()
-  config.add(dialogues())
-  config.restart_auto_rebuild()
+  await config.setApi(new API())
+  await config.add(dialogues)
+  await config.restart_auto_rebuild()
   return config
 }
 

package/common/countable.js

@@ -63,21 +63,21 @@ let configStruct = {
     { 
       where: where(),
       match: ({context}) => false && context.quantity,
-      apply: ({context, g}) => {
+      apply: async ({context, g}) => {
         let number = context.quantity.number || 'one'
         if (context.quantity.value > 1) {
           number = 'many'
         }
-        const countable = g({ ...context, quantity: undefined, number})
-        return `${g(context.quantity)} ${countable}`
+        const countable = await g({ ...context, quantity: undefined, number})
+        return `${await g(context.quantity)} ${countable}`
       }
     },
   ]
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
-  config.add(dialogues(), numbers())
+  await config.add(dialogues, numbers)
   return config
 }