theprogrammablemind 8.0.0-beta.44 → 8.0.0-beta.46

package/client.js

@@ -1103,11 +1103,11 @@ const knowledgeModuleImpl = async ({
   }
 
   const createConfig = async () => {
-    const config = new Config(configStruct, moduleFromJSFile)
+    const config = new Config(configStruct, moduleFromJSFile, _process)
     config.stop_auto_rebuild()
     await config.add(...(includes || []))
     if (api) {
-      config.setApi(api())
+      config.setApi(api)
     }
     if (multiApiInitializer) {
       await config.setMultiApi(multiApiInitializer)

package/package.json

@@ -65,6 +65,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "8.0.0-beta.44",
+  "version": "8.0.0-beta.46",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -774,12 +774,11 @@ const multiApiImpl = (initializer) => {
     multiApi: true,
 
     // multi functions
-    add: async (config, multiApi, api) => {
+    add: async (config, multiApi, api, apiConstructor) => {
       initializer(config, api)
       const name = api.getName()
       multiApi.apis[name] = api
-      // api.objects = config.get('objects')
-      // api.config = () => config
+      multiApi.apiConstructors[name] = apiConstructor
       multiApi.current = name
     },
 
@@ -802,6 +801,9 @@ const multiApiImpl = (initializer) => {
     apis: {
     },
 
+    apiConstructors: {
+    },
+
     // api functions
     api: (multiApi) => multiApi.apis[multiApi.current]
   })
@@ -855,6 +857,7 @@ class Config {
       addArgs: (...args) => this.addArgs(...args),
       getBridge: (...args) => this.getBridge(...args),
       fragment: (...args) => this.fragment(...args),
+      server: (...args) => this.server(...args),
       exists: (...args) => this.exists(...args),
       addAPI: (...args) => this.addAPI(...args)
     }
@@ -1632,6 +1635,10 @@ class Config {
     return await configHelpers.processContext(context, this.getParams())
   }
 
+  process (query, options) {
+    return this.clientProcess(this, query, options)
+  }
+
   query (query, options) {
     return this.process(query, options)
   }
@@ -1770,7 +1777,7 @@ class Config {
   }
 
   // configs = [ { config, namespace } ... ]
-  constructor (config, module) {
+  constructor (config, module, clientProcess) {
     if (config instanceof Config) {
       throw new Error('Excepted the config argument to be a hash not a Config object')
     }
@@ -1788,6 +1795,7 @@ class Config {
       config.priorities = config.priorities || []
     }
 
+    this.clientProcess = clientProcess
     this.maxDepth = 20 // for generators and semantics
     this.debugLoops = false // for generators and semantics
 
@@ -1895,7 +1903,7 @@ class Config {
   }
 
   async setMultiApi (initializer) {
-    await this.setApi(multiApiImpl(initializer))
+    await this.setApi(() => multiApiImpl(initializer))
   }
 
   get multiApi () {
@@ -1953,15 +1961,27 @@ class Config {
     }
   }
 
-  async setApi (value) {
+  async setApi (constructor) {
+    if (typeof constructor !== 'function') {
+      throw new Error(`Expected the argument to be an API constructor for ${this.name}.`)
+    }
+    const value = constructor()
     if (!value.initialize) {
       throw new Error(`Expected the API to have an initialize function for ${this.name}.`)
     }
 
     if (this._api && this._api.multiApi) {
-      await this._api.add(this, this._api, value)
+      await this._api.add(this, this._api, value, constructor)
+      const previousApiConstructor = this._apiConstructor
+      this._apiConstructor = (config) => {
+        const api = previousApiConstructor(config)
+        // does this need await?
+        api.add(config, api, constructor(config), constructor)
+        return api
+      }
     } else {
-      this._api = _.cloneDeep(value)
+      this._api = value
+      this._apiConstructor = constructor
       await this.rebuild()
     }
   }
@@ -2029,7 +2049,11 @@ class Config {
     cp._uuid = cp.configs[0]._uuid
     // update uuid here set the uuid in the objects and add error checking
     cp.initializerFn = this.initializerFn
-    cp._api = _.cloneDeep(this._api)
+    // cp._api = _.cloneDeep(this._api)
+    if (this._apiConstructor) {
+      cp._api = this._apiConstructor(cp)
+      cp._apiConstructor = this._apiConstructor
+    }
     cp._namespace = this._namespace
     cp._eqClasses = this._eqClasses
     cp.name = this.name