theprogrammablemind 9.1.1-beta.30 → 9.1.1-beta.32

package/index.js

@@ -6,6 +6,7 @@ const Digraph = require('./src/digraph')
 const client = require('./client')
 const flattens = require('./src/flatten')
 const unflatten = require('./src/unflatten')
+const debug = require('./src/debug')
 
 module.exports = {
   process: client.process,
@@ -26,5 +27,6 @@ module.exports = {
   Digraph,
   flattens: flattens.flattens,
   flatten: flattens.flatten,
-  unflatten: unflatten.unflatten
+  unflatten: unflatten.unflatten,
+  debug
 }

package/package.json

@@ -69,6 +69,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.1.1-beta.30",
+  "version": "9.1.1-beta.32",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -576,6 +576,13 @@ const addWord = (config, uuid) => ({ word, id, initial }) => {
 
 const normalizeConfig = (config) => {
   if (config) {
+    if (!config.objects) {
+      config.objects = {
+        namespaced: {},
+        server: {},
+      }
+    }
+
     for (const bag of bags) {
       if (config[bag]) {
         config[bag] = config[bag].map(normalizeGenerator)
@@ -962,7 +969,8 @@ class Config {
       },
       objects: {
         // this is where the namespaced configs have their objects
-        namespaced: {}
+        namespaced: {},
+        server: {},
       },
       description: '',
       words: {
@@ -1326,6 +1334,8 @@ class Config {
 
   toData (data) {
     Object.assign(data, this.config)
+    // greg99 delete data.objects
+    data.objects = data.objects.server
     config_toServer(data)
   }
 
@@ -1767,6 +1777,9 @@ class Config {
       if (!config.objects) {
         config.objects = {
           namespaced: {
+          },
+          // sent to server
+          server: {
           }
         }
       }
@@ -2286,7 +2299,10 @@ class Config {
       await cp.rebuild(options) // in copy
     } else {
       if (!cp.config.objects) {
-        cp.config.objects = { namespaced: {} }
+        cp.config.objects = { 
+          namespaced: {},
+          server: {},
+        }
       } else if (!cp.config.objects.namespaced) {
         cp.config.objects.namespaced = {}
       }
@@ -3379,8 +3395,12 @@ class Config {
         if (!skipObjects) {
           // namespaced is special
           const namespaced = this.config.objects.namespaced
+          const server = this.config.objects.server
           Object.assign(this.config[key], more[key])
           this.config.objects.namespaced = namespaced
+          for (let skey in server) {
+            this.config.objects.server[skey] = server[skey]
+          }
         }
       } else if (key === 'associations') {
         const configAssociations = this.config.associations