cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-06-05 20:34:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Replace implementation with shallow proxy

Browse source
This commit is contained in:
Carlos Fernandez 2026-04-25 17:44:09 -04:00
parent 3d73a08ee0
commit 67d8d071a2
4 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
module/data/actor/base.mjs
View file

@ -1,6 +1,6 @@
import DHBaseActorSettings from '../../applications/sheets/api/actor-setting.mjs';
import DHItem from '../../documents/item.mjs';
import { getScrollTextData } from '../../helpers/utils.mjs';
import { createShallowProxy, getScrollTextData } from '../../helpers/utils.mjs';
const fields = foundry.data.fields;
@ -180,8 +180,7 @@ export default class BaseDataActor extends foundry.abstract.TypeDataModel {
* @returns {object}
*/
getRollData() {
const data = { ...this };
return data;
return createShallowProxy(this);
}
/**

4
module/data/item/base.mjs
View file

@ -10,7 +10,7 @@
import {
addLinkedItemsDiff,
getScrollTextData,
shallowCopyWithGetters,
createShallowProxy,
updateLinkedItemApps
} from '../../helpers/utils.mjs';
import { ActionsField } from '../fields/actionField.mjs';
@ -165,7 +165,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
*/
getRollData(options = {}) {
const data = this.actor?.getRollData() ?? {};
data.item = shallowCopyWithGetters(this);
data.item = createShallowProxy(this);
return data;
}

4
module/documents/actor.mjs
View file

@ -1,7 +1,7 @@
import { emitAsGM, GMUpdateEvent } from '../systemRegistration/socket.mjs';
import { LevelOptionType } from '../data/levelTier.mjs';
import DHFeature from '../data/item/feature.mjs';
import { createScrollText, damageKeyToNumber, getDamageKey, shallowCopyWithGetters } from '../helpers/utils.mjs';
import { createScrollText, damageKeyToNumber, getDamageKey, createShallowProxy } from '../helpers/utils.mjs';
import DhCompanionLevelUp from '../applications/levelup/companionLevelup.mjs';
import { ResourceUpdateMap } from '../data/action/baseAction.mjs';
import { abilities } from '../config/actorConfig.mjs';
@ -595,7 +595,7 @@ export default class DhpActor extends Actor {
/**@inheritdoc */
getRollData() {
const rollData = shallowCopyWithGetters(super.getRollData());
const rollData = createShallowProxy(super.getRollData());
rollData.id = this.id;
rollData.name = this.name;
rollData.system = this.system.getRollData();

37
module/helpers/utils.mjs
View file

@ -810,28 +810,23 @@ export function sortBy(arr, fn) {
return arr.sort(cmp);
}
function getAllPropertyNames(obj, names = new Set()) {
if (!obj) return names;
for (const name of Object.getOwnPropertyNames(obj)) {
names.add(name);
}
return getAllPropertyNames(Object.getPrototypeOf(obj), names);
}
/**
* Returns a shallow copy including getters of the given object.
* Generally used for expanding roll data without side effects
* Creates a proxy that allows retrieval of top data but diverts updates to a different object.
* Generally used for roll data
*/
export function shallowCopyWithGetters(obj) {
const props = getAllPropertyNames(obj);
const result = {};
for (const key of props) {
const value = obj[key];
if (key !== '__proto__' && typeof value !== 'function') {
result[key] = obj[key];
export function createShallowProxy(obj) {
if (obj._isShallowProxy) return obj;
const overrides = {};
return new Proxy(obj, {
get(target, prop, receiver) {
if (prop === '_isShallowProxy') return true;
if (prop in overrides) return overrides[prop];
return Reflect.get(target, prop, receiver);
},
set(_target, prop, newValue) {
overrides[prop] = newValue;
return true;
}
}
return result;
});
}