tpmkms_4wp 8.0.0-beta.20 → 8.0.0-beta.22

package/common/animals.instance.json

@@ -5555,28 +5555,6 @@
             1
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "mammal",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "is",
@@ -6601,28 +6579,6 @@
             1
           ]
         ],
-        [
-          [
-            "bird",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "bird",
@@ -9873,28 +9829,6 @@
         1
       ]
     ],
-    [
-      [
-        "bird",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "bird",
@@ -10271,28 +10205,6 @@
         1
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "mammal",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "is",

package/common/animals.js

@@ -25,9 +25,9 @@ const template = {
   ],
 }
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config({ name: 'animals' }, module)
-  config.add(hierarchy())
+  await config.add(hierarchy)
   return config
 }
 

package/common/avatar.js

@@ -68,9 +68,9 @@ let configStruct = {
 
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
-  config.add(hierarchy(), emotions())
+  await config.add(hierarchy, emotions)
   return config
 }
 

package/common/characters.js

@@ -173,27 +173,23 @@ const initializeApi = (config, api) => {
 }
 
 
-const createConfig = () => {
-  const timeKM = createTimeKM()
-  const currencyKM = createCurrencyKM()
+const createConfig = async () => {
+  const timeKM = await createTimeKM()
+  const currencyKM = await createCurrencyKM()
   const api = new Sally(timeKM)
   const api2 = new Bob(currencyKM)
 
   const config = new Config(configStruct, module)
   config.stop_auto_rebuild()
-  config.add(gdefaults())
-
-  config.multiApi = initializeApi
-  config.initializer( ({isModule, config, km}) => {
-    if (!isModule) {
-      // config.api = api2
-      // config.api = api
-      const config = km('characters')
-      config.api = api2
-      config.api = api
-    }
-  })
-  config.restart_auto_rebuild()
+  await config.add(gdefaults)
+
+  await config.setMultiApi(initializeApi)
+  const isModule = require.main !== module
+  if (!isModule) {
+    await config.setApi(api2)
+    await config.setApi(api)
+  }
+  await config.restart_auto_rebuild()
   return config
 }
 

package/common/colors.instance.json

@@ -3103,28 +3103,6 @@
             1
           ]
         ],
-        [
-          [
-            "comma",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "comma",
@@ -7076,36 +7054,6 @@
             1
           ]
         ],
-        [
-          [
-            "a",
-            0
-          ],
-          [
-            "comma",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "purple_colors",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "a",
@@ -8942,36 +8890,6 @@
             1
           ]
         ],
-        [
-          [
-            "a",
-            0
-          ],
-          [
-            "comma",
-            0
-          ],
-          [
-            "green_colors",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "a",
@@ -11131,36 +11049,6 @@
             1
           ]
         ],
-        [
-          [
-            "a",
-            0
-          ],
-          [
-            "blue_colors",
-            0
-          ],
-          [
-            "comma",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "a",
@@ -13210,36 +13098,6 @@
             1
           ]
         ],
-        [
-          [
-            "a",
-            0
-          ],
-          [
-            "brown_colors",
-            0
-          ],
-          [
-            "comma",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ]
-        ],
         [
           [
             "a",
@@ -15530,36 +15388,6 @@
             0
           ]
         ],
-        [
-          [
-            "a",
-            0
-          ],
-          [
-            "comma",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            0
-          ],
-          [
-            "unknown",
-            0
-          ],
-          [
-            "unknown",
-            1
-          ],
-          [
-            "white_colors",
-            0
-          ]
-        ],
         [
           [
             "a",
@@ -24128,36 +23956,6 @@
         1
       ]
     ],
-    [
-      [
-        "a",
-        0
-      ],
-      [
-        "blue_colors",
-        0
-      ],
-      [
-        "comma",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "a",
@@ -24302,36 +24100,6 @@
         1
       ]
     ],
-    [
-      [
-        "a",
-        0
-      ],
-      [
-        "brown_colors",
-        0
-      ],
-      [
-        "comma",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "a",
@@ -24476,36 +24244,6 @@
         1
       ]
     ],
-    [
-      [
-        "a",
-        0
-      ],
-      [
-        "comma",
-        0
-      ],
-      [
-        "green_colors",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "a",
@@ -24609,69 +24347,9 @@
         "purple_colors",
         0
       ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
-    [
-      [
-        "a",
-        0
-      ],
-      [
-        "comma",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "purple_colors",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
-    [
-      [
-        "a",
-        0
-      ],
-      [
-        "comma",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
       [
         "unknown",
         1
-      ],
-      [
-        "white_colors",
-        0
       ]
     ],
     [
@@ -25358,28 +25036,6 @@
         1
       ]
     ],
-    [
-      [
-        "comma",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        0
-      ],
-      [
-        "unknown",
-        0
-      ],
-      [
-        "unknown",
-        1
-      ]
-    ],
     [
       [
         "comma",

package/common/colors.js

@@ -46,9 +46,9 @@ const template = {
   ],
 }
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config({ name: 'colors' }, module)
-  config.add(hierarchy())
+  await config.add(hierarchy)
   return config
 }
 

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,7 +125,6 @@ const createConfig = () => {
           let modifiers
           if (context.literally) {
             literalModifiers = context.modifiers[0]
-            debugger
             // modifiers = literalModifiers.value.map(modifier => modifier.value)
             modifiers = literalModifiers.value
             modifiers = modifiers.slice(0, -1).concat([literalModifiers.marker]).concat(modifiers.slice(-1))
@@ -136,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
 }