entodicton 9.7.1-beta.12 → 9.7.1-beta.13

package/client.js

@@ -1334,6 +1334,7 @@ const knowledgeModuleImpl = async ({
       parser.add_argument('-cl', '--checkForLoop', { nargs: '?', help: 'Check for loops in the priorities, Optional argument is list of operator keys to consider. For example [["banana", 0], ["food", 1]]' })
       parser.add_argument('-r', '--reset', { action: 'store_true', help: 'Get the server to bypass the cache and rebuild everything' })
       parser.add_argument('-q', '--query', { help: 'Run the specified query' })
+      parser.add_argument('-qn', '--queryNumber', { help: 'Run the query specified by the given index' })
       parser.add_argument('-f', '--filter', { help: 'for -pd only the data for the knowledge modules that start with this string will be shown' })
       parser.add_argument('-ip ', '--server', { help: 'Server to run against' })
       parser.add_argument('--trace', { action: 'store_true', help: 'Trace the semantics and generator calls.' })
@@ -1380,6 +1381,10 @@ const knowledgeModuleImpl = async ({
       const args = parser.parse_args()
       args.count = args.count || 1
 
+      if (args.queryNumber) {
+        args.query = test.contents[args.queryNumber].query
+      }
+
       if (args.rebuildTemplateFull) {
         args.rebuildTemplate = true
       }
@@ -1473,9 +1478,10 @@ const knowledgeModuleImpl = async ({
 
       if (args.deleteTest) {
         let tests = JSON.parse(runtime.fs.readFileSync(testConfig.name))
+        const nTests = tests.length
         tests = tests.filter((test) => test.query !== args.deleteTest)
         writeTestFile(testConfig.name, tests)
-        console.log(`Delete the test for "${args.deleteTest}"`)
+        console.log(`Deleted ${nTests - tests.length} tests for "${args.deleteTest}"`)
         return
       }
 

package/package.json

@@ -73,6 +73,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.7.1-beta.12",
+  "version": "9.7.1-beta.13",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -563,7 +563,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
         'generatorr', 
         'generators', 
         'id', 
-        'init', 
+        'initial', 
         'inverted', 
         'isA', 
         'level', 

package/src/flatten.js

@@ -76,6 +76,9 @@ const flatten = (markers, value) => {
   if (value.flatten === false) {
     return [[value], false]
   }
+
+  const flatten_ignore = value.flatten_ignore || []
+
   const marker = value.marker
   let properties = value
 
@@ -105,8 +108,9 @@ const flatten = (markers, value) => {
   for (const key in properties) {
     let wf = false
     let values
-    // if isinstance(properties[key], Context) {
-    if (isObject(properties[key])) {
+    if (flatten_ignore.includes(key)) {
+      values = [properties[key]]
+    } else if (isObject(properties[key])) {
       const context = properties[key];
       [values, wf] = flatten(markers, context)
     // } else if (isinstance(properties[key], list)) {