theprogrammablemind_4wp 9.1.1-beta.6 → 9.1.1-beta.7

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
@@ -1237,6 +1238,7 @@ 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 || []))
@@ -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.7",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -1372,6 +1372,7 @@ class Config {
         this.instances.push(instance)
         await configHelpers.loadInstance(this, instance)
       }
+      this.expect_template = false
     }
   }
 
@@ -1952,7 +1953,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
@@ -2717,7 +2718,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()