theprogrammablemind 9.5.1-beta.33 → 9.5.1-beta.35

package/package.json

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

package/src/config.js

@@ -1002,9 +1002,17 @@ class Config {
 
       semantics: () => this.config.semantics,
       getConfigs: () => this.configs,
+      getTestConfig: () => this.getTestConfig(),
       getTests: () => this.getTests(),
       getName: () => this.getName(),
       getDescription: () => this.getDescription(),
+      getDebug: () => this.getDebug(),
+      getDebugLoops: () => this.getDebugLoops(),
+      getMaxDepth: () => this.getMaxDepth(),
+      getAPIs: (...args) => this.getAPIs(...args),
+      getAPI: (...args) => this.getAPI(...args),
+      getUUID: (...args) => this.getUUID(...args),
+      nsToString: (...args) => this.nsToString(...args),
 
       getHierarchy: (...args) => this.config.hierarchy,
       getBridges: (...args) => this.config.bridges,
@@ -1021,6 +1029,26 @@ class Config {
     }
   }
 
+  getUUID() {
+    return this.uuid
+  }
+
+  getTestConfig() {
+    return this.testConfig
+  }
+
+  getMaxDepth() {
+    return this.config.maxDepth
+  }
+
+  getDebug() {
+    return this.config.debug
+  }
+
+  getDebugLoops() {
+    return this.config.debugLoops
+  }
+
   getName() {
     return this.name
   }
