theprogrammablemind_4wp 7.3.9 → 7.3.10-beta.0

package/package.json

@@ -15,7 +15,7 @@
     "tod": "node inspect node_modules/.bin/jest --runInBand -t ONE23",
     "lint:fix": "eslint \"**/*.js\" --fix",
     "lint": "eslint \"**/*.js\"",
-    "to": "node node_modules/.bin/jest --runInBand -t NEO",
+    "to": "node node_modules/.bin/jest --runInBand -t ONE23",
     "test": "jest --config ./jest.config.json",
     "test:watch": "npm run test -- --watch"
   },
@@ -61,6 +61,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.3.9",
+  "version": "7.3.10-beta.0",
   "license": "ISC"
 }

package/src/config.js

@@ -172,7 +172,7 @@ class KM {
     return this.toNS(this._name)
   }
 
-  constructor ({ config, namespace = [], uuid, isSelf = false }) {
+  constructor ({ config, getCounter, namespace = [], uuid, isSelf = false }) {
     if (uuid) {
       this._uuid = uuid
       this._class = 'KM'
@@ -226,6 +226,7 @@ class KM {
     const config = configDup(this._config, options)
     const km = new KM({
       config,
+      getCounter: options.getCounter, 
       name: this._name,
       _uuid: config._uuid,
       namespace: this._namespace,
@@ -239,7 +240,8 @@ class KM {
       name: this._name,
       config: configDup(this._config),
       // _uuid: uuidv4(),
-      _uuid: getCounter(this._config._name),
+      _uuid: this._config.getCounter(this._config._name),
+      getCounter: (name) => this._config.getCounter(name),
       namespace: this._namespace,
       isSelf: this._isSelf
     })
@@ -319,15 +321,15 @@ const multiApiImpl = (initializer) => {
   })
 }
 
-let configCounter = 1
-
-const getCounter = (maybeName = '') => {
-  const counter = configCounter
-  configCounter += 1
-  return `${maybeName}${counter}`
-}
 
 class Config {
+
+  getCounter (maybeName = '') {
+    const counter = this.configCounter
+    this.configCounter += 1
+    return `${maybeName}${counter}`
+  }
+
   defaultConfig () {
     this.config = {
       operators: [], // TODO
@@ -363,6 +365,7 @@ class Config {
     for (const bag of bags) {
       this.config[bag] = []
     }
+    this.configCounter = 1
     // this.wasInitialized = false
   }
 
@@ -989,7 +992,7 @@ class Config {
     this._namespace = []
     this._eqClasses = []
     // this._uuid = uuidv4()
-    this._uuid = getCounter(this.name)
+    this._uuid = this.getCounter(this.name)
     if (config) {
       config = _.cloneDeep(config)
       this.config = config
@@ -1083,7 +1086,7 @@ class Config {
       }
     }
     this.initConfig = _.cloneDeep(this.config)
-    this.configs.push(new KM({ config: this.config, uuid: this._uuid }))
+    this.configs.push(new KM({ config: this.config, getCounter: (name) => this.config.getCounter(name), uuid: this._uuid }))
 
     /*
     if (config) {
@@ -1166,7 +1169,7 @@ class Config {
   set uuid (uuid) {
     const map = { [this._uuid]: uuid }
     this._uuid = uuid
-    configCounter += 1
+    this.configCounter += 1
     this.mapUUIDs(map)
   }
 
@@ -1235,12 +1238,12 @@ class Config {
     runtime.fs.writeFileSync(fn, JSON.stringify(this.config, 0, 2))
   }
 
-  copy (options = {}) {
+  copy (options = { callInitializers: true }) {
     this.valid()
     const cp = new Config()
     cp.logs = []
     cp.transitoryMode = this.transitoryMode
-    cp.configs = this.configs.map((km) => km.copy2(Object.assign({}, options, { callInitializers: false })))
+    cp.configs = this.configs.map((km) => km.copy2(Object.assign({}, options, { getCounter: (name) => cp.getCounter(name), callInitializers: false })))
     cp._uuid = cp.configs[0]._uuid
     cp.initializerFn = this.initializerFn
     cp.initAfterApi = this.initAfterApi
@@ -1254,6 +1257,7 @@ class Config {
     cp.isModule = this.isModule
     cp.initInstances = this.initInstances.slice()
     cp.instances = this.instances.slice()
+    cp.configCounter = this.configCounter
 
     cp.initConfig = _.cloneDeep(this.initConfig)
     cp.defaultConfig()
@@ -1264,6 +1268,7 @@ class Config {
       Object.assign(cp.config.objects, _.cloneDeep(this.initConfig.objects || {}))
     }
     // cp.initializeConfigFromConfigs({ others: [], objects: cp.config.objects.namespaced, moreNames: [], ...options })
+    // cp.initializeConfigFromConfigs(Object.assign({ others: [], objects: cp.config.objects.namespaced, moreNames: [] }, { callInitializers: false }))
     cp.initializeConfigFromConfigs(Object.assign({ others: [], objects: cp.config.objects.namespaced, moreNames: [] }, options))
     const map = {}
     for (let i = 0; i < this.configs.length; ++i) {
@@ -1271,6 +1276,9 @@ class Config {
     }
     cp.mapUUIDs(map)
 
+    if (options.callInitializers) {
+      cp.rebuild(options)
+    }
     if (cp._api) {
       cp._api.objects = cp.config.objects
       cp._api.config = () => (cp instanceof Config) ? cp : cp.config
@@ -1287,9 +1295,6 @@ class Config {
       cp.config.objects.namespaced[km._uuid] = {}
     })
 
-    if (options.callInitializers) {
-      cp.rebuild(options)
-    }
     cp.valid()
     return cp
   }
@@ -1421,7 +1426,16 @@ class Config {
     }
   }
 
-  initializer (fn, { initAfterApi = false } = {}) {
+  initializer (fn, options = {}) {
+    if (options) {
+      for (let option of Object.keys(options)) {
+        const validOptions = ['initAfterApi']
+        if (!['initAfterApi'].includes(option)) {
+          throw `For Config.initializer, unrecognized option ${option}. The valid options are ${validOptions}`
+        }
+      }
+    }
+    const { initAfterApi = false } = options;
     this.wasInitialized = false
     this.initAfterApi = initAfterApi
     this.initializerFn = (args) => {
@@ -1767,7 +1781,7 @@ class Config {
     // initialize the configs in context
 
     if (callInitializers) {
-      this.configs.forEach(({ namespace, uuid, config, isSelf }) => {
+      [...this.configs].reverse().forEach(({ namespace, uuid, config, isSelf }) => {
         if (isSelf) {
           config = this
         }
@@ -1935,6 +1949,25 @@ class Config {
     if (!this.config.hasOwnProperty(property)) {
       throw `Setting invalid property ${property}`
     }
+
+    if ('words' == property) {
+      for (let word in value) {
+        for (let def of value[word]) {
+          if (!def['uuid']) {
+            throw `All definitions for '${property}' must have the uuid property set (config.uuid). uuid is missing from ${JSON.stringify(def)} for the word '${word}'`
+          }
+        }
+      }
+    }
+
+    if (['operators', 'bridges'].includes(property)) {
+      for (let def of value) {
+        if (!def['uuid']) {
+          throw `All definitions for '${property}' must have the uuid property set (config.uuid). uuid is missing from ${JSON.stringify(def)}`
+        }
+      }
+    }
+
     this.config[property] = value
     // this.configs[0][property] = value
   }
@@ -1982,7 +2015,7 @@ class Config {
     // this.configs = this.configs.concat(new KM({config: more}));
     // only set for the first one the rest have it set
     const namespace = this._namespace.concat(more._namespace)
-    const moreKMs1 = [new KM({ config: more, uuid: more.uuid, namespace })]
+    const moreKMs1 = [new KM({ config: more, getCounter: (name) => this.getCounter(name), uuid: more.uuid, namespace })]
     const moreKMs2 = more.configs.slice(1).map((km) => {
       return km
       // const cp = km.copy()

package/src/generators.js

@@ -171,7 +171,7 @@ class Generators {
       let context = contexts[icontext]
       context = Object.assign({}, context, assumed)
       // let context_prime = JSON.stringify(context);
-      let contextPrime = context
+      let generated = context
       let applied = false
       const stack = args.calls.push()
       for (let igenerator = 0; igenerator < this.generators.length; ++igenerator) {
@@ -189,10 +189,10 @@ class Generators {
           // this.logs.push(`Generators: applied ${generator.toString()}\n to\n ${JSON.stringify(context)}`)
           let errorMessage = 'The apply function did not return a value'
           try {
-            contextPrime = generator.apply(args, objects, g, args.gs, context, hierarchy, config, response, log)
+            generated= generator.apply(args, objects, g, args.gs, context, hierarchy, config, response, log)
           } catch( e ) {
             // the next if handle this
-            contextPrime = null
+            generated = null
             if (e.stack && e.message) {
               errorMessage = `Error applying generator '${generator.notes}'. Error is ${e.toString()} stack is ${e.stack}. Generator is ${generator.toString()}`
             } else if (e.error) {
@@ -201,7 +201,7 @@ class Generators {
 							errorMessage = e.toString()
 						}
           }
-          if (!contextPrime && contextPrime !== '') {
+          if (!generated && generated !== '') {
             const widths = [10, 10, 90]
             const lines = new Lines(widths)
             lines.setElement(0, 0, 'Generator')
@@ -244,7 +244,7 @@ class Generators {
             lines.setElement(0, 2, generator.toString())
             lines.newRow()
             lines.setElement(0, 1, 'RESULT')
-            lines.setElement(0, 2, contextPrime)
+            lines.setElement(0, 2, generated)
             lines.newRow()
             lines.setElement(0, 1, 'STACK')
             lines.setElement(0, 2, stack)
@@ -275,7 +275,7 @@ class Generators {
         lines.setElement(0, 2, JSON.stringify(context, null, 2))
         this.logs.push(lines.toString())
       }
-      contextsPrime.push(contextPrime)
+      contextsPrime.push(generated)
     }
     return contextsPrime
   }