theprogrammablemind_4wp 7.5.8-beta.18 → 7.5.8-beta.19

package/client.js

@@ -549,10 +549,11 @@ const setupProcessB = ({ config, initializer, allowDelta=false } = {}) => {
     // console.log('config', config)
     data.delta = config.delta()
   } else {
-    Object.assign(data, config.config)
+    config.toData(data)
+    // Object.assign(data, config.config)
   }
 
-  config.toServer(data)
+  // config.toServer(data)
  
   if (data.namespaces) { 
     for (const uuid of Object.keys(data.namespaces)) {
@@ -594,7 +595,7 @@ const processInstance = (config, instance) => {
   global.transitoryMode = transitoryMode
 }
 
-const _process = async (config, query, { initializer, commandLineArgs, credentials, writeTests, isTest, saveDeveloper, testConfig, testsFN, errorHandler = defaultErrorHandler } = {}) => {
+const _process = async (config, query, { initializer, commandLineArgs, credentials, writeTests, isTest, saveDeveloper, rebuildingTemplate, testConfig, testsFN, errorHandler = defaultErrorHandler } = {}) => {
   if (credentials) {
     config.server(credentials.server, credentials.key)
   }
@@ -618,6 +619,9 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
   if (commandLineArgs && commandLineArgs.checkForLoop) {
     data.checkForLoop = true
   }
+  if (rebuildingTemplate) {
+    data.errors_ignore_contextual_priorities_non_existant_ops = true
+  }
   let queries = query.split('\\n')
 
   try {
@@ -1247,7 +1251,7 @@ const build = async ({ config, target, template, errorHandler = defaultErrorHand
       }
 
       try {
-        const results = await _process(config, query.query, {initializer})
+        const results = await _process(config, query.query, {initializer, rebuildingTemplate: true})
         if (config.config.debug) {
           // TODO pass in the error handler like the other ones
           defaultInnerProcess(config, defaultErrorHandler, results)

package/package.json

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

package/src/config.js

@@ -833,6 +833,11 @@ class Config {
     }
   }
 
+  toData (data) {
+    Object.assign(data, this.config)
+    config_toServer(data)
+  }
+
   load (template, instance, options = { rebuild: false } ) {
     this.validifyTemplate(template)
     instance.template = template
@@ -1654,6 +1659,7 @@ class Config {
     cp.transitoryMode = this.transitoryMode
     cp.configs = this.configs.map((km) => km.copy2(Object.assign({}, options, { getCounter: (name) => cp.getCounter(name), callInitializers: false })))
     cp._uuid = cp.configs[0]._uuid
+    // update uuid here set the uuid in the objects and add error checking
     cp.initializerFn = this.initializerFn
     cp.initAfterApi = this.initAfterApi
     cp._api = _.cloneDeep(this._api)
@@ -1809,21 +1815,23 @@ class Config {
       if (config instanceof Config) {
         // const aw = addWord(this.config, config.uuid)
         const aw = (word, def) => this.addWord(word, def)
+        const ag = (matchOrGenerator, applyOrNothing) => this.addGenerator(matchOrGenerator, applyOrNothing)
         this.get('objects').namespaced[config._uuid] = objects
         if (config._api) {
           config._api.objects = objects
           config._api.config = () => this
         }
-        config.initializerFn({ addWord: aw, km, config, baseConfig: this, currentConfig: config, objects, namespace, uuid, api: config.api })
+        config.initializerFn({ addWord: aw, addGenerator: ag, km, config, baseConfig: this, currentConfig: config, objects, namespace, uuid, api: config.api })
       } else {
         // const aw = addWord(this.config, this.uuid)
         const aw = (word, def) => this.addWord(word, def)
+        const ag = (matchOrGenerator, applyOrNothing) => this.addGenerator(matchOrGenerator, applyOrNothing)
         this.get('objects').namespaced[this._uuid] = objects
         if (config._api) {
           config._api.objects = objects
           config._api.config = () => this
         }
-        this.initializerFn({ addWord: aw, km, config: this, baseConfig: this, currentConfig: this, objects, namespace, uuid, api: this.api })
+        this.initializerFn({ addWord: aw, addGenerator: ag, km, config: this, baseConfig: this, currentConfig: this, objects, namespace, uuid, api: this.api })
       }
     })
     this.instances.forEach((instance) => client.processInstance(this, instance))
@@ -1833,10 +1841,11 @@ class Config {
     if (force || !this.wasInitialized) {
       // const aw = addWord(this.config, this.uuid)
       const aw = (word, def) => this.addWord(word, def)
+      const ag = (matchOrGenerator, applyOrNothing) => this.addGenerator(matchOrGenerator, applyOrNothing)
       const km = (name) => this.getConfig(name)
       // this.initializerFn({ addWord: aw, km, config: this, baseConfig: this, currentConfig: this, objects: this.get('objects'), uuid: this._uuid, namespace: '', api: this.api })
       const objects = this.config.objects.namespaced[this._uuid]
-      this.initializerFn({ addWord: aw, km, config: this, baseConfig: this, currentConfig: this, objects, uuid: this._uuid, namespace: '', api: this.api })
+      this.initializerFn({ addWord: aw, addGenerator: ag, km, config: this, baseConfig: this, currentConfig: this, objects, uuid: this._uuid, namespace: '', api: this.api })
       this.wasInitialized = true
     }
   }
@@ -2054,6 +2063,7 @@ class Config {
     const initAfterApis = []
     const reverseIt = true
     const interleaved = true
+    let isAfterApi = false
     this.configs.forEach((km) => {
       const namespace = km.namespace
       this.config.objects.namespaced[km._uuid] = {}
@@ -2061,6 +2071,7 @@ class Config {
       this.setupNamespace(km)
       // const aw = addWord(km.config.config ? km.config.config : km.config, km.config.uuid)
       const aw = (word, def) => this.addWord(word, def)
+      const ag = (matchOrGenerator, applyOrNothing) => this.addGenerator(matchOrGenerator, applyOrNothing)
       let config = km.config
      
       if (config.addedArgss) { 
@@ -2081,9 +2092,12 @@ class Config {
       }
       config.wasInitialized = false
       // TODO change name of config: to baseConfig:
-      const kmFn = (name) => this.getConfig(name)
+      const kmFn = (name) => {
+        const config = this.getConfig(name)
+        return config
+      }
       // const hierarchy = new DigraphInternal((config.config || {}).hierarchy)
-      const args = { 
+      const args = new Object({ 
         isModule, 
         addWord: aw, 
         km: kmFn, 
@@ -2095,8 +2109,13 @@ class Config {
         objects: namespacedObjects, 
         namespace, 
         motivation: (m) => config.addMotivation(m),
-        api: config.api 
-      }
+        get api() {
+          if (!isAfterApi) {
+            throw new Error("APIs should not be accessed in the initializer until after they are all initialized. Call initializer like config.initializer(fn, { initAfterApi: true }). Then the args to the initalizer will include isAfterApi which can be used to determine if the initialize is being run before or after the API's are initialized. The default is before.")
+          }
+          return config.api 
+        }
+      })
       config.initializerFn(args)
       if (config.initAfterApi) {
         // reverse the list
@@ -2148,6 +2167,7 @@ class Config {
       this.config.semantics = []
     }
 
+    isAfterApi = true
     if (!interleaved) {
       for (const config of addInternals) {
         if (!reverseIt) {
@@ -2162,7 +2182,7 @@ class Config {
       }
       for (let init of initAfterApis) {
         // init.args.isAfterApi = true
-        init.config.initializerFn({ ...init.args, kms: this.getConfigs(), isAfterApi: true })
+        init.config.initializerFn({ ...init.args, kms: this.getConfigs(), isAfterApi })
       }
       this.instances.forEach((instance) => client.processInstance(this, instance))
     } else {
@@ -2199,7 +2219,7 @@ class Config {
         }
         if (initAfterApis[i]) {
           const init = initAfterApis[i]
-          init.config.initializerFn({ ...init.args, kms: this.getConfigs(), isAfterApi: true })
+          init.config.initializerFn({ ...init.args, kms: this.getConfigs(), isAfterApi})
         }
         const instance = this.instances.find((instance) => instance.name == name)
         if (instance) {
@@ -2332,11 +2352,13 @@ class Config {
         if (config instanceof Config) {
           // const aw = addWord(this.config, config.uuid)
           const aw = (word, def) => this.addWord(word, def)
-          config.initializerFn({ isModule: this.isModule, addWord: aw, baseConfig: this, km, currentConfig: config, config, objects: nsobjects, namespace, uuid, api: config.api })
+          const ag = (matchOrGenerator, applyOrNothing) => this.addGenerator(matchOrGenerator, applyOrNothing)
+          config.initializerFn({ isModule: this.isModule, addWord: aw, addGenerator: ag, baseConfig: this, km, currentConfig: config, config, objects: nsobjects, namespace, uuid, api: config.api })
         } else {
           // const aw = addWord(this.config, this.uuid)
           const aw = (word, def) => this.addWord(word, def)
-          this.initializerFn({ isModule: this.isModule, addWord: aw, baseConfig: this, km, currentConfig: this, config: this, objects: nsobjects, namespace, uuid, api: this.api })
+          const ag = (matchOrGenerator, applyOrNothing) => this.addGenerator(matchOrGenerator, applyOrNothing)
+          this.initializerFn({ isModule: this.isModule, addWord: aw, addGenerator: ag, baseConfig: this, km, currentConfig: this, config: this, objects: nsobjects, namespace, uuid, api: this.api })
         }
       })
     }