npm - tpmkms - Versions diffs - 8.0.0-beta.20 → 8.0.0-beta.22 - Mend

tpmkms 8.0.0-beta.20 → 8.0.0-beta.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (70) hide show

package/common/animals.instance.json +0 -88
package/common/animals.js +2 -2
package/common/avatar.js +2 -2
package/common/characters.js +12 -16
package/common/colors.instance.json +0 -344
package/common/colors.js +2 -2
package/common/comparable.js +2 -15
package/common/concept.js +13 -10
package/common/countable.js +5 -5
package/common/crew.instance.json +0 -416
package/common/crew.js +4 -4
package/common/currency.js +7 -7
package/common/dialogues.js +52 -121
package/common/dimension.instance.json +4 -4
package/common/dimension.js +12 -12
package/common/dimension.test.json +242 -1248
package/common/edible.instance.json +30 -134
package/common/edible.js +2 -2
package/common/emotions.instance.json +0 -60
package/common/emotions.js +4 -4
package/common/events.js +6 -6
package/common/fastfood.instance.json +929 -1408
package/common/fastfood.js +24 -24
package/common/formulas.instance.json +6 -6
package/common/formulas.js +12 -12
package/common/gdefaults.js +13 -13
package/common/help.js +4 -4
package/common/helpers/concept.js +0 -1
package/common/helpers/dialogues.js +2 -3
package/common/helpers/properties.js +48 -58
package/common/hierarchy.js +12 -16
package/common/javascript.js +8 -8
package/common/kirk.js +2 -2
package/common/length.instance.json +0 -60
package/common/length.js +2 -2
package/common/math.instance.json +12 -12
package/common/math.js +7 -7
package/common/meta.js +22 -29
package/common/negation.js +1 -1
package/common/numbers.js +2 -2
package/common/ordering.js +5 -5
package/common/people.js +4 -5
package/common/percentages.js +4 -4
package/common/pipboy.instance.json +30 -154
package/common/pipboy.js +29 -32
package/common/pokemon.instance.json +0 -44
package/common/pokemon.js +4 -4
package/common/pos.js +1 -1
package/common/pressure.js +2 -2
package/common/properties.js +52 -125
package/common/punctuation.js +2 -2
package/common/reports.instance.json +1 -1
package/common/reports.js +59 -76
package/common/scorekeeper.js +13 -21
package/common/sdefaults.js +5 -5
package/common/sizeable.js +2 -2
package/common/spock.js +2 -2
package/common/stgame.js +13 -9
package/common/stm.js +4 -4
package/common/tell.js +10 -10
package/common/temperature.instance.json +0 -60
package/common/temperature.js +2 -2
package/common/tester.js +2 -2
package/common/testing.js +5 -5
package/common/time.js +7 -7
package/common/tokenize.js +1 -1
package/common/ui.js +9 -9
package/common/weight.js +2 -2
package/common/yesno.js +1 -1
package/package.json +2 -2

package/common/animals.instance.json CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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
 }