entodicton 9.5.1-beta.27 → 9.5.1-beta.29

package/package.json

@@ -72,6 +72,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.5.1-beta.27",
+  "version": "9.5.1-beta.29",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -21,8 +21,6 @@ const bags = [
   'semantics'
 ]
 
-global.GORDO = true
-
 const indent = (string, indent) => {
   return string.replace(/^/gm, ' '.repeat(indent))
 }
@@ -980,6 +978,7 @@ class Config {
 
   getPseudoConfig (uuid, config) {
     return {
+      pseudo: true,
       description: 'this is a pseudo config that has limited functionality due to being available in the initializer and fixtures function context',
       addAssociation: (...args) => this.addAssociation(...args),
       addAssociations: (...args) => this.addAssociations(...args),
@@ -993,6 +992,14 @@ class Config {
       removeSemantic: (...args) => this.removeSemantic(...args, uuid, config.name),
       addWord: (...args) => this.addWord(...args, uuid),
       addPattern: (...args) => this.addPattern(...args, uuid),
+      updateBridge: (...args) => this.updateBridge(...args),
+      processContext: (...args) => this.processContext(...args),
+
+      semantics: () => this.config.semantics,
+      getConfigs: () => this.configs,
+      getTests: () => this.getTests(),
+      getName: () => this.getName(),
+      getDescription: () => this.getDescription(),
 
       getHierarchy: (...args) => this.config.hierarchy,
       getBridges: (...args) => this.config.bridges,
@@ -1002,10 +1009,33 @@ class Config {
       fragment: (...args) => this.fragment(...args),
       server: (...args) => this.server(...args),
       exists: (...args) => this.exists(...args),
-      addAPI: (...args) => this.addAPI(...args)
+      addAPI: (...args) => this.addAPI(...args),
+
+      getParenthesized: () => this.getParenthesized(),
+      setParenthesized: (...args) => this.setParenthesized(...args),
     }
   }
 
+  getName() {
+    return this.name
+  }
+
+  getDescription() {
+    return this.description
+  }
+
+  getTests() {
+    return this.tests
+  }
+
+  getParenthesized(value) {
+    return this.parenthesized
+  }
+
+  setParenthesized(value) {
+    this.parenthesized = value
+  }
+
   inDevelopmentMode (call) {
     config.developmentModeOn += 1
     try {
@@ -1964,14 +1994,6 @@ class Config {
       } else if (this.scope == 'development') {
         new_result = !(element.scope === 'testing')
       }
-      /*
-      if (global.GORDO && old_result !== new_result) {
-        global.GORDO = false
-        console.log("THERE WAS A DIFFERENCE ------------------------------------------------")
-        debugger // greg23old
-      }
-      */
-      // return old_result
       return new_result
     }
 

package/src/configHelpers.js

@@ -112,7 +112,7 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
     throw new ErrorReason(context)
   }
   args.kms = config.getConfigs()
-  args.config = config
+  args.config = config.getPseudoConfig(uuidForScoping, config)
   args.hierarchy = hierarchy
   args.isA = isA(hierarchy)
   // args.listable = listable(hierarchy)
@@ -406,21 +406,21 @@ const processContextsB = async ({ config, hierarchy, semantics, generators, json
         const generated = contextPrime.isResponse ? await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
         let generatedParenthesized = []
         if (generateParenthesized) {
-          config.parenthesized = true
+          config.setParenthesized(true)
           generatedParenthesized = contextPrime.isResponse ? await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
-          config.parenthesized = false
+          config.setParenthesized(false)
         }
         // assumed = { paraphrase: true, response: false };
         assumed = { paraphrase: true, isResponse: false, response: false }
         if (generateParenthesized) {
-          config.parenthesized = false
+          config.setParenthesized(false)
         }
         const paraphrases = await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed)
         let paraphrasesParenthesized = []
         if (generateParenthesized) {
-          config.parenthesized = true
+          config.setParenthesized(true)
           paraphrasesParenthesized = await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed)
-          config.parenthesized = false
+          config.setParenthesized(false)
         }
         contextsPrime.push(contextPrime)
         generatedPrime.push(generated)

package/src/generators.js

@@ -275,7 +275,11 @@ class Generators {
       lines.setElement(0, 2, JSON.stringify(context, null, 2))
       this.logs.push(lines.toString())
     }
-    return ((config || {}).parenthesized ? '(' + generated + ')' : generated)
+    let parenthesized = false
+    if (config && config.getParenthesized()) {
+      parenthesized = true
+    }
+    return parenthesized ? '(' + generated + ')' : generated
   }
 }
 

package/src/semantics.js

@@ -1,6 +1,7 @@
 const { args: contextArgs, normalizeGenerator, normalizeSemantic } = require('./helpers')
 const Lines = require('../lines')
 const helpers = require('./helpers')
+const debug = require('./debug')
 
 class Semantic {
   // constructor ({match, apply, uuid, index, km, notes}) {