theprogrammablemind 9.1.1-beta.7 → 9.1.1-beta.8

package/client.js

@@ -1182,7 +1182,7 @@ const checkTest = (testConfig) => {
 const knowledgeModuleImpl = async ({
   includes,
   config: configStruct,
-  api,
+  api, apiKMs,
   initializer,
   terminator,
   multiApiInitializer,
@@ -1243,7 +1243,7 @@ const knowledgeModuleImpl = async ({
     config.stop_auto_rebuild()
     await config.add(...(includes || []))
     if (api) {
-      config.setApi(api)
+      config.setApi(api, apiKMs)
     }
     if (multiApiInitializer) {
       await config.setMultiApi(multiApiInitializer)

package/package.json

@@ -69,6 +69,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.1.1-beta.7",
+  "version": "9.1.1-beta.8",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -845,14 +845,6 @@ const multiApiImpl = (initializer) => {
       }
     },
 
-    /*
-    set objects (value) {
-      for (const key in Object.keys(this.apis)) {
-        this.apis[key].objects = value
-      }
-    },
-    */
-
     // "product1": apiInstance(testData1),
     apis: {
     },
@@ -2113,7 +2105,11 @@ class Config {
     }
   }
 
-  async setApi (constructor) {
+  // constructors is a constructor
+  async setApi (constructor, apiKMs) {
+    if (!apiKMs) {
+      apiKMs = [this.name]
+    }
     if (typeof constructor !== 'function') {
       throw new Error(`Expected the argument to be an API constructor for ${this.name}.`)
     }
@@ -2134,6 +2130,13 @@ class Config {
     } else {
       this._api = value
       this._apiConstructor = constructor
+      this._apiKMs = apiKMs
+      for (const name of this._apiKMs) {
+        if (this.name == name) {
+          continue
+        }
+        this.km(name).setApi(() => this._api)
+      }
       await this.rebuild()
     }
   }
@@ -2201,10 +2204,10 @@ class Config {
     // update uuid here set the uuid in the objects and add error checking
     cp.initializerFn = this.initializerFn
     cp.terminatorFn = this.terminatorFn
-    // cp._api = _.cloneDeep(this._api)
     if (this._apiConstructor) {
       cp._api = this._apiConstructor(cp)
       cp._apiConstructor = this._apiConstructor
+      cp._apiKMs = this._apiKMs
     }
     cp._namespace = this._namespace
     cp._eqClasses = this._eqClasses
@@ -2622,6 +2625,7 @@ class Config {
         currentConfig: config,
         uuid: config._uuid,
         objects: namespacedObjects,
+        globals: this.config.objects,
         namespace,
         api: config.api
       }))

package/src/configHelpers.js

@@ -249,15 +249,17 @@ const setupContexts = (rawContexts) => {
   let first = true
   const contexts = []
   contexts.push({ marker: 'controlStart', controlRemove: true })
+  let previous;
   for (const context of rawContexts) {
     if (first) {
       first = false
     } else {
-      contexts.push({ marker: 'controlBetween', controlRemove: true })
+      contexts.push({ marker: 'controlBetween', controlRemove: true, previous })
     }
     contexts.push(context)
+    previous = context
   }
-  contexts.push({ marker: 'controlEnd', controlRemove: true })
+  contexts.push({ marker: 'controlEnd', controlRemove: true, previous })
 
   let _index = 0
   const id = (context) => {

package/src/semantics.js

@@ -183,7 +183,16 @@ class Semantics {
             deferWasCalled = true
           }
           args.defer = defer
+
+          let continueWasCalled = false
+          const _continue = () => {
+            continueWasCalled = true
+          }
+          args._continue = _continue
           contextPrime = await semantic.apply(args, context, s, options)
+          if (continueWasCalled) {
+            continue
+          }
           if (deferWasCalled) {
             continue
           }