theprogrammablemind 9.1.1-beta.6 → 9.1.1-beta.8

package/client.js

@@ -15,6 +15,7 @@ const flattens = require('./src/flatten')
 const { appendNoDups, InitCalls, updateQueries, safeNoDups, stableId, where, suggestAssociationsFix, suggestAssociationsFixFromSummaries, validProps } = require('./src/helpers')
 const runtime = require('./runtime')
 const sortJson = runtime.sortJson
+const debug = require('./src/debug')
 
 const getConfig_getObjectsCheck = (config, testConfig) => {
   let testConfigName = config.name
@@ -1181,7 +1182,7 @@ const checkTest = (testConfig) => {
 const knowledgeModuleImpl = async ({
   includes,
   config: configStruct,
-  api,
+  api, apiKMs,
   initializer,
   terminator,
   multiApiInitializer,
@@ -1237,11 +1238,12 @@ const knowledgeModuleImpl = async ({
   const createConfig = async () => {
     const config = new Config(configStruct, moduleFromJSFile, _process)
     setupConfig(config)
+    config.expect_template = !!template
     config.setTerminator(terminator)
     config.stop_auto_rebuild()
     await config.add(...(includes || []))
     if (api) {
-      config.setApi(api)
+      config.setApi(api, apiKMs)
     }
     if (multiApiInitializer) {
       await config.setMultiApi(multiApiInitializer)
@@ -1324,7 +1326,6 @@ const knowledgeModuleImpl = async ({
       if (args.rebuildTemplateFull) {
         args.rebuildTemplate = true
       }
-
       config = await createConfig()
 
       // dont debug the load of the KM's if rebuild template is on since we want to debug the template rebuild not the load
@@ -1568,6 +1569,7 @@ const knowledgeModuleImpl = async ({
         }
         try {
           await config.load(rebuildTemplate, template.template, template.instance, { rebuild: needsRebuild.needsRebuild || options.rebuild, previousResultss: needsRebuild.previousResultss, startOfChanges: needsRebuild.startOfChanges })
+          config.fixtures()
         } catch (e) {
           console.error(`Error loading template for ${config.name}. ${e.error ? e.error : e}${e.stack ? e.stack : ''}`)
           runtime.process.exit(-1)
@@ -1867,6 +1869,7 @@ const knowledgeModuleImpl = async ({
         config.terminate()
       }
     }
+    moduleFromJSFile.exports = createConfig
   } else {
     const initConfig = async (config) => {
       if (template) {
@@ -1936,6 +1939,11 @@ const test = (name) => {
 }
 */
 
+// for testing
+const getRequireMain = () => {
+  return require.main
+}
+
 const ensureTestFile = (module, name, type) => {
   const isProcess = require.main === module
   if (isProcess) {
@@ -1957,6 +1965,7 @@ const knowledgeModule = async (...args) => {
 module.exports = {
   process: _process,
   stableId,
+  getRequireMain, // for testing
   ensureTestFile,
   rebuildTemplate,
   processContext,

package/package.json

@@ -9,7 +9,8 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
     "globals": "^16.0.0",
-    "jest": "^29.7.0"
+    "jest": "^29.7.0",
+    "argparse": "^2.0.1"
   },
   "scripts": {
     "to:debug": "node inspect node_modules/.bin/jest --runInBand -t NEO23",
@@ -68,6 +69,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.1.1-beta.6",
+  "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: {
     },
@@ -1372,6 +1364,7 @@ class Config {
         this.instances.push(instance)
         await configHelpers.loadInstance(this, instance)
       }
+      this.expect_template = false
     }
   }
 
@@ -1952,7 +1945,7 @@ class Config {
     this.resetDelta()
 
     this.addedArgss = []
-    let isProcess = require.main === module
+    const isProcess = require.main === module
     if (global.theprogrammablemind && config) {
       if (global.theprogrammablemind.loadForTesting[config.name]) {
         isProcess = true
@@ -2112,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}.`)
     }
@@ -2133,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()
     }
   }
@@ -2200,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
@@ -2621,6 +2625,7 @@ class Config {
         currentConfig: config,
         uuid: config._uuid,
         objects: namespacedObjects,
+        globals: this.config.objects,
         namespace,
         api: config.api
       }))
@@ -2717,7 +2722,9 @@ class Config {
     this.hierarchy.edges = this.config.hierarchy
 
     if (!this.isModule) {
-      await this.fixtures()
+      if (this.template || !this.expect_template) {
+        await this.fixtures()
+      }
     }
 
     this.valid()

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
           }