tpmkms_4wp 9.1.1-beta.9 → 9.2.0

package/common/tester.js

@@ -3,13 +3,20 @@ const { defaultContextCheck } = require('./helpers')
 const tester_tests = require('./tester.test.json')
 const ArgumentParser = require('argparse').ArgumentParser
 
+const testModuleNameFn = () => {
+  const parser = new ArgumentParser({ description: 'Get test module name' })
+  parser.add_argument('-tmn', '--testModuleName', { help: 'List of module to run the tests from' })
+  const [args, unknown] = parser.parse_known_args()
+  return args.testModuleName
+}
+const testModuleName = testModuleNameFn()
+
 const parser = new ArgumentParser({
   description: 'Test modules together'
 })
 
 parser.add_argument('-m', '--modules', { help: 'List of modules to load' })
 const [args, unknown] = parser.parse_known_args()
-
 process.argv = [process.argv[0], process.argv[1], ...unknown]
 
 const createConfig = async () => {
@@ -29,12 +36,26 @@ const createConfig = async () => {
 global.theprogrammablemind = {
   loadForTesting: {}
 }
+
 const includes = args.modules.split(',').map((module) => {
   global.theprogrammablemind.loadForTesting[module] = true
   const km = require(`./${module}`)
   return km
 })
 
+const fixtures = async (args) => {
+  const { config, kms, apis } = args;
+  if (kms[testModuleName].testConfig?.fixtures) {
+    const fixtures = kms.menus.testConfig?.fixtures
+    kms.menus.testConfig.fixtures = null
+    const testModuleApi = apis(testModuleName)
+    const objects = testModuleApi._objects
+    args.objects = objects
+    await fixtures({ ...args, objects, api: testModuleApi })
+    kms.menus.testConfig.fixtures = fixtures
+  }
+}
+
 knowledgeModule({
   config: { name: 'tester' },
   includes,
@@ -43,6 +64,7 @@ knowledgeModule({
   description: 'Testing modules loaded together',
   test: {
     name: './tester.test.json',
-    contents: tester_tests
+    contents: tester_tests,
+    fixtures,
   },
 })

package/common/ui.instance.json

@@ -29,6 +29,46 @@
           "article",
           false
         ],
+        [
+          "ascending",
+          "hierarchyAble",
+          false
+        ],
+        [
+          "ascending",
+          "isEdee",
+          false
+        ],
+        [
+          "ascending",
+          "isEder",
+          false
+        ],
+        [
+          "ascending",
+          "object",
+          false
+        ],
+        [
+          "ascending",
+          "property",
+          false
+        ],
+        [
+          "ascending",
+          "queryable",
+          false
+        ],
+        [
+          "ascending",
+          "sort_ordering",
+          false
+        ],
+        [
+          "ascending",
+          "theAble",
+          false
+        ],
         [
           "between",
           "preposition",
@@ -49,6 +89,11 @@
           "verb",
           false
         ],
+        [
+          "comparable",
+          "theAble",
+          false
+        ],
         [
           "concept",
           "queryable",
@@ -59,11 +104,56 @@
           "theAble",
           false
         ],
+        [
+          "condition",
+          "condition",
+          false
+        ],
         [
           "countable",
           "hierarchyAble",
           false
         ],
+        [
+          "descending",
+          "hierarchyAble",
+          false
+        ],
+        [
+          "descending",
+          "isEdee",
+          false
+        ],
+        [
+          "descending",
+          "isEder",
+          false
+        ],
+        [
+          "descending",
+          "object",
+          false
+        ],
+        [
+          "descending",
+          "property",
+          false
+        ],
+        [
+          "descending",
+          "queryable",
+          false
+        ],
+        [
+          "descending",
+          "sort_ordering",
+          false
+        ],
+        [
+          "descending",
+          "theAble",
+          false
+        ],
         [
           "direction",
           "direction",
@@ -74,6 +164,16 @@
           "queryable",
           false
         ],
+        [
+          "divideByExpression",
+          "mathematicalExpression",
+          false
+        ],
+        [
+          "divideByOperator",
+          "mathematical_operator",
+          false
+        ],
         [
           "doubleQuote",
           "queryable",
@@ -119,6 +219,11 @@
           "queryable",
           false
         ],
+        [
+          "highest",
+          "condition",
+          false
+        ],
         [
           "ifAble",
           "ifAble",
@@ -139,6 +244,16 @@
           "verb",
           false
         ],
+        [
+          "isEdee",
+          "isEdee",
+          false
+        ],
+        [
+          "isEder",
+          "isEder",
+          false
+        ],
         [
           "isQuery",
           "verb",
@@ -179,11 +294,126 @@
           "action",
           false
         ],
+        [
+          "lowest",
+          "condition",
+          false
+        ],
+        [
+          "mathematical",
+          "hierarchyAble",
+          false
+        ],
+        [
+          "mathematical",
+          "isEdee",
+          false
+        ],
+        [
+          "mathematical",
+          "isEder",
+          false
+        ],
+        [
+          "mathematical",
+          "object",
+          false
+        ],
+        [
+          "mathematical",
+          "operator_modifier",
+          false
+        ],
+        [
+          "mathematical",
+          "property",
+          false
+        ],
+        [
+          "mathematical",
+          "queryable",
+          false
+        ],
+        [
+          "mathematical",
+          "theAble",
+          false
+        ],
+        [
+          "mathematicalExpression",
+          "concept",
+          false
+        ],
+        [
+          "mathematicalExpression",
+          "number",
+          false
+        ],
+        [
+          "mathematical_operator",
+          "adjective",
+          true
+        ],
+        [
+          "mathematical_operator",
+          "concept",
+          false
+        ],
+        [
+          "mathematical_operator",
+          "hierarchyAble",
+          false
+        ],
+        [
+          "mathematical_operator",
+          "isEdee",
+          false
+        ],
+        [
+          "mathematical_operator",
+          "isEder",
+          false
+        ],
+        [
+          "mathematical_operator",
+          "object",
+          false
+        ],
+        [
+          "mathematical_operator",
+          "operator",
+          false
+        ],
+        [
+          "mathematical_operator",
+          "property",
+          false
+        ],
+        [
+          "mathematical_operator",
+          "queryable",
+          false
+        ],
+        [
+          "mathematical_operator",
+          "theAble",
+          false
+        ],
         [
           "memorable",
           "theAble",
           false
         ],
+        [
+          "minusExpression",
+          "mathematicalExpression",
+          false
+        ],
+        [
+          "minusOperator",
+          "mathematical_operator",
+          false
+        ],
         [
           "modifies",
           "verb",
@@ -234,6 +464,51 @@
           "theAble",
           false
         ],
+        [
+          "operator",
+          "concept",
+          false
+        ],
+        [
+          "operator",
+          "hierarchyAble",
+          false
+        ],
+        [
+          "operator",
+          "isEdee",
+          false
+        ],
+        [
+          "operator",
+          "isEder",
+          false
+        ],
+        [
+          "operator",
+          "object",
+          false
+        ],
+        [
+          "operator",
+          "property",
+          false
+        ],
+        [
+          "operator",
+          "queryable",
+          false
+        ],
+        [
+          "operator",
+          "theAble",
+          false
+        ],
+        [
+          "operator_modifier",
+          "adjective",
+          false
+        ],
         [
           "orAble",
           "ifAble",
@@ -249,6 +524,51 @@
           "theAble",
           false
         ],
+        [
+          "ordering",
+          "concept",
+          false
+        ],
+        [
+          "ordering",
+          "hierarchyAble",
+          false
+        ],
+        [
+          "ordering",
+          "isEdee",
+          false
+        ],
+        [
+          "ordering",
+          "isEder",
+          false
+        ],
+        [
+          "ordering",
+          "object",
+          false
+        ],
+        [
+          "ordering",
+          "property",
+          false
+        ],
+        [
+          "ordering",
+          "queryable",
+          false
+        ],
+        [
+          "ordering",
+          "theAble",
+          false
+        ],
+        [
+          "ordering_modifier",
+          "adjective",
+          false
+        ],
         [
           "ordinal",
           "listable",
@@ -259,6 +579,16 @@
           "adjective",
           false
         ],
+        [
+          "plusExpression",
+          "mathematicalExpression",
+          false
+        ],
+        [
+          "plusOperator",
+          "mathematical_operator",
+          false
+        ],
         [
           "preposition",
           "preposition",
@@ -334,6 +664,101 @@
           "verb",
           false
         ],
+        [
+          "sort",
+          "hierarchyAble",
+          false
+        ],
+        [
+          "sort",
+          "isEdee",
+          false
+        ],
+        [
+          "sort",
+          "isEder",
+          false
+        ],
+        [
+          "sort",
+          "object",
+          false
+        ],
+        [
+          "sort",
+          "ordering_modifier",
+          false
+        ],
+        [
+          "sort",
+          "property",
+          false
+        ],
+        [
+          "sort",
+          "queryable",
+          false
+        ],
+        [
+          "sort",
+          "theAble",
+          false
+        ],
+        [
+          "sortOrdering",
+          "adjective",
+          false
+        ],
+        [
+          "sort_ordering",
+          "adjective",
+          true
+        ],
+        [
+          "sort_ordering",
+          "concept",
+          false
+        ],
+        [
+          "sort_ordering",
+          "hierarchyAble",
+          false
+        ],
+        [
+          "sort_ordering",
+          "isEdee",
+          false
+        ],
+        [
+          "sort_ordering",
+          "isEder",
+          false
+        ],
+        [
+          "sort_ordering",
+          "object",
+          false
+        ],
+        [
+          "sort_ordering",
+          "ordering",
+          false
+        ],
+        [
+          "sort_ordering",
+          "property",
+          false
+        ],
+        [
+          "sort_ordering",
+          "queryable",
+          false
+        ],
+        [
+          "sort_ordering",
+          "theAble",
+          false
+        ],
         [
           "stm_before",
           "adjective",
@@ -379,6 +804,16 @@
           "queryable",
           false
         ],
+        [
+          "timesExpression",
+          "mathematicalExpression",
+          false
+        ],
+        [
+          "timesOperator",
+          "mathematical_operator",
+          false
+        ],
         [
           "to",
           "preposition",
@@ -439,10 +874,20 @@
           "object",
           false
         ],
+        [
+          "x",
+          "number",
+          false
+        ],
         [
           "xfx",
           "queryable",
           false
+        ],
+        [
+          "y",
+          "number",
+          false
         ]
       ],
       "metadata": {

package/common/ui.js

@@ -2,6 +2,7 @@ const { knowledgeModule, where, Digraph } = require('./runtime').theprogrammable
 const { defaultContextCheck } = require('./helpers')
 const dialogues = require('./dialogues')
 const ordinals = require('./ordinals')
+const math = require('./math')
 const countable = require('./countable')
 const ui_tests = require('./ui.test.json')
 const ui_instance = require('./ui.instance.json')
@@ -128,11 +129,13 @@ const config = {
        localHierarchy: [['thisitthat', 'moveable']],
        optional: { 1: "{ marker: 'moveable', pullFromContext: true, default: true, skipDefault: true }" },
        bridge: "{ ...next(operator), operator: operator, moveable: after[0], direction: after[1], generate: ['operator', 'moveable', 'direction' ] }",
-       semantic: ({api, context}) => {
+       semantic: async ({api, context, e}) => {
          if (context.direction?.steps?.quantity) {
            api.move(context.direction.value, context.direction.steps.quantity.value, context.direction.steps.marker)
          } else {
-           api.move(context.direction.value, context.direction.steps ? context.direction.steps.value : 1)
+           const steps = await e(context.direction.steps)
+           api.move(context.direction.value, steps?.evalue || 1)
+           // api.move(context.direction.value, context.direction.steps ? context.direction.steps.value : 1)
          }
        }
     },
@@ -175,7 +178,7 @@ const template = {
 
 knowledgeModule({ 
   config,
-  includes: [dialogues, ordinals, countable],
+  includes: [dialogues, ordinals, countable, math],
   api: () => new API(),
 
   module,