theprogrammablemind_4wp 7.10.0-beta.10 → 7.10.0-beta.12

package/client.js

@@ -637,7 +637,7 @@ const loadInstance = (config, instance) => {
       // config.addInternal(results, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false)
       // config.addInternal(config.template.queries[i], { handleCalculatedProps: true } )
       const uuid = config.nameToUUID(instance.name)
-      config.addInternal(instance.template.queries[i], { uuid, addFirst: true, handleCalculatedProps: true } )
+      config.addInternal(_.cloneDeep(instance.template.queries[i]), { uuid, addFirst: true, handleCalculatedProps: true } )
     } else if (results.apply) {
       const objects = config.get('objects')
       const args = { objects, getObjects: getObjects(objects) }
@@ -1466,7 +1466,18 @@ const knowledgeModuleImpl = async ({
   ...rest
 } = {}) => {
 
-  template = _.cloneDeep(template)
+  /*
+  if (description == 'fastfood related concepts') {
+    debugger
+    global.old = template.template.queries[91].bridges[0]
+  }
+  let old
+  if (template && template.template && template.template.queries) {
+    old = template.template.queries
+    template.template.queries = _.cloneDeep(template.template.queries)
+    template.wasCopied = true
+  }
+  */
 
   const unknownArgs = Object.keys(rest)
   if (unknownArgs.length > 0) {
@@ -1770,7 +1781,6 @@ const knowledgeModuleImpl = async ({
 
     if (template) {
       let needsRebuild
-      console.log('template.template needs rebuild', template.template)
       if (args.rebuildTemplate && !args.rebuildTemplateFull) {
         // get the startOfChanges for the partial rebuild
         needsRebuild = config.needsRebuild(template.template, template.instance, { ...options, rebuild: false })
@@ -2018,6 +2028,12 @@ const knowledgeModuleImpl = async ({
     printConfig()
   } else {
     const initConfig = (config) => {
+      if (template) {
+        if (config.needsRebuild(template.template, template.instance, { isModule: !isProcess }).needsRebuild) {
+          const error = `This module "${config.name}" cannot be used because the instance file needs rebuilding. Run on the command line with no arguments or the -rt argument to rebuild.`
+          throw new Error(error)
+        }
+      }
       setupConfig(config)
 
       let loadForTesting = false
@@ -2045,11 +2061,6 @@ const knowledgeModuleImpl = async ({
       }
 
       if (template) {
-        console.log('template.template needs rebuild', template.template)
-        if (config.needsRebuild(template.template, template.instance, { isModule: !isProcess }).needsRebuild) {
-          const error = `This module "${config.name}" cannot be used because the instance file needs rebuilding. Run on the command line with no arguments or the -rt argument to rebuild.`
-          throw new Error(error)
-        }
         try {
           config.load(template.template, template.instance)
         } catch( e ) {

package/package.json

@@ -65,6 +65,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.10.0-beta.10",
+  "version": "7.10.0-beta.12",
   "license": "ISC"
 }

package/src/config.js

@@ -347,11 +347,15 @@ const handleBridgeProps = (config, bridge, addFirst) => {
 }
 
 const handleCalculatedProps = (baseConfig, moreConfig, addFirst) => {
-  for (let bridge of (moreConfig.bridges || [])) {
-    const valid = [ 'after', 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
-                    'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid' ]
-    helpers.validProps(valid, bridge, 'bridge')
-    handleBridgeProps(baseConfig, bridge, addFirst)
+  if (moreConfig.bridges) {
+    moreConfig.bridges = moreConfig.bridges.map((bridge) => {
+      bridge = {...bridge}
+      const valid = [ 'after', 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
+                      'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid' ]
+      helpers.validProps(valid, bridge, 'bridge')
+      handleBridgeProps(baseConfig, bridge, addFirst)
+      return bridge
+    })
   }
   if (moreConfig.operators) {
     moreConfig.operators = moreConfig.operators.map((operator) => {