entodicton 9.7.1-beta.7 → 9.7.1-beta.8

package/client.js

@@ -12,7 +12,7 @@ const _ = require('lodash')
 const stringify = require('json-stable-stringify')
 const Lines = require('./lines')
 const flattens = require('./src/flatten')
-const { sortJson, appendNoDups, InitCalls, updateQueries, safeNoDups, stableId, where, suggestAssociationsFix, suggestAssociationsFixFromSummaries, validProps, OverrideCheck, } = require('./src/helpers')
+const { helpDebugHierarchy, sortJson, appendNoDups, InitCalls, updateQueries, safeNoDups, stableId, where, suggestAssociationsFix, suggestAssociationsFixFromSummaries, validProps, OverrideCheck, } = require('./src/helpers')
 const runtime = require('./runtime')
 const db = require('./src/debug')
 
@@ -479,7 +479,7 @@ const getConfigForTest = (config, testConfig) => {
   return configForTest
 }
 
-const runTest = async (config, expected, { args, verbose, testConfig, debug, timings = { server: 0, client: 0 } }) => {
+const runTest = async (config, expected, { args, verbose, testConfig, debug, timings = { server: 0, client: 0 }, index = 0 }) => {
   const test = expected.query
   if (args.query && args.query != test) {
     // no run this
@@ -512,10 +512,11 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug, tim
       defaultInnerProcess(config, errorHandler, result)
     }
     if (verbose) {
-      const widths = [100, 60]
+      const widths = [4, 100, 60]
       const lines = new Lines(widths)
-      lines.setElement(0, 0, test)
-      lines.setElement(0, 1, `time on server: ${result.times.toFixed(2)} client: ${(result.clientSideTimes / 1000).toFixed(2)}`)
+      lines.setElement(0, 0, index)
+      lines.setElement(0, 1, test)
+      lines.setElement(0, 2, `time on server: ${result.times.toFixed(2)} client: ${(result.clientSideTimes / 1000).toFixed(2)}`)
       timings.server += result.times
       timings.client += result.clientSideTimes / 1000
       lines.log()
@@ -618,18 +619,22 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug, tim
 
 const runTestsHelper = async (config, tests, failed, juicyBits) => {
   const { stopAtFirstError } = juicyBits
+  let index = 0
   while (true) {
     if (tests.length === 0) {
       return Promise.resolve(failed)
     }
     const test = tests.shift()
+    juicyBits.index = index
     const result = await runTest(config, test, juicyBits)
     if (result != null) {
+      result.index = index
       failed.push(result)
       if (stopAtFirstError) {
         return failed
       }
     }
+    index += 1
   }
 }
 
@@ -1314,7 +1319,6 @@ const knowledgeModuleImpl = async ({
 
       const helpDebugWord = 'In order to get a debug break when a specific word is created set the DEBUG_WORD environment variable to the JSON of the association to break on. For example DEBUG_WORD=\'"the"\''
       const helpDebugAssociation = 'In order to get a debug break when a specific association is created set the DEBUG_ASSOCIATION environment variable to the JSON of the association to break on. For example DEBUG_ASSOCIATION=\'[["the", 0], ["mammal", 1]]\''
-      const helpDebugHierarchy = 'In order to get a debug break when a specific hierarchy is created set the DEBUG_HIERARCHY environment variable to the JSON of the child-parent pair to break on. For example DEBUG_HIERARCHY=\'[["cat", 1], ["mammel", 1]]\''
       const helpDebugPriority = 'In order to get a debug break when a specific set of priorities is created set set DEBUG_PRIORITY environment variable to the JSON of the priorities that you want to break on. For example DEBUG_PRIORITY=\'[["verb", 0], ["article", 0]]\''
       const helpDebugContextualPriority = 'In order to get a debug break when a specific set of contextual priorities is created set set DEBUG_CONTEXTUAL_PRIORITY environment variable to the JSON of the priorities that you want to break on. For example DEBUG_CONTEXTUAL_PRIORITY=\'{ context: [["verb", 0], ["article", 0], select: 1}\''
       const helpDebugBridge = 'In order to get a debug break when a specific bridge is created set the DEBUG_BRIDGE environment variable to id to break on. For example DEBUG_BRIDGE=\'car\''
@@ -1773,7 +1777,7 @@ const knowledgeModuleImpl = async ({
                         newError = true
                         headerShown = true
                         if (args.vimdiff) {
-                          vimdiff(actual, expected, `"${label} - ${result.utterance}"`)
+                          vimdiff(actual, expected, `"${label} - ${result.index} ${result.utterance}"`)
                         }
                         result.hasError = true
                       }

package/package.json

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

package/src/config.js

@@ -572,6 +572,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
         'operator', 
         'optional', 
         'parents',
+        'preferOver',
         'return_type_selector', 
         'scope', 
         'selector', 
@@ -601,7 +602,12 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
 }
 
 if (runtime.process.env.DEBUG_HIERARCHY) {
-  global.entodictonDebugHierarchy = JSON.parse(runtime.process.env.DEBUG_HIERARCHY)
+  try {
+    global.entodictonDebugHierarchy = JSON.parse(runtime.process.env.DEBUG_HIERARCHY)
+  } catch( e ) {
+    console.error("Invalid valid for DEBUG_HIERARCHY")
+    console.error(helpers.helpDebugHierarchy)
+  }
 }
 
 // i keep randomly doing one of the other so I will just make both work the same way

package/src/configHelpers.js

@@ -145,6 +145,7 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
     args.objects = config.get('objects')
     args.getObjects = getObjects(args.objects)
   }
+  args.debug = debug
   args.enable = (key) => {
     config.addEnable(key)
   }
@@ -163,7 +164,19 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
     }
   }
   args.contextHierarchy = new ContextHierarchy()
-  args.handlerStack = new HandlerStack()
+  args.namespaced = {
+    get: (km, context, property) => {
+      context.namespaced ??= {}
+      context.namespaced[km] ??= {}
+      return context.namespaced[km][property] 
+    },
+    set: (km, context, property, value) => {
+      context.namespaced ??= {}
+      context.namespaced[km] ??= {}
+      return context.namespaced[km][property] = value
+    }
+  }
+  args.stack = new HandlerStack()
   args.cleanAssign = cleanAssign
   args.km = (name) => config.getConfig(name)
   args.api = (name) => config.getConfig(name).api

package/src/flatten.js

@@ -1,7 +1,8 @@
-const { isArray, isObject, isCompound } = require('./helpers')
+const { isArray, isObject, isCompound, } = require('./helpers')
+const debug = require('./debug')
 const _ = require('lodash')
 
-const DEBUG = (...args) => {
+const DEBUG = (label, details) => {
 //  DEBUG(...args)
 }
 
@@ -46,33 +47,24 @@ const zip = (a1, a2) => {
 }
 
 const flattenListHelper = (markers, values) => {
-  const flats = []
   let wasFlattened = false
-  let singles = []
+  const all = []
   for (const value of values) {
     if (!isCompound(value)) {
-      singles.push(value)
+      all.push([value])
     } else {
       const [more, wf] = flatten(markers, value)
       if (wf) {
         wasFlattened = wasFlattened || wf
-        flats.push(more)
+        all.push(more)
       } else {
-        singles = singles.concat(more)
+        all.push(...more.map((m) => [m]))
       }
     }
   }
 
-  // product does weirdness with only choice
-  if (!wasFlattened) {
-    return [[singles], wasFlattened]
-  } else {
-    const results = []
-    for (const flat of cartesian(...flats)) {
-      results.push(singles.concat(flat))
-    }
-    return [results, wasFlattened]
-  }
+  const result = cartesian(...all)
+  return [result, wasFlattened]
 }
 
 // returns (list, wasFlattened)

package/src/helpers.js

@@ -600,7 +600,11 @@ function setByPath(obj, path, value) {
   return value;
 }
 
+const helpDebugHierarchy = 'In order to get a debug break when a specific hierarchy is created set the DEBUG_HIERARCHY environment variable to the JSON of the child-parent pair to break on. For example DEBUG_HIERARCHY=\'["cat", "mammel"]\''
+
 module.exports = {
+  helpDebugHierarchy,
+
   stableId,
   ecatch,
   functionsToStrings,

package/src/semantics.js

@@ -108,11 +108,11 @@ class Semantic {
       }
 
       try {
-        args.handlerStack.push(this)
+        args.stack.push(this)
         await this._apply(args)
-        args.handlerStack.pop()
+        args.stack.pop()
       } catch( e ) {
-        args.handlerStack.pop()
+        args.stack.pop()
         throw e
       }
       return contextPrime