theprogrammablemind_4wp 7.5.8-beta.24 → 7.5.8-beta.26

package/client.js

@@ -114,6 +114,7 @@ const setupArgs = (args, config, logs, hierarchy) => {
     args.calls = new InitCalls(Object.keys(global.theprogrammablemind.loadForTesting)[0])
   }
   args.km = (name) => config.getConfig(name)
+  args.api = (name) => config.getConfig(name).api
   args.error = (context) => {
     throw new ErrorReason(context)
   }
@@ -157,10 +158,10 @@ const setupArgs = (args, config, logs, hierarchy) => {
   }
   args.e = (c) => config.getEvaluator(args.s, args.calls, logs, c)
   args.log = (message) => logs.push(message)
-  // config.getAddedArgs(args)
   args.gs = gs(args.g)
   args.gsp = gs(args.gp)
   args.gsr = gs(args.gr)
+  config.getAddedArgs(args)
 }
 
 const gs = (g) => (contexts, separator, lastSeparator) => {
@@ -1214,7 +1215,9 @@ entodicton.knowledgeModule( {
 `
 */
 
-const build = async ({ config, target, template, errorHandler = defaultErrorHandler }) => {
+const rebuildTemplate = async ({ config, target, template, errorHandler = defaultErrorHandler }) => {
+  debugger
+  // config = config.base()
   const accumulators = {
     resultss: [],
     fragments: [],
@@ -1933,7 +1936,7 @@ module.exports = {
   w,
   // submitBug,
   ensureTestFile,
-  build,
+  rebuildTemplate,
   processContext,
   processContexts,
   runTests,

package/index.js

@@ -23,5 +23,6 @@ module.exports = {
   Generator,
   Digraph,
   flattens: flattens.flattens,
+  flatten: flattens.flatten,
   unflatten: unflatten.unflatten
 }

package/package.json

@@ -63,6 +63,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.8-beta.24",
+  "version": "7.5.8-beta.26",
   "license": "ISC"
 }

package/src/config.js

@@ -564,8 +564,8 @@ const multiApiImpl = (initializer) => {
       initializer(config, api)
       const name = api.getName()
       multiApi.apis[name] = api
-      api.objects = config.get('objects')
-      api.config = () => config
+      // api.objects = config.get('objects')
+      // api.config = () => config
       multiApi.current = name
     },
 
@@ -576,11 +576,13 @@ const multiApiImpl = (initializer) => {
       }
     },
 
+    /*
     set objects (value) {
       for (const key in Object.keys(this.apis)) {
         this.apis[key].objects = value
       }
     },
+    */
 
     // "product1": apiInstance(testData1),
     apis: {
@@ -598,7 +600,19 @@ class Config {
     return config_toServer(config)
   }
 
-  getPseudoConfig(uuid, config) {
+  base () {
+    const base = new Config()
+    for (let km of this.configs.reverse()) {
+      if (km.isSelf) {
+        continue
+      }
+      console.log(km.config.name)
+      base.add(km.config)
+    }
+
+  }
+
+  getPseudoConfig (uuid, config) {
     return {
       description: "this is a pseudo config that has limited functionality due to being available in the initializer function context",
       addAssociation: (...args) => this.addAssociation(...args),
@@ -612,6 +626,9 @@ class Config {
       addSemantic: (...args) => this.addSemantic(...args, uuid, config.name),
       addWord: (...args) => this.addWord(...args, uuid),
 
+      getHierarchy: (...args) => this.config.hierarchy,
+      getBridges: (...args) => this.config.bridges,
+
       addArgs: (...args) => this.addArgs(...args),
       getBridge: (...args) => this.getBridge(...args),
       fragment: (...args) => this.fragment(...args),
@@ -887,7 +904,7 @@ class Config {
       // TODO fix beforeQuery
       template = { fragments: [], queries: [], ...template }
       template.fragments = template.fragments.concat(this.dynamicFragments)
-      client.build({ config: this, target: this.name, beforeQuery: () => {}, template, ...options })
+      client.rebuildTemplate({ config: this, target: this.name, beforeQuery: () => {}, template, ...options })
     } else {
       // no change
       // this.initInstances.push({ ...instance, name: config.name })
@@ -1588,11 +1605,13 @@ class Config {
       this._api.add(this, this._api, value)
     } else {
       this._api = _.cloneDeep(value)
+      /*
       if (this._api) {
-        this._api.objects = this.config.objects
-        this._api.config = () => this
-        this._api.uuid = this._uuid
+        // this._api.objects = this.config.objects
+        // this._api.config = () => this
+        // this._api.uuid = this._uuid
       }
+      */
       this.rebuild()
     }
   }
@@ -1682,6 +1701,9 @@ class Config {
     runtime.fs.writeFileSync(fn, JSON.stringify(this.config, 0, 2))
   }
 
+  copy (options = { callInitializers: true }) {
+  }
+
   copy (options = { callInitializers: true }) {
     this.valid()
     const cp = new Config()
@@ -1724,25 +1746,38 @@ class Config {
     }
     cp.mapUUIDs(map)
 
+    if (cp._uuid == 'concept2') {
+        // debugger
+    }
     if (options.callInitializers) {
       cp.rebuild(options)
-    }
-    if (cp._api) {
-      cp._api.objects = cp.config.objects
-      cp._api.config = () => (cp instanceof Config) ? cp : cp.config
-      cp._api.uuid = cp._uuid
-    }
+    } else {
+      // this mess is for duplicate into a KM after resetToOne was called
+      /*
+      if (cp._api) {
+        // cp._api.objects = cp.config.objects
+        // cp._api.config = () => (cp instanceof Config) ? cp : cp.config
+        // cp._api.uuid = cp._uuid
+      }
+      */
 
-    if (!cp.config.objects) {
-      cp.config.objects = { namespaced: {} }
-    } else if (!cp.config.objects.namespaced) {
-      cp.config.objects.namespaced = {}
+      if (!cp.config.objects) {
+        cp.config.objects = { namespaced: {} }
+      } else if (!cp.config.objects.namespaced) {
+        cp.config.objects.namespaced = {}
+      }
+      cp.configs.forEach((km) => {
+        // const namespace = km.namespace
+        cp.config.objects.namespaced[km._uuid] = {}
+      })
+/*
+      if (cp._uuid == 'concept2') {
+        if (!cp.api.objects.defaultTypesForHierarchy) {
+          debugger
+        }
+      }
+    */
     }
-    cp.configs.forEach((km) => {
-      // const namespace = km.namespace
-      cp.config.objects.namespaced[km._uuid] = {}
-    })
-
     cp.valid()
     return cp
   }
@@ -1844,17 +1879,21 @@ class Config {
       const objects = {}
       if (config instanceof Config) {
         this.get('objects').namespaced[config._uuid] = objects
+        /*
         if (config._api) {
-          config._api.objects = objects
-          config._api.config = () => this
+          // config._api.objects = objects
+          // config._api.config = () => this
         }
+        */
         config.initializerFn(setupInitializerFNArgs(this, { testConfig: config, currentConfig: config, objects, namespace, uuid }))
       } else {
         this.get('objects').namespaced[this._uuid] = objects
+        /*
         if (config._api) {
-          config._api.objects = objects
-          config._api.config = () => this
+          // config._api.objects = objects
+          // config._api.config = () => this
         }
+        */
         this.initializerFn(setupInitializerFNArgs(this, { testConfig: this, currentConfig: this, objects, namespace, uuid }))
       }
     })
@@ -1885,12 +1924,14 @@ class Config {
       // const baseConfig = args.baseConfig
       const currentConfig = args.currentConfig
 
+      /*
       if (currentConfig.api) {
-        currentConfig.api.objects = args.objects
+        // currentConfig.api.objects = args.objects
         // GREG42 currentConfig.api.config = () => this
-        currentConfig.api.config = () => args.baseConfig
-        currentConfig.api.uuid = currentConfig._uuid
+        // currentConfig.api.config = () => args.baseConfig
+        // currentConfig.api.uuid = currentConfig._uuid
       }
+      */
       // this.instances.forEach( (instance) => client.processInstance(this, instance) )
       // greg55
       if (args.isAfterApi) {
@@ -2129,13 +2170,15 @@ class Config {
 
       const currentConfig = args.currentConfig
 
+      /*
       if (args.currentConfig.api) {
-        args.currentConfig.api.objects = args.objects
+        // args.currentConfig.api.objects = args.objects
         // TODO assign pseudo config?
-        args.currentConfig.api.config = () => args.baseConfig
-        args.currentConfig.api.uuid = args.currentConfig._uuid
+        // args.currentConfig.api.config = () => args.baseConfig
+        // args.currentConfig.api.uuid = args.currentConfig._uuid
         args.currentConfig.wasInitialized = true
       }
+      */
       // debugger
       // greg55
       config.initializerFn(args, { dontCallFn: true })
@@ -2143,16 +2186,17 @@ class Config {
       if (config._api) {
         if (config._api.initialize) {
           // reverse the list
-          inits.unshift( () => config._api.initialize({ config: this, km: kmFn, api: config._api }) )
+          // TODO sync up the args with initialize of config
+          inits.unshift( () => config._api.initialize({ config: this, km: kmFn, ...args, api: config._api }) )
           // config._api.initialize({ config, api: config._api })
         } else {
           if (interleaved) {
             inits.unshift(null)
           }
         }
-        config._api.objects = namespacedObjects
-        config._api.config = () => this
-        config._api.uuid = config._uuid
+        // config._api.objects = namespacedObjects
+        // config._api.config = () => this
+        // config._api.uuid = config._uuid
       } else {
         if (interleaved) {
           inits.unshift(null)