theprogrammablemind_4wp 9.1.1-beta.13 → 9.1.1-beta.14

package/client.js

@@ -1161,7 +1161,7 @@ const checkTemplate = (template) => {
   if (template.checks) {
     throw new Error("The 'checks' property should be in the 'test' property not the 'template' property")
   }
-  validProps([ 'fragments', 'configs' ], template.template, 'template.template')
+  validProps(['fragments', 'configs'], template.template, 'template.template')
 }
 
 const checkTest = (testConfig) => {

package/package.json

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

package/src/config.js

@@ -865,6 +865,7 @@ class Config {
   async fixtures () {
     if (this.testConfig?.fixtures) {
       const args = {}
+      args.uuid = this._uuid
       configHelpers.setupArgs(args, this)
       return this.testConfig.fixtures(args)
     }
@@ -893,7 +894,7 @@ class Config {
 
   getPseudoConfig (uuid, config) {
     return {
-      description: 'this is a pseudo config that has limited functionality due to being available in the initializer function context',
+      description: 'this is a pseudo config that has limited functionality due to being available in the initializer and fixtures function context',
       addAssociation: (...args) => this.addAssociation(...args),
       addAssociations: (...args) => this.addAssociations(...args),
       addBridge: (...args) => this.addBridge(...args, uuid),
@@ -2091,7 +2092,7 @@ class Config {
 
   get api () {
     if (this._stop_auto_rebuild) {
-      throw new Error("The API cannot be accessed until the auto rebuild is restarted")
+      throw new Error('The API cannot be accessed until the auto rebuild is restarted')
     }
 
     if (this._api && this._api.multiApi) {
@@ -2121,8 +2122,20 @@ class Config {
       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._apiKMs.length > 0) {
+      for (const name of this._apiKMs) {
+        const api = value[name]
+        if (!api) {
+          throw new Error(`The API for ${this.name} is not being provided by the API constructor.`)
+        }
+        if (!api.initialize) {
+          throw new Error(`Expected the API for ${this.name} to have an initialize function.`)
+        }
+      }
+    } else {
+      if (!value.initialize) {
+        throw new Error(`Expected the API to have an initialize function for ${this.name}.`)
+      }
     }
 
     if (this._api && this._api.multiApi) {
@@ -2135,13 +2148,13 @@ class Config {
         return api
       }
     } else {
-      this._api = value
       this._apiConstructor = constructor
-      for (const name of this._apiKMs) {
-        if (this.name == name) {
-          continue
+      if (this._apiKMs.length > 0) {
+        for (const name of this._apiKMs) {
+          this.km(name)._api = value[name]
         }
-        this.km(name).setApi(() => this._api)
+      } else {
+        this._api = value
       }
       await this.rebuild()
     }
@@ -2210,10 +2223,21 @@ class Config {
     // update uuid here set the uuid in the objects and add error checking
     cp.initializerFn = this.initializerFn
     cp.terminatorFn = this.terminatorFn
-    if (this._apiConstructor) {
-      cp._api = this._apiConstructor(cp)
-      cp._apiConstructor = this._apiConstructor
-      cp._apiKMs = this._apiKMs
+    cp._apiKMs = this._apiKMs
+    cp._apiConstructor = this._apiConstructor
+    if (cp._apiConstructor) {
+      if (this._apiKMs.length > 0) {
+        const apis = cp._apiConstructor(cp)
+        for (const name of this._apiKMs) {
+          if (name == this.name) {
+            cp._api = apis[name]
+          } else {
+            cp.km(name)._api = apis[name]
+          }
+        }
+      } else {
+        cp._api = cp._apiConstructor(cp)
+      }
     }
     cp._namespace = this._namespace
     cp._eqClasses = this._eqClasses
@@ -2593,7 +2617,9 @@ class Config {
     const initAfterApis = []
     this.configs.forEach((km) => {
       const namespace = km.namespace
-      this.config.objects.namespaced[km._uuid] = {}
+      this.config.objects.namespaced[km._uuid] = {
+        km: km._uuid
+      }
       const namespacedObjects = this.config.objects.namespaced[km._uuid]
       this.setupNamespace(km)
       // const aw = (word, def) => this.addWord(word, def)

package/src/configHelpers.js

@@ -85,6 +85,9 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
     args.objects = config.get('objects')
     args.getObjects = getObjects(args.objects)
   }
+  if (args.uuid) {
+    args.objects = args.getObjects(args.uuid)
+  }
   if (!hierarchy) {
     hierarchy = config.hierarchy
   }
@@ -249,7 +252,7 @@ const setupContexts = (rawContexts) => {
   let first = true
   const contexts = []
   contexts.push({ marker: 'controlStart', controlRemove: true })
-  let previous;
+  let previous
   for (const context of rawContexts) {
     if (first) {
       first = false
@@ -337,9 +340,9 @@ const processContextsB = async ({ config, hierarchy, semantics, generators, json
       if (contextPrime.controlRemove) {
         continue
       }
-      let paraphrases = []
-      let paraphrasesParenthesized = []
-      let generatedParenthesized = []
+      const paraphrases = []
+      const paraphrasesParenthesized = []
+      const generatedParenthesized = []
       if (forTemplate) {
         // noop
       } else {