tpmkms_4wp 9.5.1 → 9.6.0-beta.1

package/common/reports.js

@@ -8,7 +8,7 @@ const { propertyToArray, wordNumber, toEValue } = require('./helpers')
 const { table } = require('table')
 const _ = require('lodash')
 const reports_tests = require('./reports.test.json')
-const reports_instance = require('./reports.instance.json')
+const instance = require('./reports.instance.json')
 const { v4 : uuidv4, validate : validatev4 } = require('uuid');
 
 const template ={
@@ -29,13 +29,13 @@ const template ={
 
 /* START USER DEFINED: this part could be calling your backend db */
 
-const compareValue = (property, v1, v2) => {
+function compareValue(property, v1, v2) {
   return v1[property] < v2[property] ? -1 :
          v1[property] > v2[property] ? 1 :
          0;
 }
 
-const newReport = ({km, objects}) => {
+function newReport({km, objects}) {
   objects.tempReportId += 1
   const reportId = `tempReport${objects.tempReportId}`
   km('stm').api.mentioned({ context: { marker: "report", text: reportId, types: [ "report" ], value: reportId, word: reportId } })
@@ -48,21 +48,23 @@ const newReport = ({km, objects}) => {
   return reportId
 }
 
-const compareObject = (ordering) => (v1, v2) => {
-  for (const order of ordering) {
-    c = compareValue(order[0], v1, v2)
-    if (c == 0) {
-      continue
-    }
-    if (order[1] == 'descending') {
-      c *= -1
+function compareObject(ordering) {
+  return (v1, v2) => {
+    for (const order of ordering) {
+      c = compareValue(order[0], v1, v2)
+      if (c == 0) {
+        continue
+      }
+      if (order[1] == 'descending') {
+        c *= -1
+      }
+      return c
     }
-    return c
+    return 0
   }
-  return 0
 }
 
-const sort = ({ ordering, list }) => {
+function sort({ ordering, list }) {
   return [...list].sort(compareObject(ordering))
 }
 
@@ -84,7 +86,7 @@ const testData2 = {
   ]
 }
 
-const apiTemplate = (marker, testData) => { 
+function apiTemplate(marker, testData) { 
   return {
     getName: () => testData.name,
     getTypes: () => testData.types,
@@ -581,7 +583,7 @@ const config = {
   ],
 };
 
-const initializeApi = (config, api) => {
+function initializeApi(config, api) {
   const type = api.getName();
   config.addWord(type, {"id": "product", "initial": "{ value: '" + type + `', api: '${type}'}` })
   /*
@@ -599,7 +601,7 @@ const initializeApi = (config, api) => {
   // config.addWord(type, {"id": "report", "initial": `${open} value: '${type}' ${close}` })
  }
 
-const initializer = async ({config, objects, km, kms, isModule}) => {
+async function initializer({config, objects, km, kms, isModule}) {
     if (!isModule) {
       await kms.reports.addAPI(api1)
       await kms.reports.addAPI(api2)
@@ -628,8 +630,6 @@ knowledgeModule({
       context: [defaultContextCheck({ extra: ['name', 'index'] })],
     },
   },
-  template: {
-    template,
-    instance: reports_instance
-  },
+  instance,
+  template,
 })

package/common/scorekeeper.js

@@ -6,7 +6,7 @@ const pluralize = require('pluralize')
 //const people = require('./people')
 const properties = require('./properties')
 const scorekeeper_tests = require('./scorekeeper.test.json')
-const scorekeeper_instance = require('./scorekeeper.instance.json')
+const instance = require('./scorekeeper.instance.json')
 
 /*
 const game = {
@@ -19,19 +19,19 @@ const game = {
 const template = {
   configs: [
     // "start a new game\ngreg and jeff",
-    // { query: "start a new game", development: true },
-    // { query: "the winning score is 20", development: true },
+    // { query: "start a new game", scope: "testing" },
+    // { query: "the winning score is 20", scope: "testing" },
   ],
 }
 
-const setPlayers = (objects, config, players) => {
+function setPlayers(objects, config, players) {
   for (const player of players) {
     config.addWord(player, { "id": "player", "initial": `{ value: "${player}" }` })
   }
   objects.players = players;
 }
 
-const setNextPlayer = (km, objects) => {
+function setNextPlayer(km, objects) {
   const turn = {
         marker: "turn",
         default: true,
@@ -46,7 +46,7 @@ const setNextPlayer = (km, objects) => {
   api.mentioned({ context: turn })
 }
 
-const addPlayer = (objects, config, player) => {
+function addPlayer(objects, config, player) {
   config.addWord(player, { "id": "player", "initial": `{ value: "${player}" }` })
   objects.players.push(player);
 }
@@ -335,7 +335,7 @@ const config = {
   ],
 };
 
-const initializer = ({objects, km, isModule}) => {
+function initializer({objects, km, isModule}) {
     objects.players = []
     objects.nextPlayer = undefined;
     setNextPlayer(km, objects);
@@ -373,9 +373,6 @@ knowledgeModule( {
       context: [defaultContextCheck()],
     },
   },
-  template: {
-    template,
-    instance: scorekeeper_instance
-  },
-
+  instance,
+  template,
 })

package/common/sdefaults.js

@@ -1,5 +1,5 @@
 const { flatten, knowledgeModule, where, debug } = require('./runtime').theprogrammablemind
-const { defaultContextCheck } = require('./helpers')
+const { defaultContextCheck, concats } = require('./helpers')
 const sdefaults_tests = require('./sdefaults.test.json')
 
 class API {
@@ -18,12 +18,32 @@ const config = {
   name: 'sdefaults',
   semantics: [
     {
-      notes: 'flatten',
+      notes: 'flatten listable',
       where: where(),
       priority: -1,
       // 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: async ({config, km, context, s}) => {
+        const [flats, wf] = flatten(['list'], context)
+        const evalues = []
+        for (const flat of flats) {
+          const result = await s({ ...flat, flatten: false })
+          if (result.evalue) {
+            evalues.push(result.evalue)
+          }
+        }
+        if (evalues.length > 0) {
+          context.evalue = concats(evalues)
+          context.isResponse = true
+        }
+      }
+    },
+    {
+      notes: 'flatten relation',
+      where: where(),
+      priority: -1,
+      match: ({context}) => context.flatten && context.relation,
       apply: async ({config, km, context, s}) => {
         const [flats, wf] = flatten(['list'], context)
         for (const flat of flats) {

package/common/spock.instance.json

@@ -1405,6 +1405,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -1666,7 +1676,7 @@
             "dead": true,
             "range": {
               "start": 0,
-              "end": 12
+              "end": 2
             },
             "types": [
               "self"

package/common/spock.js

@@ -2,7 +2,7 @@ const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const crew = require('./crew')
 const spock_tests = require('./spock.test.json')
-const spock_instance = require('./spock.instance.json')
+const instance = require('./spock.instance.json')
 
 const template = {
   configs: [
@@ -10,8 +10,7 @@ const template = {
   ]
 };
 
-spock_instance.base = 'crew'
-// config.load(template, spock_instance)
+instance.base = 'crew'
 
 knowledgeModule( {
   config: { name: 'spock', },
@@ -26,8 +25,6 @@ knowledgeModule( {
             context: [defaultContextCheck()],
           },
         },
-  template: {
-    template,
-    instance: spock_instance,
-  },
+  instance,
+  template,
 })