@@ -1800,7 +1828,9 @@ class Config {
 
   getAPIs (uuid) {
     let config
-    if (this._uuid === uuid) {
+    if (!uuid) {
+      config = this
+    } else if (this._uuid === uuid) {
       config = this
     } else {
       for (const km of this.configs) {
@@ -1815,6 +1845,14 @@ class Config {
     }
   }
 
+  /*
+  getAPIs (config) {
+    if (config && config._api && config._api.multiApi) {
+      return config._api.apis
+    }
+  }
+  */
+
   getServer () {
     return this._server
   }

package/src/configHelpers.js

@@ -97,11 +97,11 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   if (args.uuid) {
     args.objects = args.getObjects(args.uuid)
   }
-  if (!hierarchy) {
-    hierarchy = config.hierarchy
+  if (!hierarchy && config.getHierarchy) {
+    hierarchy = config.getHierarchy()
   }
   // callId
-  args.calls = new InitCalls(args.isInstance ? `${args.isInstance}#${config.name}` : config.name)
+  args.calls = new InitCalls(args.isInstance ? `${args.isInstance}#${config.getName()}` : config.getName())
   if (global.theprogrammablemind && global.theprogrammablemind.loadForTesting) {
     args.calls = new InitCalls(Object.keys(global.theprogrammablemind.loadForTesting)[0])
   }
@@ -137,8 +137,8 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   args.addPattern = (pattern, def) => config.addPattern(pattern, args.uuid)
   args.addGenerator = (generator) => config.addGenerator(generator, args.uuid, config.name)
 
-  if (config.testConfig?.testModuleName) {
-    args.testModuleName = config.testConfig.testModuleName
+  if (config.getTestConfig()?.testModuleName) {
+    args.testModuleName = config.getTestConfig().testModuleName
   }
   args.addAssumedScoped = (args, assumed) => {
     const addAssumed = (args, ...moreAssumed) => {
@@ -198,15 +198,8 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   }
   config.getAddedArgs(args)
 
-  Object.assign(args, args.getUUIDScoped(uuidForScoping || config.uuid))
+  Object.assign(args, args.getUUIDScoped(uuidForScoping || config.getUUID()))
   args.apis = args.apis || ((name) => config.getConfig(name).api)
-  // args.apis = (name) => config.getAPIs(name)
-  /*
-  if (uuidForScoping) {
-    Object.assign(args, args.getUUIDScoped(uuidForScoping))
-  }
-  */
-  // sets args for all the API. that make a copy so the args must be fully setup by here except for scoped
   config.setArgs(args)
 }
 
@@ -467,11 +460,6 @@ const loadInstance = async (config, instance) => {
   const transitoryMode = global.transitoryMode
   global.transitoryMode = false
 
-  /*
-  if (config.name == 'people' && instance.name == 'people') {
-    debugger
-  }
-  */
   const rl = instance.resultss.length
   if (rl > 0) {
     config.addAssociations(instance.resultss[instance.resultss.length - 1].rtf_associations || [])

package/src/generators.js

@@ -26,11 +26,13 @@ class Generator {
     }
   }
 
+  /*
   getAPIs (config) {
     if (config && config._api && config._api.multiApi) {
       return config._api.apis
     }
   }
+  */
 
   toLabel () {
     const where = this.where ? `where: "${this.where}"` : ''
@@ -59,7 +61,7 @@ class Generator {
       context,
       callId,
       api: this.getAPI(config),
-      apis: this.getAPIs(config)
+      apis: config.getAPIs(),
     }
     const args = Object.assign({}, baseArgs, moreArgs, (baseArgs.getUUIDScoped || (() => { return {} }))(this.uuid))
     // return this.match(args)
@@ -78,11 +80,11 @@ class Generator {
     if (!log) {
       throw new Error('generators.apply argument log is required')
     }
-    if (baseArgs.call && config && baseArgs.calls.stack.length > config.maxDepth) {
-      throw new Error(`Max depth of ${config.maxDepth} for calls has been exceeded. maxDepth can be set on the config object. To see the calls run with the --dl or set the debugLoops property on the config`)
+    if (baseArgs.call && config && baseArgs.calls.stack.length > config.getMaxDepth()) {
+      throw new Error(`Max depth of ${config.getMaxDepth()} for calls has been exceeded. maxDepth can be set on the config object. To see the calls run with the --dl or set the debugLoops property on the config`)
     }
 
-    if (config && config.debugLoops) {
+    if (config && config.getDebugLoops()) {
       console.log('apply', this.toLabel())
     }
     // this.getAPI(config)
@@ -113,7 +115,7 @@ class Generator {
       config,
       response,
       api: this.getAPI(config),
-      apis: this.getAPIs(config)
+      apis: config.getAPIs()
     }
     const args = Object.assign({}, baseArgs, moreArgs, (baseArgs.getUUIDScoped || (() => { return {} }))(this.uuid))
     if (this.property === 'generatorp') {
@@ -229,7 +231,7 @@ class Generators {
           args.calls.pop()
           throw { error: [message], logs: this.logs }
         }
-        if (((config || {}).config || {}).debug) {
+        if (config.getDebug()) {
           const widths = Lines.addRemainder([10, 10])
           const lines = new Lines(widths)
           lines.setElement(0, 0, 'Generator')
@@ -262,7 +264,7 @@ class Generators {
       }
     }
     args.calls.pop()
-    if (!applied && ((config || {}).config || {}).debug) {
+    if (!applied && config.getDebug()) {
       const widths = Lines.addRemainder([10, 10])
       const lines = new Lines(widths)
       lines.setElement(0, 0, 'Generator')

package/src/semantics.js

@@ -44,11 +44,13 @@ class Semantic {
     }
   }
 
+  /*
   getAPIs (config) {
     if (config && config._api && config._api.multiApi) {
       return config._api.apis
     }
   }
+  */
 
   fixUpArgs (args, context) {
     args.uuid = this.uuid
@@ -58,7 +60,7 @@ class Semantic {
     args.global = objects
     const config = args.config
     args.api = this.getAPI(config)
-    args.apis = this.getAPIs(config)
+    args.apis = config.getAPIs()
     args.args = contextArgs(context, args.hierarchy)
     args.context = context
     let n = (id) => id
@@ -85,11 +87,11 @@ class Semantic {
   async apply (args, context, s, options = {}) {
     args = {...args}
     const { config } = args
-    if (config && config.debugLoops) {
+    if (config && config.getDebugLoops()) {
       console.log('apply', this.toLabel())
     }
-    if (args.calls && config && args.calls.stack.length > config.maxDepth) {
-      throw new Error(`Max depth of ${config.maxDepth} for calls has been exceeded. maxDepth can be set on the config object. To see the calls run with the --dl or set the debugLoops property on the config`)
+    if (args.calls && config && args.calls.stack.length > config.getMaxDepth()) {
+      throw new Error(`Max depth of ${config.getMaxDepth()} for calls has been exceeded. maxDepth can be set on the config object. To see the calls run with the --dl or set the debugLoops property on the config`)
     }
 
     const contextPrime = Object.assign({}, context)
@@ -160,6 +162,7 @@ class Semantics {
     }
     args = { ...args }
     const config = args.config
+    const debug = config.getDebug()
     let contextPrime = Object.assign({}, context)
     const s = (context, options) => this.apply(args, context, options)
     let applied = false
@@ -200,7 +203,6 @@ class Semantics {
             continue
           }
           if (!contextPrime.controlKeepMotivation && semantic.oneShot) {
-            // semantic.tied_ids.forEach((tied_id) => args.config.removeSemantic(tied_id))
             args.config.removeSemantic(semantic)
           }
           for (const { listener } of deferred) {
@@ -250,7 +252,7 @@ class Semantics {
         }
         args.calls.touch(contextPrime)
         // this.logs.push(`Semantics: applied ${semantic.toString()}\n to\n ${JSON.stringify(context)}\n the result was ${JSON.stringify(contextPrime)}\n`)
-        if (((config || {}).config || {}).debug) {
+        if (config.getDebug()) {
           const widths = Lines.addRemainder([10, 10])
           const lines = new Lines(widths)
           lines.setElement(0, 0, 'Semantic')
@@ -297,7 +299,7 @@ class Semantics {
       counter += 1
     }
     args.calls.pop()
-    if (!applied && ((config || {}).config || {}).debug) {
+    if (!applied && debug) {
       const widths = Lines.addRemainder([10, 10])
       const lines = new Lines(widths)
       lines.setElement(0, 0, 'Semantic')