tpmkms_4wp 9.5.1-beta.9 → 9.6.0-beta.0

package/common/crew.js

@@ -3,7 +3,7 @@ const { defaultContextCheck } = require('./helpers')
 const avatar = require('./avatar')
 const animals = require('./animals')
 const crew_tests = require('./crew.test.json')
-const crew_instance = require('./crew.instance.json')
+const instance = require('./crew.instance.json')
 const pluralize = require('pluralize')
 
 const template = {
@@ -56,7 +56,6 @@ function initializer({config, apis}) {
                 config }) 
 }
 
-// config.load(template, crew_instance)
 knowledgeModule( {
   config: { name: 'crew', },
   includes: [avatar, animals],
@@ -71,8 +70,6 @@ knowledgeModule( {
             context: [defaultContextCheck()],
           }
         },
-  template: {
-    template,
-    instance: crew_instance,
-  },
+  instance,
+  template,
 })

package/common/dateTimeSelectors.instance.json

@@ -68,11 +68,11 @@
       "semantics": [
         {
           "match": "({context, isA}) => context.evaluate && onOrIs('dayAfterDate', context)",
-          "apply": "async ({context, isProcess, isTest, kms, isA, e}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = afterOrIs('dayAfterDate', context)\n              const afterISO = (await e(date.after)).evalue\n              const day_ordinal = date.day.day_ordinal\n              const ordinal = date.day.ordinal.value\n              context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
+          "apply": "async ({context, isProcess, isTest, kms, isA, e}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = afterOrIs('dayAfterDate', context)\n              const afterISO = (await e(date.after)).evalue\n              const day_ordinal = date.day.day_ordinal\n              const ordinal = date.day.ordinal.value\n              context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
         },
         {
           "match": "({context, isA}) => context.evaluate && onOrIs('dayOfMonth', context)",
-          "apply": "({context, isProcess, isTest, kms, isA}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = onOrIs('dayOfMonth', context)\n              context.evalue = dateTimeSelectors_helpers.getNthDayOfMonth(removeDatesSuffix(date.day.value), date.day.ordinal.value || 1, removeDatesSuffix(date.month.value), now)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
+          "apply": "({context, isProcess, isTest, kms, isA}) => {\n            try {\n              const now = kms.time.api.now()\n              const date = onOrIs('dayOfMonth', context)\n              context.evalue = dateTimeSelectors_helpers.getNthDayOfMonth(removeDatesSuffix(date.day.value), date.day.ordinal.value || 1, removeDatesSuffix(date.month.value), now)\n            } catch ( e ) {\n              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`\n            }\n          }"
         },
         {
           "match": "({context, isA}) => {\n            if (!context.evaluate) {\n              return false\n            }\n            if (isA(context.marker, 'onDateValue_dates')) {\n              return true\n            }\n            if (isA(context.marker, 'dateTimeSelector')) {\n              return true\n            }\n          }",

package/common/dateTimeSelectors.js

@@ -1,7 +1,7 @@
 const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const dateTimeSelectors_tests = require('./dateTimeSelectors.test.json')
-const dateTimeSelectors_instance = require('./dateTimeSelectors.instance.json')
+const instance = require('./dateTimeSelectors.instance.json')
 const dates = require('./dates')
 const time = require('./time')
 const dateTimeSelectors_helpers = require('./helpers/dateTimeSelectors')
@@ -28,7 +28,7 @@ function instantiate(kms, isA, isProcessOrTest, dateTimeSelector) {
     const now = kms.time.api.now()
     return dateTimeSelectors_helpers.instantiate(isA, now, dateTimeSelector)
   } catch ( e ) {
-    return `Implement instatiate for this type of date. See the dateTimeSelectors KM ${where()}`
+    return `Implement instatiate for this type of date, ${dateTimeSelector.marker}. See the dateTimeSelectors KM ${where()}, ${e}\n${e.stack}`
   }
 }
 
@@ -104,7 +104,7 @@ const template = {
               const ordinal = date.day.ordinal.value
               context.evalue = dateTimeSelectors_helpers.getNthWeekdayAfterDate(afterISO, day_ordinal, ordinal)
             } catch ( e ) {
-              context.evalue = `Implement instatiate for this type of date. See the dateTimeSelectors KM ${where()}. ${e}`
+              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`
             }
           },
         },
@@ -116,7 +116,7 @@ const template = {
               const date = onOrIs('dayOfMonth', context)
               context.evalue = dateTimeSelectors_helpers.getNthDayOfMonth(removeDatesSuffix(date.day.value), date.day.ordinal.value || 1, removeDatesSuffix(date.month.value), now)
             } catch ( e ) {
-              context.evalue = `Implement instatiate for this type of date. See the dateTimeSelectors KM ${where()}. ${e}`
+              context.evalue = `Implement instatiate for this type of date, ${context.marker}. See the dateTimeSelectors KM ${where()}. ${e}`
             }
           },
         },
@@ -160,9 +160,6 @@ knowledgeModule( {
       ],
     }
   },
-  template: {
-    template,
-    instance: dateTimeSelectors_instance,
-  },
-
+  instance,
+  template,
 })