valerie
/
frigid
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

no infinite loops in second passes && debug mode

master
Valerie 2021-06-13 22:35:19 -04:00
parent 7108b097a3
commit 1ae1b43fb7
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "frigid", "name": "frigid",
"version": "1.3.3", "version": "1.3.5",
"main": "out/index.js", "main": "out/index.js",
"types": "out/index.d.ts", "types": "out/index.d.ts",
"license": "MIT", "license": "MIT",

18
src/Serializable.ts
View File

@ -4,9 +4,11 @@ import { reverseLookup } from './reverseLookup.js';
export const CTOR_CALLED = Symbol('CTOR_CALLED'); export const CTOR_CALLED = Symbol('CTOR_CALLED');
export const INVOKE_CTOR = Symbol('INVOKE_CTOR'); export const INVOKE_CTOR = Symbol('INVOKE_CTOR');
export const DEBUG = Symbol('DEBUG');
export default class Serializable { export default class Serializable {
[DEBUG] = false;
[CTOR_CALLED] = false; [CTOR_CALLED] = false;
// takes as many args as it needs to (so subclasses can // takes as many args as it needs to (so subclasses can
@ -37,7 +39,11 @@ export default class Serializable {
} }
toJson() { toJson() {
return JSON.stringify(this.toSerializableObject(), null, 2); if(this[DEBUG]) {
return JSON.stringify(this.toSerializableObject(), null, 2);
} else {
return JSON.stringify(this.toSerializableObject());
}
} }
static fromJson(str: string, instances: Map<number, object> = new Map()) { static fromJson(str: string, instances: Map<number, object> = new Map()) {
@ -157,7 +163,9 @@ export default class Serializable {
if(Serializable.CLASS_REFERENCE in obj) if(Serializable.CLASS_REFERENCE in obj)
clone.__proto__ = this.prototype; clone.__proto__ = this.prototype;
const secondPassObjectsCompleted = new Map();
const secondPass = (obj) => { const secondPass = (obj) => {
console.log('second passing', obj);
for(const key of Object.keys(obj)) { for(const key of Object.keys(obj)) {
if(key === Serializable.INSTANCE_DECLARATION) delete obj[key]; if(key === Serializable.INSTANCE_DECLARATION) delete obj[key];
if(key === Serializable.CLASS_REFERENCE) delete obj[key]; if(key === Serializable.CLASS_REFERENCE) delete obj[key];
@ -169,8 +177,14 @@ export default class Serializable {
if(instances.has(refId)) { if(instances.has(refId)) {
obj[key] = instances.get(refId); obj[key] = instances.get(refId);
} }
} else {
if(!secondPassObjectsCompleted.has(val)) {
secondPassObjectsCompleted.set(val, true);
obj[key] = secondPass(val);
} else {
obj[key] = val;
}
} }
else obj[key] = secondPass(val);
} }
} }
return obj; return obj;