theprogrammablemind 9.1.1-beta.31 → 9.1.1-beta.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/config.js +3 -14
package/package.json
CHANGED
package/src/config.js
CHANGED
|
@@ -577,10 +577,7 @@ const addWord = (config, uuid) => ({ word, id, initial }) => {
|
|
|
577
577
|
const normalizeConfig = (config) => {
|
|
578
578
|
if (config) {
|
|
579
579
|
if (!config.objects) {
|
|
580
|
-
config.objects = {
|
|
581
|
-
namespaced: {},
|
|
582
|
-
server: {},
|
|
583
|
-
}
|
|
580
|
+
config.objects = { namespaced: {}, }
|
|
584
581
|
}
|
|
585
582
|
|
|
586
583
|
for (const bag of bags) {
|
|
@@ -970,7 +967,6 @@ class Config {
|
|
|
970
967
|
objects: {
|
|
971
968
|
// this is where the namespaced configs have their objects
|
|
972
969
|
namespaced: {},
|
|
973
|
-
server: {},
|
|
974
970
|
},
|
|
975
971
|
description: '',
|
|
976
972
|
words: {
|
|
@@ -1335,7 +1331,8 @@ class Config {
|
|
|
1335
1331
|
toData (data) {
|
|
1336
1332
|
Object.assign(data, this.config)
|
|
1337
1333
|
// greg99 delete data.objects
|
|
1338
|
-
data.objects =
|
|
1334
|
+
data.objects = {...this.config.objects}
|
|
1335
|
+
delete data.objects.namespaced
|
|
1339
1336
|
config_toServer(data)
|
|
1340
1337
|
}
|
|
1341
1338
|
|
|
@@ -1778,9 +1775,6 @@ class Config {
|
|
|
1778
1775
|
config.objects = {
|
|
1779
1776
|
namespaced: {
|
|
1780
1777
|
},
|
|
1781
|
-
// sent to server
|
|
1782
|
-
server: {
|
|
1783
|
-
}
|
|
1784
1778
|
}
|
|
1785
1779
|
}
|
|
1786
1780
|
|
|
@@ -2301,7 +2295,6 @@ class Config {
|
|
|
2301
2295
|
if (!cp.config.objects) {
|
|
2302
2296
|
cp.config.objects = {
|
|
2303
2297
|
namespaced: {},
|
|
2304
|
-
server: {},
|
|
2305
2298
|
}
|
|
2306
2299
|
} else if (!cp.config.objects.namespaced) {
|
|
2307
2300
|
cp.config.objects.namespaced = {}
|
|
@@ -3395,12 +3388,8 @@ class Config {
|
|
|
3395
3388
|
if (!skipObjects) {
|
|
3396
3389
|
// namespaced is special
|
|
3397
3390
|
const namespaced = this.config.objects.namespaced
|
|
3398
|
-
const server = this.config.objects.server
|
|
3399
3391
|
Object.assign(this.config[key], more[key])
|
|
3400
3392
|
this.config.objects.namespaced = namespaced
|
|
3401
|
-
for (let skey in server) {
|
|
3402
|
-
this.config.objects.server[skey] = server[skey]
|
|
3403
|
-
}
|
|
3404
3393
|
}
|
|
3405
3394
|
} else if (key === 'associations') {
|
|
3406
3395
|
const configAssociations = this.config.associations
|