theprogrammablemind_4wp 7.5.8-beta.21 → 7.5.8-beta.22

package/package.json

@@ -63,6 +63,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.8-beta.21",
+  "version": "7.5.8-beta.22",
   "license": "ISC"
 }

package/src/config.js

@@ -30,6 +30,31 @@ const config_toServer = (config) => {
   }
 }
 
+const setupInitializerFNArgs = (config, args) => {
+  const aw = (word, def) => config.addWord(word, def)
+  const ag = (matchOrGenerator, applyOrNothing) => config.addGenerator(matchOrGenerator, applyOrNothing)
+  const km = (name) => config.getConfig(name)
+  const apis = (name) => {
+    return config.getConfig(name).api
+    /*
+    if (args.isAfterApi) {
+      return config.getConfig(name).api
+    }
+    throw new Error("APIs should not be accessed in the initializer until after they are all initialized. Call initializer like config.initializer(fn, { initAfterApi: true }). Then the args to the initalizer will include isAfterApi which can be used to determine if the initialize is being run before or after the API's are initialized. The default is before.")
+    */
+  }
+
+  return {
+    ...args,
+    addWord: aw,
+    addGenerator: ag,
+    config: config.getPsuedoConfig(),
+    km,
+    baseConfig: config,
+    apis,
+  }
+}
+
 const contextual_priorities_toServer = (cp) => {
   if (cp.context && cp.choose) {
     return [cp.context, cp.choose]
@@ -1836,27 +1861,22 @@ class Config {
       }
       */
       const objects = {}
-      const km = (name) => this.getConfig(name)
       if (config instanceof Config) {
         // const aw = addWord(this.config, config.uuid)
-        const aw = (word, def) => this.addWord(word, def)
-        const ag = (matchOrGenerator, applyOrNothing) => this.addGenerator(matchOrGenerator, applyOrNothing)
         this.get('objects').namespaced[config._uuid] = objects
         if (config._api) {
           config._api.objects = objects
           config._api.config = () => this
         }
-        config.initializerFn({ addWord: aw, addGenerator: ag, km, testConfig: config, config: this.getPsuedoConfig(), baseConfig: this, currentConfig: config, objects, namespace, uuid, api: config.api })
+        config.initializerFn(setupInitializerFNArgs(this, { testConfig: config, currentConfig: config, objects, namespace, uuid }))
       } else {
         // const aw = addWord(this.config, this.uuid)
-        const aw = (word, def) => this.addWord(word, def)
-        const ag = (matchOrGenerator, applyOrNothing) => this.addGenerator(matchOrGenerator, applyOrNothing)
         this.get('objects').namespaced[this._uuid] = objects
         if (config._api) {
           config._api.objects = objects
           config._api.config = () => this
         }
-        this.initializerFn({ addWord: aw, addGenerator: ag, km, testConfig: this, config: this.getPsuedoConfig(), baseConfig: this, currentConfig: this, objects, namespace, uuid, api: this.api })
+        this.initializerFn(setupInitializerFNArgs(this, { testConfig: this, currentConfig: this, objects, namespace, uuid }))
       }
     })
     this.instances.forEach((instance) => client.processInstance(this, instance))
@@ -1865,12 +1885,9 @@ class Config {
   initialize ({ force = true } = {}) {
     if (force || !this.wasInitialized) {
       // const aw = addWord(this.config, this.uuid)
-      const aw = (word, def) => this.addWord(word, def)
-      const ag = (matchOrGenerator, applyOrNothing) => this.addGenerator(matchOrGenerator, applyOrNothing)
-      const km = (name) => this.getConfig(name)
       // this.initializerFn({ addWord: aw, km, config: this, baseConfig: this, currentConfig: this, objects: this.get('objects'), uuid: this._uuid, namespace: '', api: this.api })
       const objects = this.config.objects.namespaced[this._uuid]
-      this.initializerFn({ addWord: aw, addGenerator: ag, km, testConfig: this, config: this.getPsuedoConfig(), baseConfig: this, currentConfig: this, objects, uuid: this._uuid, namespace: '', api: this.api })
+      this.initializerFn(setupInitializerFNArgs(this, { testConfig: this, currentConfig: this, objects, uuid: this._uuid, namespace: '' }))
       this.wasInitialized = true
     }
   }
@@ -2122,27 +2139,24 @@ class Config {
         return config
       }
       // const hierarchy = new DigraphInternal((config.config || {}).hierarchy)
-      const args = new Object({ 
+      const args = new Object(setupInitializerFNArgs(this, { 
         isModule, 
-        addWord: aw, 
-        addGenerator: ag,
-        km: kmFn, 
         hierarchy: this.hierarchy, 
         testConfig: config,
-        config: this.getPsuedoConfig(), 
-        baseConfig: this, 
         currentConfig: config, 
         uuid: config._uuid, 
         objects: namespacedObjects, 
         namespace, 
         motivation: (m) => this.addMotivation(m),
         get api() {
+          /*
           if (!isAfterApi) {
             throw new Error("APIs should not be accessed in the initializer until after they are all initialized. Call initializer like config.initializer(fn, { initAfterApi: true }). Then the args to the initalizer will include isAfterApi which can be used to determine if the initialize is being run before or after the API's are initialized. The default is before.")
           }
+          */
           return config.api 
         }
-      })
+      }))
       config.initializerFn(args)
       if (config.initAfterApi) {
         // reverse the list
@@ -2378,14 +2392,10 @@ class Config {
         const km = (name) => this.getConfig(name)
         if (config instanceof Config) {
           // const aw = addWord(this.config, config.uuid)
-          const aw = (word, def) => this.addWord(word, def)
-          const ag = (matchOrGenerator, applyOrNothing) => this.addGenerator(matchOrGenerator, applyOrNothing)
-          config.initializerFn({ isModule: this.isModule, addWord: aw, addGenerator: ag, baseConfig: this, km, currentConfig: config, testConfig: config, config: this.getPsuedoConfig(), objects: nsobjects, namespace, uuid, api: config.api })
+          config.initializerFn(setupInitializerFNArgs(this, { isModule: this.isModule, currentConfig: config, testConfig: config, objects: nsobjects, namespace, uuid }))
         } else {
           // const aw = addWord(this.config, this.uuid)
-          const aw = (word, def) => this.addWord(word, def)
-          const ag = (matchOrGenerator, applyOrNothing) => this.addGenerator(matchOrGenerator, applyOrNothing)
-          this.initializerFn({ isModule: this.isModule, addWord: aw, addGenerator: ag, baseConfig: this, km, currentConfig: this, testConfig: this, config: this.getPsuedoConfig(), objects: nsobjects, namespace, uuid, api: this.api })
+          this.initializerFn(setupInitializerFNArgs(this, { isModule: this.isModule, currentConfig: this, testConfig: this, objects: nsobjects, namespace, uuid }))
         }
       })
     }