theprogrammablemind_4wp 7.3.9-beta.12 → 7.3.9-beta.14

package/package.json

@@ -61,6 +61,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.3.9-beta.12",
+  "version": "7.3.9-beta.14",
   "license": "ISC"
 }

package/src/config.js

@@ -1257,6 +1257,7 @@ class Config {
     cp.isModule = this.isModule
     cp.initInstances = this.initInstances.slice()
     cp.instances = this.instances.slice()
+    cp.configCounter = this.configCounter
 
     cp.initConfig = _.cloneDeep(this.initConfig)
     cp.defaultConfig()
@@ -1267,6 +1268,7 @@ class Config {
       Object.assign(cp.config.objects, _.cloneDeep(this.initConfig.objects || {}))
     }
     // cp.initializeConfigFromConfigs({ others: [], objects: cp.config.objects.namespaced, moreNames: [], ...options })
+    // cp.initializeConfigFromConfigs(Object.assign({ others: [], objects: cp.config.objects.namespaced, moreNames: [] }, { callInitializers: false }))
     cp.initializeConfigFromConfigs(Object.assign({ others: [], objects: cp.config.objects.namespaced, moreNames: [] }, options))
     const map = {}
     for (let i = 0; i < this.configs.length; ++i) {
@@ -1274,6 +1276,9 @@ class Config {
     }
     cp.mapUUIDs(map)
 
+    if (options.callInitializers) {
+      cp.rebuild(options)
+    }
     if (cp._api) {
       cp._api.objects = cp.config.objects
       cp._api.config = () => (cp instanceof Config) ? cp : cp.config
@@ -1290,9 +1295,6 @@ class Config {
       cp.config.objects.namespaced[km._uuid] = {}
     })
 
-    if (options.callInitializers) {
-      cp.rebuild(options)
-    }
     cp.valid()
     return cp
   }
@@ -1771,7 +1773,6 @@ class Config {
 
     if (callInitializers) {
       [...this.configs].reverse().forEach(({ namespace, uuid, config, isSelf }) => {
-        console.log(config.name)
         if (isSelf) {
           config = this
         }

package/src/generators.js

@@ -171,7 +171,7 @@ class Generators {
       let context = contexts[icontext]
       context = Object.assign({}, context, assumed)
       // let context_prime = JSON.stringify(context);
-      let contextPrime = context
+      let generated = context
       let applied = false
       const stack = args.calls.push()
       for (let igenerator = 0; igenerator < this.generators.length; ++igenerator) {
@@ -189,10 +189,10 @@ class Generators {
           // this.logs.push(`Generators: applied ${generator.toString()}\n to\n ${JSON.stringify(context)}`)
           let errorMessage = 'The apply function did not return a value'
           try {
-            contextPrime = generator.apply(args, objects, g, args.gs, context, hierarchy, config, response, log)
+            generated= generator.apply(args, objects, g, args.gs, context, hierarchy, config, response, log)
           } catch( e ) {
             // the next if handle this
-            contextPrime = null
+            generated = null
             if (e.stack && e.message) {
               errorMessage = `Error applying generator '${generator.notes}'. Error is ${e.toString()} stack is ${e.stack}. Generator is ${generator.toString()}`
             } else if (e.error) {
@@ -201,7 +201,7 @@ class Generators {
 							errorMessage = e.toString()
 						}
           }
-          if (!contextPrime && contextPrime !== '') {
+          if (!generated && generated !== '') {
             const widths = [10, 10, 90]
             const lines = new Lines(widths)
             lines.setElement(0, 0, 'Generator')
@@ -244,7 +244,7 @@ class Generators {
             lines.setElement(0, 2, generator.toString())
             lines.newRow()
             lines.setElement(0, 1, 'RESULT')
-            lines.setElement(0, 2, contextPrime)
+            lines.setElement(0, 2, generated)
             lines.newRow()
             lines.setElement(0, 1, 'STACK')
             lines.setElement(0, 2, stack)
@@ -275,7 +275,7 @@ class Generators {
         lines.setElement(0, 2, JSON.stringify(context, null, 2))
         this.logs.push(lines.toString())
       }
-      contextsPrime.push(contextPrime)
+      contextsPrime.push(generated)
     }
     return contextsPrime
   }