theprogrammablemind 7.3.9-beta.0 → 7.3.9-beta.10

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-beta.0",
+  "version": "7.3.9-beta.10",
   "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)
   }
 
@@ -1240,7 +1243,7 @@ class Config {
     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
@@ -1935,6 +1938,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 +2004,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()