tpmkms_4wp 8.0.0-beta.4 → 8.0.0-beta.40

package/common/reports.js

@@ -38,7 +38,7 @@ const compareValue = (property, v1, v2) => {
 const newReport = ({km, objects}) => {
   objects.tempReportId += 1
   const reportId = `tempReport${objects.tempReportId}`
-  km('stm').api.mentioned({ marker: "report", text: reportId, types: [ "report" ], value: reportId, word: reportId })
+  km('stm').api.mentioned({ context: { marker: "report", text: reportId, types: [ "report" ], value: reportId, word: reportId } })
   // name to listing
   objects.listings[reportId] = {
       columns: ['name', 'supplier'],
@@ -100,7 +100,7 @@ const apiTemplate = (marker, testData) => {
     },
     productGenerator: {
       match: ({context}) => context.marker == marker && context.isInstance, 
-      apply: ({g, context}) => `${context.name}`,
+      apply: ({context}) => `${context.name}`,
     }
   }
 }
@@ -190,9 +190,9 @@ let configStruct = {
         bridge: "{ ...next(operator), on: { marker: 'report', pullFromContext: true }, from: after[0], to: after[1] }",
         directionBridge: "{ ...next(operator), on: { marker: 'report', pullFromContext: true }, directionBridge: true, from: after[0], to: after[1] }",
 
-        generatorp: ({context, gp}) => `move ${gp(context.from)} ${gp(context.to)}`,
-        semantic: ({context, e, objects, kms, insert}) => {
-          const report = e(context.on)
+        generatorp: async ({context, gp}) => `move ${await gp(context.from)} ${await gp(context.to)}`,
+        semantic: async ({context, e, objects, kms, insert}) => {
+          const report = await e(context.on)
           const id = report.value.value
           const listing = objects.listings[id]
 
@@ -218,9 +218,9 @@ let configStruct = {
         where: where(),
         id: "remove", level: 0, 
         bridge: "{ ...next(operator), on: { marker: 'report', pullFromContext: true }, removee: after[0] }",
-        generatorp: ({context, gp}) => `remove ${gp(context.removee)}`,
-        semantic: ({context, e, kms, insert, objects}) => {
-          const report = e(context.on)
+        generatorp: async ({context, gp}) => `remove ${await gp(context.removee)}`,
+        semantic: async ({context, e, kms, insert, objects}) => {
+          const report = await e(context.on)
           const id = report.value.value
           const listing = objects.listings[id]
           const column = context.removee.index.value
@@ -232,7 +232,7 @@ let configStruct = {
         where: where(),
         id: "column", level: 0, 
         bridge: "{ ...next(operator), index: after[0] }",
-        generatorp: ({context, gp}) => `column ${gp(context.index)}`,
+        generatorp: async ({context, gp}) => `column ${await gp(context.index)}`,
     },
     { id: "ordering", level: 0, bridge: "{ ...next(operator) }" },
     { id: "direction", level: 0, bridge: "{ ...next(operator) }" },
@@ -248,10 +248,10 @@ let configStruct = {
           {
             where: where(),
             match: ({context}) => context.marker == 'report' && context.describe,
-            apply: ({context, apis, gp, gs, objects}) => {
+            apply: async ({context, apis, gs, objects}) => {
               const listings = objects.listings[context.value]
               // {"type":"tables","columns":["name"],"ordering":[]}
-              return `for ${listings.api}, showing the ${wordNumber('property', listings.columns.length > 1)} ${gs(listings.columns, ' ', ' and ')} as ${listings.type}`
+              return `for ${listings.api}, showing the ${wordNumber('property', listings.columns.length > 1)} ${await gs(listings.columns, ' ', ' and ')} as ${listings.type}`
             }
           },
           {
@@ -297,8 +297,8 @@ let configStruct = {
       level: 0,
       isA: ['verby'],
       bridge: "{ ...next(operator), report: after[0] }",
-      "generatorp": ({g, context}) => `describe ${g(context.report)}`,
-      "generatorr": ({gp, context, apis, objects, config}) => {
+      "generatorp": async ({g, context}) => `describe ${await g(context.report)}`,
+      "generatorr": async ({gp, context, apis, objects, config}) => {
                     const reports = propertyToArray(context.report)
                     let response = ''
                     for (let report of reports) {
@@ -308,11 +308,11 @@ let configStruct = {
                             continue
                           }
                           const description = {describe: true, word: reportId, types:["report"], value: reportId, text: reportId, marker: "report"}
-                          response += `${reportId}: ${gp(description)}\n`
+                          response += `${reportId}: ${await gp(description)}\n`
                         }
                       } else {
                         // response += `${gp(report)}: ${describe(report.value)}\n`
-                        response += `${gp(report)}: ${gp({ ...report, describe: true })}\n`
+                        response += `${await gp(report)}: ${await gp({ ...report, describe: true })}\n`
                       }
                     }
                     return response
@@ -327,21 +327,23 @@ let configStruct = {
       id: "call", 
       level: 0, 
       bridge: "{ ...next(operator), namee: after[0], name: after[1] }",
-      generatorp: ({g, context}) => `call ${g(context.namee)} ${g(context.name)}`,
-      semantic: ({g, context, objects, e, config, km}) => {
-        const namee = e(context.namee).evalue
+      generatorp: async ({g, context}) => `call ${await g(context.namee)} ${await g(context.name)}`,
+      semantic: async ({context, objects, e, config, km}) => {
+        const namee = (await e(context.namee)).evalue
         const id = namee.value
         const listing = objects.listings[id]
         const name = context.name.text
         objects.listings[name] = {...listing}
         config.addWord(`${name}`,  { id: 'report', initial: `{ value: "${name}" }` })
         km('stm').api.mentioned({
+          context: {
                   marker: "report",
                   text: name,
                   types: [ "report" ],
                   value: id,
                   word: name
-               })
+               }
+        })
       }
     },
   ],
@@ -383,41 +385,23 @@ let configStruct = {
 
   priorities: [
     { "context": [['ordering', 0], ['articlePOS', 0], ], "choose": [0] },
-  /*
-    [['the', 0], ['ordering', 0]],
-    [['listAction', 0], ['cost', 1]],
-    [['answer', 0], ['listAction', 0], ['the', 0]],
-    [['answer', 0], ['listAction', 0], ['the', 0], ['with', 0]],
-  */
   ],
   generators: [
     { 
       notes: 'paraphrase show',
       where: where(),
       match: ({context, objects}) => context.marker == 'show' && context.paraphrase,
-      apply: ({gs, gsp, gp, e, apis, objects, context}) => {
+      apply: async ({gs, gp, e, apis, objects, context}) => {
         if (context.report) {
-          return `show ${gp(context.report)}`
+          return `show ${await gp(context.report)}`
         } else {
-          const report = e(context.on)
+          const report = await e(context.on)
           const id = report.value.value
           const listing = objects.listings[id]
-          return `the properties being shown are ${gs(listing.columns, ', ', ' and ')}`
+          return `the properties being shown are ${await gs(listing.columns, ', ', ' and ')}`
         }
       }
     },
-    /*
-    { 
-      where: where(),
-      match: ({context, isA}) => isA(context.marker, 'reportAction') && context.on && context.isResponse, 
-      apply: ({context, g}) => `${g({...context, on: undefined})} on ${g(context.on)}` 
-    },
-    { 
-      where: where(),
-      match: ({context, isA}) => isA(context.marker, 'reportAction') && context.on && context.paraphrase, 
-      apply: ({context, g}) => `${g({...context, on: undefined})} on ${g(context.on)}` 
-    },
-    */
     { 
       where: where(),
       match: ({context}) => context.marker == 'product' && !context.isInstance, 
@@ -426,12 +410,12 @@ let configStruct = {
     { 
       where: where(),
       match: ({context}) => context.marker == 'listAction' && context.paraphrase, 
-      apply: ({g, context}) => `list ${g(context.what)}` 
+      apply: async ({g, context}) => `list ${await g(context.what)}` 
     },
     { 
       notes: 'show the results as a sentence',
       where: where(),
-      match: ({context, objects, apis}) => {
+      match: ({context, objects}) => {
         if (!(context.marker == 'listAction' && context.isResponse)) {
           return false
         }
@@ -439,15 +423,15 @@ let configStruct = {
           return true
         }
       },
-      apply: ({g, gs, context, objects}) => {
+      apply: async ({g, gs, context, objects}) => {
         const listing = objects.listings[context.id]
-        return `the ${g(listing.api)} are ${gs(context.listing, ' ', ' and ')}` 
+        return `the ${await g(listing.api)} are ${await gs(context.listing, ' ', ' and ')}` 
       }
     },
     { 
       notes: 'show the results as a table',
       where: where(),
-      match: ({context, objects, apis}) => {
+      match: ({context, objects}) => {
         if (!(context.marker == 'listAction' && context.isResponse && !context.paraphrase)) {
           return false
         }
@@ -455,7 +439,7 @@ let configStruct = {
           return true
         }
       }, 
-      apply: ({g, gs, objects, context, e, kms, apis}) => {
+      apply: async ({objects, context, e, kms}) => {
         let report = '';
         const products = context.listing
         const columns = objects.listings[context.id].columns
@@ -463,21 +447,21 @@ let configStruct = {
           kms.stm.api.setVariable('price', { marker: 'price', value: 23 })
           kms.stm.api.setVariable('quantity', { marker: 'quantity', value: 3 })
           const c1 = { marker: 'worth', value: 'worth' }
-          r1 = toEValue(e(c1));
-          r2 = e({ marker: 'supplier', value: 'supplier' })
-          // api.listing.api = context.what.api
+          r1 = toEValue(await e(c1));
+          r2 = await e({ marker: 'supplier', value: 'supplier' })
         }
-        const data = products.map( (product) => {
+        const data = []
+        for (const product of products) {
           const row = []
           for (let p of Object.keys(product)) {
             kms.stm.api.setVariable(p, { marker: p, value: product[p] })
           }
           for (let property of columns) {
-            const value = toEValue(e({ marker: property, value: property }));
+            const value = toEValue(await e({ marker: property, value: property }));
             row.push(value)
           }
-          return row
-        });
+          data.push(row)
+        };
         report += table([columns].concat(data))
         return report
       }
@@ -485,12 +469,12 @@ let configStruct = {
     { 
       where: where(),
       match: ({context}) => context.marker == 'answer' && context.paraphrase, 
-      apply: ({g, context}) => `answer with ${context.type}` 
+      apply: ({context}) => `answer with ${context.type}` 
     },
     { 
       where: where(),
       match: ({context}) => context.marker == 'answer' && !context.paraphrase, 
-      apply: ({g, context}) => `answering with ${context.type}` 
+      apply: ({context}) => `answering with ${context.type}` 
     },
   ],
 
@@ -499,13 +483,13 @@ let configStruct = {
       where: where(),
       notes: 'handle show semantic',
       match: ({context}) => context.marker == 'show',
-      apply: ({context, e, km, kms, apis, insert, config, objects}) => {
+      apply: async ({context, e, km, kms, apis, insert, config, objects}) => {
         if (context.report) {
           const values = propertyToArray(context.report)
           const responses = []
           for (let value of values) {
             if (!value.value || value.pullFromContext) {
-              value = e(value)
+              value = await e(value)
             }
             let id = value.value
             if (value.evalue) {
@@ -528,7 +512,7 @@ let configStruct = {
           }
           context.isResponse = true
         } else {
-          const report = e(context.on)
+          const report = await e(context.on)
           const id = report.value.value
           const listing = objects.listings[id]
           const values = propertyToArray(context.properties)
@@ -551,11 +535,11 @@ let configStruct = {
       notes: 'get the report data',
       where: where(),
       match: ({context}) => context.marker == 'listAction', 
-      apply: ({context, e, objects, apis, km, config}) => {
+      apply: async ({context, e, objects, apis, km, config}) => {
         //const name = '***current***'
         if (context.api) {
           // id = newReport({km, objects})
-          const report = e({ marker: 'report', pullFromContext: true })
+          const report = await e({ marker: 'report', pullFromContext: true })
           const id = report.value.value
           const listing = objects.listings[id]
           listing.api = context.api
@@ -563,7 +547,7 @@ let configStruct = {
           context.id = id
           context.listing = apis[listing.api].getAllProducts(listing)
         } else {
-          const report = e({ marker: 'report', pullFromContext: true })
+          const report = await e({ marker: 'report', pullFromContext: true })
           const id = report.evalue.value
           const listing = objects.listings[id]
           const api = apis[listing.api]
@@ -573,16 +557,16 @@ let configStruct = {
         context.isResponse = true
       },
     },
-    [
-      ({context}) => context.marker == 'answer', 
-      ({e, context, objects, kms, insert}) => {
-        const report = e({ marker: 'report', pullFromContext: true })
+    {
+      match: ({context}) => context.marker == 'answer', 
+      apply: async ({e, context, objects, kms, insert}) => {
+        const report = await e({ marker: 'report', pullFromContext: true })
         const id = report.value.value
         const listing = objects.listings[id]
         listing.type = context.type
         kms.events.api.happens(insert, { marker: "changes", level: 1, changeable: { marker: 'report', pullFromContext: true } })
       }
-    ],
+    },
   ],
 };
 
@@ -604,18 +588,16 @@ const initializeApi = (config, api, km) => {
   // config.addWord(type, {"id": "report", "initial": `${open} value: '${type}' ${close}` })
  }
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
   config.stop_auto_rebuild()
-  config.add(currencyKM(), helpKM(), math(), events())
-  config.multiApi = initializeApi
+  await config.add(currencyKM, helpKM, math, events)
+  await config.setMultiApi(initializeApi)
   // mode this to non-module init only
-  config.initializer(({config, objects, km, isModule}) => {
+  await config.initializer(async ({config, objects, km, kms, isModule}) => {
     if (!isModule) {
-      km('reports').addAPI(api1)
-      km('reports').addAPI(api2)
-      // config.addAPI(api1)
-      // config.addAPI(api2)
+      await kms.reports.addAPI(api1)
+      await kms.reports.addAPI(api2)
     }
     objects.tempReportId = 0
     objects.listings = {
@@ -625,7 +607,7 @@ const createConfig = () => {
       objects.listings[id].api = 'clothes'
     }
   })
-  config.restart_auto_rebuild()
+  await config.restart_auto_rebuild()
   return config
 }
 

package/common/scorekeeper.js

@@ -43,7 +43,7 @@ const setNextPlayer = (km, objects) => {
         word: "turn"
       }
   const api = km('stm').api
-  api.mentioned(turn)
+  api.mentioned({ context: turn })
 }
 
 const addPlayer = (objects, config, player) => {
@@ -122,36 +122,29 @@ let configStruct = {
     {
       where: where(),
       match: ({context, hierarchy}) => hierarchy.isA(context.marker, 'is') && context.isResponse && context.two && context.two.marker == 'next',
-      apply: ({context, g}) => {
+      apply: async ({context, g}) => {
                 const response = context.evalue;
                 const concept = response.two;
                 concept.paraphrase = true
                 concept.isSelf = true
-                const instance = g(concept.evalue)
+                const instance = await g(concept.evalue)
                 return instance
              }
     },
     {
       where: where(),
       match: ({context}) => context.marker == 'point' && context.isResponse && context.amount,
-      apply: ({context, g}) => `${g(context.amount)} points` 
+      apply: async ({context, g}) => `${await g(context.amount)} points` 
     },
     {
       where: where(),
       match: ({context}) => context.marker == 'scored' && context.paraphrase,
-      apply: ({context, g}) => `${g(context.player)} got ${g(context.points)}`
+      apply: async ({context, g}) => `${await g(context.player)} got ${await g(context.points)}`
     },
-    /*
-    {
-      where: where(),
-      match: ({context}) => context.marker == 'enumeration' && context.paraphrase,
-      apply: ({context, g}) => `${g(context.concept)} are ${g(context.items)}`
-    },
-    */
     {
       where: where(),
       match: ({context}) => context.marker == 'start' && context.paraphrase,
-      apply: ({context, g}) => `start ${g(context.arg)}`
+      apply: async ({context, g}) => `start ${await g(context.arg)}`
     },
 
   ],
@@ -161,7 +154,6 @@ let configStruct = {
       where: where(),
       match: ({context}) => context.marker == 'player' && context.same,
       apply: ({context, objects, config, km}) => {
-        //objects.players = context.same.value.map( (props) => props.value )
         const players = context.same.value.map( (props) => props.value )
         setPlayers(objects, config, players)
         for (let player of objects.players) {
@@ -205,11 +197,11 @@ let configStruct = {
               matchq: ({objects}) => objects.players.length == 0,
               applyq: () => 'who are the players?',
               matchr: ({context}) => context.marker == 'list',
-              applyr: ({context, gs, objects, config}) => {
+              applyr: async ({context, gs, objects, config}) => {
                         const players = context.value.map( (player) => player.value )
                         setPlayers(objects, config, players)
                         objects.allPlayersAreKnown = true;
-                        context.verbatim = `The players are ${gs(objects.players, ' ', ' and ')}`
+                        context.verbatim = `The players are ${await gs(objects.players, ' ', ' and ')}`
                         context.isResponse = true;
                       }
             }
@@ -242,12 +234,12 @@ let configStruct = {
     {
       where: where(),
       match: ({context}) => context.marker == 'player' && context.evaluate && context.pullFromContext,
-      apply: ({context, objects, gs}) => {
+      apply: async ({context, objects, gs}) => {
         const players = objects.players
         if (players.length == 0) {
           context.evalue = 'no one'
         } else {
-          context.evalue = gs(players, ' ', ' and ')
+          context.evalue = await gs(players, ' ', ' and ')
         }
       }
     },
@@ -350,11 +342,11 @@ let configStruct = {
   ],
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
   config.stop_auto_rebuild()
-  config.add(dialogues(), numbers(), properties())
-  config.initializer( ({objects, km, isModule}) => {
+  await config.add(dialogues, numbers, properties)
+  await config.initializer( ({objects, km, isModule}) => {
     objects.players = []
     objects.nextPlayer = undefined;
     setNextPlayer(km, objects);
@@ -362,7 +354,7 @@ const createConfig = () => {
     objects.winningScore = null
     objects.allPlayersAreKnown = false;
   })
-  config.restart_auto_rebuild()
+  await config.restart_auto_rebuild()
   return config
 }
 

package/common/sdefaults.js

@@ -12,17 +12,27 @@ let configStruct = {
       // match: ({context}) => context.flatten || context.listable && context.value[0].flatten,
       match: ({context}) => context.flatten || context.listable && context.value.some((value) => value.flatten),
       // match: ({context}) => context.flatten || context.listable || (Array.isArray(context.value) && context.value.some((value) => value.flatten)),
-      apply: ({config, km, context, s}) => {
+      apply: async ({config, km, context, s}) => {
         const [flats, wf] = flatten(['list'], context)
         for (let flat of flats) {
-          s({ ...flat, flatten: false })
+          await s({ ...flat, flatten: false })
         }
       }
     },
+    {
+      notes: 'semanticIsEvaluate',
+      where: where(),
+      priority: -1,
+      match: ({context}) => context.semanticIsEvaluate,
+      apply: async ({context, e}) => {
+        context.value = await e({ ...context, semanticIsEvaluate: false })
+        context.isResponse
+      }
+    },
   ],
 };
 
-const createConfig = () => new Config(configStruct, module)
+const createConfig = async () => new Config(configStruct, module)
 
 knowledgeModule({ 
   module,

package/common/sizeable.js

@@ -52,9 +52,9 @@ let configStruct = {
   ]
 };
 
-const createConfig = () => {
+const createConfig = async () => {
   const config = new Config(configStruct, module)
-  config.add(dialogues(), numbers())
+  await config.add(dialogues, numbers)
   return config
 }