Foundry/.dungeon
0
0
Fork 0
Code Issues 57 Pull requests Projects Releases 7 Packages Wiki Activity Actions

Fix the instanceof operators on the proxy to include the default class

Browse source
This commit is contained in:
Oliver-Akins 2024-03-19 19:35:14 -06:00
parent 23ec5fe0d3
commit 59b64f57db
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
module/documents/Actor/_proxy.mjs
View file

@ -9,12 +9,14 @@ const classes = {
sync: Sync, sync: Sync,
}; };
const defaultClass = DotDungeonActor;
export const ActorProxy = new Proxy(function () {}, { export const ActorProxy = new Proxy(function () {}, {
construct(target, args) { construct(target, args) {
const [data] = args; const [data] = args;
if (!classes.hasOwnProperty(data.type)) { if (!classes.hasOwnProperty(data.type)) {
return new DotDungeonActor(...args); return new defaultClass(...args);
} }
return new classes[data.type](...args); return new classes[data.type](...args);
@ -24,23 +26,24 @@ export const ActorProxy = new Proxy(function () {}, {
if (["create", "createDocuments"].includes(prop)) { if (["create", "createDocuments"].includes(prop)) {
return function (data, options) { return function (data, options) {
if (data.constructor === Array) { if (data.constructor === Array) {
return data.map(i => ItemProxy.create(i, options)) return data.map(i => ActorProxy.create(i, options))
} }
if (!classes.hasOwnProperty(data.type)) { if (!classes.hasOwnProperty(data.type)) {
return DotDungeonActor.create(data, options); return defaultClass.create(data, options);
} }
return classes[data.type].create(data, options) return classes[data.type].create(data, options);
}; };
}; };
if (prop == Symbol.hasInstance) { if (prop == Symbol.hasInstance) {
return function (instance) { return function (instance) {
return Object.values(classes).some(i => instance instanceof i) if (instance instanceof defaultClass) return true;
return Object.values(classes).some(i => instance instanceof i);
}; };
}; };
return DotDungeonActor[prop]; return defaultClass[prop];
}, },
}); });

13
module/documents/Item/_proxy.mjs
View file

@ -5,12 +5,14 @@ const classes = {
aspect: Aspect, aspect: Aspect,
}; };
const defaultClass = DotDungeonItem;
export const ItemProxy = new Proxy(function () {}, { export const ItemProxy = new Proxy(function () {}, {
construct(target, args) { construct(target, args) {
const [data] = args; const [data] = args;
if (!classes.hasOwnProperty(data.type)) { if (!classes.hasOwnProperty(data.type)) {
return new DotDungeonItem(...args); return new defaultClass(...args);
} }
return new classes[data.type](...args); return new classes[data.type](...args);
@ -24,19 +26,20 @@ export const ItemProxy = new Proxy(function () {}, {
} }
if (!classes.hasOwnProperty(data.type)) { if (!classes.hasOwnProperty(data.type)) {
return DotDungeonItem.create(data, options); return defaultClass.create(data, options);
} }
return classes[data.type].create(data, options) return classes[data.type].create(data, options);
}; };
}; };
if (prop == Symbol.hasInstance) { if (prop == Symbol.hasInstance) {
return function (instance) { return function (instance) {
return Object.values(classes).some(i => instance instanceof i) if (instance instanceof defaultClass) return true;
return Object.values(classes).some(i => instance instanceof i);
}; };
}; };
return DotDungeonItem[prop]; return defaultClass[prop];
}, },
}); });