|
@@ -57,7 +57,6 @@ function uberfactory(uuid, slugger) {
|
|
|
|
|
|
return function factory(therootname) {
|
|
return function factory(therootname) {
|
|
var seed = therootname;
|
|
var seed = therootname;
|
|
- console.log("ROOT:", therootname);
|
|
|
|
|
|
|
|
var ROOT = new electra(therootname, true, false)
|
|
var ROOT = new electra(therootname, true, false)
|
|
|
|
|
|
@@ -566,7 +565,6 @@ function uberfactory(uuid, slugger) {
|
|
}
|
|
}
|
|
electra.prototype.innerExport = function(path, serializers) {
|
|
electra.prototype.innerExport = function(path, serializers) {
|
|
var self = this;
|
|
var self = this;
|
|
-
|
|
|
|
var obj = {};
|
|
var obj = {};
|
|
// obj._id = self._id;
|
|
// obj._id = self._id;
|
|
obj.name = self.name;
|
|
obj.name = self.name;
|
|
@@ -615,13 +613,13 @@ function uberfactory(uuid, slugger) {
|
|
delete obj[k];
|
|
delete obj[k];
|
|
//obj[k] = null /* nope */
|
|
//obj[k] = null /* nope */
|
|
}
|
|
}
|
|
- 674555
|
|
|
|
})
|
|
})
|
|
|
|
+
|
|
var therest = _.omit(self, ignores);
|
|
var therest = _.omit(self, ignores);
|
|
|
|
|
|
- seriadeep(therest, obj, serializers);
|
|
|
|
|
|
+ //seriadeep(therest, obj, serializers,1);
|
|
|
|
|
|
- /*_.map(therest, function(val, ke) {
|
|
|
|
|
|
+ _.map(therest, function(val, ke) {
|
|
if (typeof(val) === "function") {
|
|
if (typeof(val) === "function") {
|
|
obj[ke] = "$$$FUNCTION$$$" + val;
|
|
obj[ke] = "$$$FUNCTION$$$" + val;
|
|
} else {
|
|
} else {
|
|
@@ -635,17 +633,18 @@ function uberfactory(uuid, slugger) {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
|
|
-*/
|
|
|
|
|
|
+
|
|
|
|
|
|
return obj
|
|
return obj
|
|
}
|
|
}
|
|
|
|
|
|
- function seriadeep(rest, obj, serializers) {
|
|
|
|
|
|
+ function seriadeep(rest, obj, serializers,one) {
|
|
|
|
+ if(one>2){return }
|
|
_.map(rest, function(val, ke) {
|
|
_.map(rest, function(val, ke) {
|
|
if (typeof(val) === "function") {
|
|
if (typeof(val) === "function") {
|
|
obj[ke] = "$$$FUNCTION$$$" + val;
|
|
obj[ke] = "$$$FUNCTION$$$" + val;
|
|
} else if (typeof(val) === "object") {
|
|
} else if (typeof(val) === "object") {
|
|
- obj[ke] = seriadeep(val, obj, serializers);
|
|
|
|
|
|
+ obj[ke] = seriadeep(val, obj, serializers, (one||1) +1);
|
|
} else {
|
|
} else {
|
|
if (serializers && serializers[ke]) {
|
|
if (serializers && serializers[ke]) {
|
|
obj[ke] = serializers[ke](val)
|
|
obj[ke] = serializers[ke](val)
|
|
@@ -679,20 +678,19 @@ function uberfactory(uuid, slugger) {
|
|
var self = this;
|
|
var self = this;
|
|
async.mapLimit(this.children, 10, function(obj, next) {
|
|
async.mapLimit(this.children, 10, function(obj, next) {
|
|
obj().export(path + obj().name, next)
|
|
obj().export(path + obj().name, next)
|
|
- // next(null,)
|
|
|
|
}, function(err, collect) {
|
|
}, function(err, collect) {
|
|
var obj = self.innerExport(path);
|
|
var obj = self.innerExport(path);
|
|
- collect.sort(function(a, b) {
|
|
|
|
- return a.name > b.name ? 1 : a.name < b.name ? -1 : 0
|
|
|
|
- })
|
|
|
|
|
|
+ if (collect.sort) {
|
|
|
|
+ collect.sort(function(a, b) {
|
|
|
|
+ return a.name > b.name ? 1 : a.name < b.name ? -1 : 0
|
|
|
|
+ })
|
|
|
|
+ }
|
|
obj.children = collect;
|
|
obj.children = collect;
|
|
cb(err, obj);
|
|
cb(err, obj);
|
|
})
|
|
})
|
|
return this;
|
|
return this;
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
return inner
|
|
return inner
|
|
}
|
|
}
|
|
|
|
|