intelligent-system-design-language 0.3.21 → 0.3.23

package/out/cli/components/method-generator.js

@@ -1,8 +1,495 @@
 import { isRollParam, isTypeParam, } from '../../language/generated/ast.js';
-import { isReturnExpression, isAssignment, isBinaryExpression, isGroup, isVariableExpression, isLiteral, isRef, isNegExpression, isAccess, isMethodBlock, isIfStatement, isJS, isChatCard, isFleetingAccess, isHtmlExp, isRoll, isDamageRoll, isParentAccess, isParentAssignment, isVariableAssignment, isWhenExpressions, isShorthandComparisonExpression, isItemAccess, isExpression, isResourceExp, isBooleanExp, isSelfMethod, isAttributeExp, isArrayExpression, isEach, isParameter, isPrompt, isLabelParam, isTargetParam, IntelligentSystemDesignLanguageTerminals, isMathExpression, isMathEmptyExpression, isMathSingleExpression, isMathParamExpression, isInitiativeProperty, isStatusProperty, isUpdate, isUpdateParent, isUpdateSelf, isParentTypeCheckExpression, isParentPropertyRefExp, isSelfPropertyRefExp, isLogExpression, isTrackerExp, isVisibilityValue, isFunctionCall, isAction, isDocument, isIncrementDecrementAssignment, isQuickModifyAssignment, isVariableIncrementDecrementAssignment, isVariableQuickModifyAssignment, isParentIncrementDecrementAssignment, isParentQuickModifyAssignment, isLocationParam, isWidthParam, isHeightParam, isNumberRange, isTargetTypeCheckExpression, isTargetAccess, isTargetIncrementDecrementAssignment, isTargetQuickModifyAssignment, isTargetAssignment, isWait, isPlayAudio, isPlayAudioFile, isPlayAudioVolume, isDieField, isTimeLimitParam, isCombatMethods, isCombatProperty, isUserProperty, isMacroExecute, isMeasuredTemplateField, isStringChoiceField, isDamageTypeChoiceField, isDiceField, isDieChoicesParam, isDocumentChoicesExp, isDocumentChoiceExp, isTableField, isInventoryField, isProperty } from "../../language/generated/ast.js";
+import { isReturnExpression, isAssignment, isBinaryExpression, isGroup, isVariableExpression, isLiteral, isRef, isNegExpression, isAccess, isMethodBlock, isIfStatement, isJS, isChatCard, isFleetingAccess, isHtmlExp, isRoll, isDamageRoll, isParentAccess, isParentAssignment, isVariableAssignment, isWhenExpressions, isShorthandComparisonExpression, isItemAccess, isExpression, isResourceExp, isBooleanExp, isSelfMethod, isAttributeExp, isArrayExpression, isEach, isParameter, isPrompt, isLabelParam, isTargetParam, IntelligentSystemDesignLanguageTerminals, isMathExpression, isMathEmptyExpression, isMathSingleExpression, isMathParamExpression, isInitiativeProperty, isStatusProperty, isUpdate, isUpdateParent, isUpdateSelf, isParentTypeCheckExpression, isParentPropertyRefExp, isSelfPropertyRefExp, isLogExpression, isTrackerExp, isVisibilityValue, isFunctionCall, isAction, isDocument, isIncrementDecrementAssignment, isQuickModifyAssignment, isVariableIncrementDecrementAssignment, isVariableQuickModifyAssignment, isParentIncrementDecrementAssignment, isParentQuickModifyAssignment, isLocationParam, isWidthParam, isHeightParam, isNumberRange, isTargetTypeCheckExpression, isTargetAccess, isTargetIncrementDecrementAssignment, isTargetQuickModifyAssignment, isTargetAssignment, isWait, isPlayAudio, isPlayAudioFile, isPlayAudioVolume, isDieField, isTimeLimitParam, isCombatMethods, isCombatProperty, isUserProperty, isMacroExecute, isMeasuredTemplateField, isStringChoiceField, isDamageTypeChoiceField, isDiceField, isDieChoicesParam, isDocumentChoicesExp, isDocumentChoiceExp, isTableField, isInventoryField, isProperty, isRollVisualizerValueParam, isPromptInputAccess } from "../../language/generated/ast.js";
 import { expandToNode, joinToNode } from 'langium/generate';
 import { getParentDocument, getPromptRegistryKey, getPromptVariable, getSystemPath, getTargetDocument, toMachineIdentifier } from './utils.js';
 import { AstUtils } from 'langium';
+// Module-scoped copy used by the lifted translateDiceParts/translateDiceData.
+// (translateExpression keeps its own identical nested humanize for its other call sites.)
+function humanize(string) {
+    if (string == undefined) {
+        return "";
+    }
+    // Turn TitleCase into Title Case
+    // Ensure first letter of the string is capitalized
+    string = string.charAt(0).toUpperCase() + string.slice(1);
+    return string.replace(/([a-z])([A-Z])/g, '$1 $2');
+}
+// Build the subproperty key for a fleeting access (e.g. `opts.Boons` -> "Boons" / "boons").
+// Prompt results are resolved with lowercased field-name keys (the datamodel stores prompt
+// fields lowercased), so subproperty access on a prompt-backed fleeting must lowercase to
+// match -- otherwise `opts.Boons` reads `undefined`. Other fleetings (rolls, etc.) expose
+// real JS properties whose case must be preserved (e.g. `amount.total`), so the gate matters.
+function fleetingSubProperty(expression) {
+    var _a;
+    if (expression.subProperty == undefined)
+        return undefined;
+    return isPrompt((_a = expression.variable.ref) === null || _a === void 0 ? void 0 : _a.value) ? expression.subProperty.toLowerCase() : expression.subProperty;
+}
+export function translateDiceParts(expression, noLabels = false) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37;
+    console.log("Translating Dice Part: ", expression.$type);
+    if (isLiteral(expression)) {
+        if (typeof expression.val == "string") {
+            return expandToNode `
+                        "${expression.val}"
+                    `;
+        }
+        return expandToNode `
+                    "${expression.val}"
+                `;
+    }
+    if (isRef(expression)) {
+        // If string or number, return the value
+        if (typeof expression.val == "string" || typeof expression.val == "number") {
+            return expandToNode `
+                        "${expression.val}"
+                    `;
+        }
+        if (expression.val.ref == undefined) {
+            return;
+        }
+        if (expression.subProperties != undefined && expression.subProperties.length > 0) {
+            const subLabel = noLabels ? "" : `[${humanize(expression.subProperties[0])}]`;
+            return expandToNode `
+                        "@${(_a = expression.val.ref) === null || _a === void 0 ? void 0 : _a.name}${expression.subProperties[0].toLowerCase()}${subLabel}"
+                    `;
+        }
+        console.log("Ref:", `${expression.val.$refText}`);
+        if (IntelligentSystemDesignLanguageTerminals.DICE.test(`${expression.val}`)) {
+            return expandToNode `
+                        "${expression.val}"
+                    `;
+        }
+        const refLabel = noLabels ? "" : `[${humanize((_c = (_b = expression.val.ref) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : expression.val.$refText)}]`;
+        return expandToNode `
+                    "@${(_f = (_e = (_d = expression.val.ref) === null || _d === void 0 ? void 0 : _d.name) === null || _e === void 0 ? void 0 : _e.toLowerCase()) !== null && _f !== void 0 ? _f : expression.val.$refText}${refLabel}"
+                `;
+    }
+    if (isParentAccess(expression)) {
+        let path = (_j = (_h = (_g = expression.property) === null || _g === void 0 ? void 0 : _g.ref) === null || _h === void 0 ? void 0 : _h.name) !== null && _j !== void 0 ? _j : "";
+        let label = humanize((_m = (_l = (_k = expression.property) === null || _k === void 0 ? void 0 : _k.ref) === null || _l === void 0 ? void 0 : _l.name) !== null && _m !== void 0 ? _m : "");
+        const document = getParentDocument(expression);
+        if (document != undefined) {
+            path = `${document.name.toLowerCase()}${path}`;
+            label = `${humanize(document.name)} ${label}`;
+        }
+        // else if ( expression.propertyLookup != undefined ) {
+        //     path = `${path}${expression.propertyLookup.ref?.name.toLowerCase()}`;
+        //     label = `${label} \${context.object.system.${expression.propertyLookup.ref?.name.toLowerCase()}\}`;
+        // }
+        else {
+            path = `${path}${(_p = (_o = expression.property) === null || _o === void 0 ? void 0 : _o.ref) === null || _p === void 0 ? void 0 : _p.name.toLowerCase()}`;
+            label = `${label} ${humanize((_s = (_r = (_q = expression.property) === null || _q === void 0 ? void 0 : _q.ref) === null || _r === void 0 ? void 0 : _r.name) !== null && _s !== void 0 ? _s : "")}`;
+        }
+        for (const subProperty of (_t = expression.subProperties) !== null && _t !== void 0 ? _t : []) {
+            path = `${path}${subProperty}`;
+            label = `${label} ${humanize(subProperty)}`;
+        }
+        label = label.trim();
+        const parentLabelSuffix = noLabels ? "" : `[${label}]`;
+        return expandToNode `
+                    \`@${path.replaceAll(".", "").toLowerCase()}${parentLabelSuffix}\`
+                `;
+    }
+    if (isTargetAccess(expression)) {
+        let path = (_w = (_v = (_u = expression.property) === null || _u === void 0 ? void 0 : _u.ref) === null || _v === void 0 ? void 0 : _v.name) !== null && _w !== void 0 ? _w : "";
+        let label = humanize((_z = (_y = (_x = expression.property) === null || _x === void 0 ? void 0 : _x.ref) === null || _y === void 0 ? void 0 : _y.name) !== null && _z !== void 0 ? _z : "");
+        const document = getTargetDocument(expression);
+        if (document != undefined) {
+            path = `${document.name.toLowerCase()}${path}`;
+            label = `${humanize(document.name)} ${label}`;
+        }
+        // else if ( expression.propertyLookup != undefined ) {
+        //     path = `${path}${expression.propertyLookup.ref?.name.toLowerCase()}`;
+        //     label = `${label} \${context.object.system.${expression.propertyLookup.ref?.name.toLowerCase()}\}`;
+        // }
+        else {
+            path = `${path}${(_1 = (_0 = expression.property) === null || _0 === void 0 ? void 0 : _0.ref) === null || _1 === void 0 ? void 0 : _1.name.toLowerCase()}`;
+            label = `${label} ${humanize((_4 = (_3 = (_2 = expression.property) === null || _2 === void 0 ? void 0 : _2.ref) === null || _3 === void 0 ? void 0 : _3.name) !== null && _4 !== void 0 ? _4 : "")}`;
+        }
+        for (const subProperty of (_5 = expression.subProperties) !== null && _5 !== void 0 ? _5 : []) {
+            path = `${path}${subProperty}`;
+            label = `${label} ${humanize(subProperty)}`;
+        }
+        label = label.trim();
+        const targetLabelSuffix = noLabels ? "" : `[${label}]`;
+        return expandToNode `
+                    \`@${path.replaceAll(".", "").toLowerCase()}${targetLabelSuffix}\`
+                `;
+    }
+    if (isPromptInputAccess(expression)) {
+        // `input.X` inside a prompt -> @<field> ref token (resolved at runtime from
+        // the live reactive prompt data, see translateDiceData).
+        let key = (_9 = (_8 = (_7 = (_6 = expression.property) === null || _6 === void 0 ? void 0 : _6.ref) === null || _7 === void 0 ? void 0 : _7.name) === null || _8 === void 0 ? void 0 : _8.toLowerCase()) !== null && _9 !== void 0 ? _9 : "";
+        for (const subProperty of (_10 = expression.subProperties) !== null && _10 !== void 0 ? _10 : []) {
+            key = `${key}.${subProperty}`;
+        }
+        return expandToNode `
+                    \`@${key.replaceAll(".", "").toLowerCase()}\`
+                `;
+    }
+    if (isAccess(expression)) {
+        let path = (_18 = (_14 = (_13 = (_12 = (_11 = expression.property) === null || _11 === void 0 ? void 0 : _11.ref) === null || _12 === void 0 ? void 0 : _12.name) === null || _13 === void 0 ? void 0 : _13.toLowerCase()) !== null && _14 !== void 0 ? _14 : (_17 = (_16 = (_15 = expression.propertyLookup) === null || _15 === void 0 ? void 0 : _15.ref) === null || _16 === void 0 ? void 0 : _16.name) === null || _17 === void 0 ? void 0 : _17.toLowerCase()) !== null && _18 !== void 0 ? _18 : "";
+        let label = humanize((_24 = (_21 = (_20 = (_19 = expression.property) === null || _19 === void 0 ? void 0 : _19.ref) === null || _20 === void 0 ? void 0 : _20.name) !== null && _21 !== void 0 ? _21 : (_23 = (_22 = expression.propertyLookup) === null || _22 === void 0 ? void 0 : _22.ref) === null || _23 === void 0 ? void 0 : _23.name) !== null && _24 !== void 0 ? _24 : "");
+        // if (isDieField(expression.property?.ref)) {
+        //     return expandToNode`
+        //         \'@${path.replaceAll(".", "")}\'
+        //     `;
+        // }
+        // Special handling for document choices - expand into individual terms
+        if (expression.property && isDocumentChoicesExp(expression.property.ref) && expression.subProperties && expression.subProperties.length > 0) {
+            const choicesFieldName = expression.property.ref.name.toLowerCase();
+            const subPropertyName = expression.subProperties[0].toLowerCase();
+            const subPropertyLabel = humanize(expression.subProperties[0]);
+            // Generate dynamic expansion for each document in the choices array
+            return expandToNode `
+                        context.object.system.${choicesFieldName}.map((doc, index) => {
+                            if (!doc || !doc.system) return '';
+                            return '@' + doc.uuid.replace(/[^a-zA-Z0-9]/g, '').toLowerCase() + '${subPropertyName}[' + doc.name + ' ${subPropertyLabel}]';
+                        }).filter(Boolean).join(' + ')
+                    `;
+        }
+        if (isParentPropertyRefExp((_25 = expression.property) === null || _25 === void 0 ? void 0 : _25.ref)) {
+            label = `${label} - \${context.object.system.${(_27 = (_26 = expression.property) === null || _26 === void 0 ? void 0 : _26.ref) === null || _27 === void 0 ? void 0 : _27.name.toLowerCase()}.replace("system.", "").replaceAll(".", " ").titleCase()\}`;
+        }
+        else if (isSelfPropertyRefExp((_28 = expression.property) === null || _28 === void 0 ? void 0 : _28.ref)) {
+            label = `${label} - \${context.object.system.${(_30 = (_29 = expression.property) === null || _29 === void 0 ? void 0 : _29.ref) === null || _30 === void 0 ? void 0 : _30.name.toLowerCase()}.replace("system.", "").replaceAll(".", " ").titleCase()\}`;
+        }
+        else {
+            for (const subProperty of (_31 = expression.subProperties) !== null && _31 !== void 0 ? _31 : []) {
+                path = `${path}.${subProperty}`;
+                label = `${label} ${humanize(subProperty)}`;
+            }
+        }
+        console.log("Access:", path, label);
+        const accessLabelSuffix = noLabels ? "" : `[${label}]`;
+        return expandToNode `
+                    \`@${path.replaceAll(".", "").toLowerCase()}${accessLabelSuffix}\`
+                `;
+    }
+    if (isFleetingAccess(expression)) {
+        // If this is a roll expression, just output it directly
+        if (isRoll((_32 = expression.variable.ref) === null || _32 === void 0 ? void 0 : _32.value)) {
+            return expandToNode `
+                        ${(_33 = expression.variable.ref) === null || _33 === void 0 ? void 0 : _33.name}
+                    `;
+        }
+        let path = (_35 = (_34 = expression.variable.ref) === null || _34 === void 0 ? void 0 : _34.name) !== null && _35 !== void 0 ? _35 : "";
+        let label = humanize((_37 = (_36 = expression.variable.ref) === null || _36 === void 0 ? void 0 : _36.name) !== null && _37 !== void 0 ? _37 : "");
+        if (expression.subProperty != undefined) {
+            path = `${path}.${fleetingSubProperty(expression)}`;
+            label = `${label} ${humanize(expression.subProperty)}`;
+        }
+        const fleetingLabelSuffix = noLabels ? "" : `[${label}]`;
+        return expandToNode `
+                    \`@${path.replaceAll(".", "").toLowerCase()}${fleetingLabelSuffix}\`
+                `;
+    }
+    if (isBinaryExpression(expression)) {
+        return expandToNode `
+                    ${translateDiceParts(expression.e1, noLabels)} + "${expression.op}" + ${translateDiceParts(expression.e2, noLabels)}
+                `;
+    }
+    if (isGroup(expression)) {
+        return expandToNode `
+                    "(" + ${translateDiceParts(expression.ge, noLabels)} + ")"
+                `;
+    }
+    return;
+}
+function translateDisplayFormula(expression) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    if (isLiteral(expression)) {
+        return `${expression.val}`;
+    }
+    if (isGroup(expression)) {
+        const inner = translateDisplayFormula(expression.ge);
+        return inner != null ? `(${inner})` : undefined;
+    }
+    if (isBinaryExpression(expression)) {
+        const left = translateDisplayFormula(expression.e1);
+        const right = translateDisplayFormula(expression.e2);
+        return left != null && right != null ? `${left} ${expression.op} ${right}` : undefined;
+    }
+    if (isAccess(expression)) {
+        if (isParentPropertyRefExp((_a = expression.property) === null || _a === void 0 ? void 0 : _a.ref) || isSelfPropertyRefExp((_b = expression.property) === null || _b === void 0 ? void 0 : _b.ref)) {
+            return undefined;
+        }
+        let label = humanize((_h = (_e = (_d = (_c = expression.property) === null || _c === void 0 ? void 0 : _c.ref) === null || _d === void 0 ? void 0 : _d.name) !== null && _e !== void 0 ? _e : (_g = (_f = expression.propertyLookup) === null || _f === void 0 ? void 0 : _f.ref) === null || _g === void 0 ? void 0 : _g.name) !== null && _h !== void 0 ? _h : "");
+        for (const sub of (_j = expression.subProperties) !== null && _j !== void 0 ? _j : []) {
+            label += ` ${humanize(sub)}`;
+        }
+        return label.trim();
+    }
+    if (isParentAccess(expression)) {
+        return humanize((_m = (_l = (_k = expression.property) === null || _k === void 0 ? void 0 : _k.ref) === null || _l === void 0 ? void 0 : _l.name) !== null && _m !== void 0 ? _m : "");
+    }
+    if (isTargetAccess(expression)) {
+        return humanize((_q = (_p = (_o = expression.property) === null || _o === void 0 ? void 0 : _o.ref) === null || _p === void 0 ? void 0 : _p.name) !== null && _q !== void 0 ? _q : "");
+    }
+    if (isFleetingAccess(expression)) {
+        return humanize((_s = (_r = expression.variable.ref) === null || _r === void 0 ? void 0 : _r.name) !== null && _s !== void 0 ? _s : "");
+    }
+    return undefined;
+}
+export function translateDiceData(expression, entry, id, preDerived, generatingProperty) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61;
+    console.log("Translating Dice Data: ", expression.$type);
+    if (isParentAccess(expression)) {
+        let path = "context.object.parent.system";
+        let label = (_c = (_b = (_a = expression.property) === null || _a === void 0 ? void 0 : _a.ref) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : "";
+        console.log("Parent Access:", (_e = (_d = expression.property) === null || _d === void 0 ? void 0 : _d.ref) === null || _e === void 0 ? void 0 : _e.name);
+        const document = getParentDocument(expression);
+        if (document != undefined) {
+            path = `${path}.${(_h = (_g = (_f = expression.property) === null || _f === void 0 ? void 0 : _f.ref) === null || _g === void 0 ? void 0 : _g.name) === null || _h === void 0 ? void 0 : _h.toLowerCase()}`;
+            label = `${humanize(document.name)}.${label}`;
+        }
+        else {
+            path = `${path}.${(_l = (_k = (_j = expression.property) === null || _j === void 0 ? void 0 : _j.ref) === null || _k === void 0 ? void 0 : _k.name) === null || _l === void 0 ? void 0 : _l.toLowerCase()}`;
+            label = `${label}.${expression.property}`;
+        }
+        for (const subProperty of (_m = expression.subProperties) !== null && _m !== void 0 ? _m : []) {
+            path = `${path}.${subProperty}`;
+            label = `${label}.${subProperty}`;
+        }
+        return expandToNode `
+                    "${label.replaceAll(".", "").toLowerCase()}": ${path}
+                `;
+    }
+    if (isTargetAccess(expression)) {
+        let path = "context.target.system";
+        let label = (_q = (_p = (_o = expression.property) === null || _o === void 0 ? void 0 : _o.ref) === null || _p === void 0 ? void 0 : _p.name) !== null && _q !== void 0 ? _q : "";
+        console.log("Target Access:", (_s = (_r = expression.property) === null || _r === void 0 ? void 0 : _r.ref) === null || _s === void 0 ? void 0 : _s.name);
+        const document = getTargetDocument(expression);
+        if (document != undefined) {
+            path = `${path}.${(_v = (_u = (_t = expression.property) === null || _t === void 0 ? void 0 : _t.ref) === null || _u === void 0 ? void 0 : _u.name) === null || _v === void 0 ? void 0 : _v.toLowerCase()}`;
+            label = `${humanize(document.name)}.${label}`;
+        }
+        else {
+            path = `${path}.${(_y = (_x = (_w = expression.property) === null || _w === void 0 ? void 0 : _w.ref) === null || _x === void 0 ? void 0 : _x.name) === null || _y === void 0 ? void 0 : _y.toLowerCase()}`;
+            label = `${label}.${expression.property}`;
+        }
+        for (const subProperty of (_z = expression.subProperties) !== null && _z !== void 0 ? _z : []) {
+            path = `${path}.${subProperty}`;
+            label = `${label}.${subProperty}`;
+        }
+        return expandToNode `
+                    "${label.replaceAll(".", "").toLowerCase()}": ${path}
+                `;
+    }
+    if (isPromptInputAccess(expression)) {
+        // Resolve `input.X` to the LIVE reactive prompt path the input writes to:
+        // context.system.<action><variable>.<field>. Editing the input recomputes
+        // any binding that reads this (the rollVisualizer's :rollData).
+        const prompt = AstUtils.getContainerOfType(expression, isPrompt);
+        const variable = AstUtils.getContainerOfType(prompt === null || prompt === void 0 ? void 0 : prompt.$container, isVariableExpression);
+        const action = AstUtils.getContainerOfType(prompt === null || prompt === void 0 ? void 0 : prompt.$container, isAction);
+        const promptPath = `${(_0 = action === null || action === void 0 ? void 0 : action.name.toLowerCase()) !== null && _0 !== void 0 ? _0 : ""}${(_1 = variable === null || variable === void 0 ? void 0 : variable.name.toLowerCase()) !== null && _1 !== void 0 ? _1 : ""}`;
+        const ref = (_2 = expression.property) === null || _2 === void 0 ? void 0 : _2.ref;
+        const fieldName = (_4 = (_3 = ref === null || ref === void 0 ? void 0 : ref.name) === null || _3 === void 0 ? void 0 : _3.toLowerCase()) !== null && _4 !== void 0 ? _4 : "";
+        const base = `context.system.${promptPath}.${fieldName}`;
+        const hasSub = ((_6 = (_5 = expression.subProperties) === null || _5 === void 0 ? void 0 : _5.length) !== null && _6 !== void 0 ? _6 : 0) > 0;
+        // A dice prompt input is stored as {die, number} (its `.value` formula is derived
+        // data, which a prompt doesn't compute). Build the "<number><die>" formula string
+        // so it drops into the roll as e.g. "2d6"; reading both keeps it reactive.
+        if (isDiceField(ref) && !hasSub) {
+            return expandToNode `
+                        "${fieldName}": \`\${${base}.number}\${${base}.die}\`
+                    `;
+        }
+        // A die prompt input is stored as the die string itself (e.g. "d8").
+        if (isDieField(ref) && !hasSub) {
+            return expandToNode `
+                        "${fieldName}": ${base}
+                    `;
+        }
+        let key = fieldName;
+        let dataPath = base;
+        for (const subProperty of (_7 = expression.subProperties) !== null && _7 !== void 0 ? _7 : []) {
+            key = `${key}.${subProperty}`;
+            dataPath = `${dataPath}.${subProperty.toLowerCase()}`;
+        }
+        return expandToNode `
+                    "${key.replaceAll(".", "").toLowerCase()}": ${dataPath} ?? 0
+                `;
+    }
+    if (isAccess(expression)) {
+        let path = "context.object.system";
+        let label = "";
+        console.log("Access:", (_9 = (_8 = expression.property) === null || _8 === void 0 ? void 0 : _8.ref) === null || _9 === void 0 ? void 0 : _9.name, (_11 = (_10 = expression.propertyLookup) === null || _10 === void 0 ? void 0 : _10.ref) === null || _11 === void 0 ? void 0 : _11.name);
+        if (expression.propertyLookup != undefined) {
+            path = `${path}[context.object.${getSystemPath(expression.propertyLookup.ref)}.toLowerCase()]`;
+            label = `${(_12 = expression.propertyLookup.ref) === null || _12 === void 0 ? void 0 : _12.name}`;
+        }
+        else if (isParentPropertyRefExp((_13 = expression.property) === null || _13 === void 0 ? void 0 : _13.ref)) {
+            path = `${path}.${(_15 = (_14 = expression.property) === null || _14 === void 0 ? void 0 : _14.ref) === null || _15 === void 0 ? void 0 : _15.name.toLowerCase()}`;
+            label = `${(_17 = (_16 = expression.property) === null || _16 === void 0 ? void 0 : _16.ref) === null || _17 === void 0 ? void 0 : _17.name}`;
+            let subProperty = "";
+            if (((_18 = expression.property) === null || _18 === void 0 ? void 0 : _18.ref.propertyType) == "resource" || ((_19 = expression.property) === null || _19 === void 0 ? void 0 : _19.ref.propertyType) == "tracker" || ((_20 = expression.property) === null || _20 === void 0 ? void 0 : _20.ref.propertyType) == "choice"
+                && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] !== "value")) {
+                subProperty = "?.value";
+            }
+            if (((_21 = expression.property) === null || _21 === void 0 ? void 0 : _21.ref.propertyType) == "attribute" && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] !== "mod")) {
+                subProperty = "?.mod";
+            }
+            console.log(label, path);
+            return expandToNode `
+                        "${label.replaceAll(".", "").replaceAll(" ", "").toLowerCase()}": foundry.utils.getProperty(context.object.parent, ${path}.toLowerCase())${subProperty}
+                    `;
+        }
+        else if (isSelfPropertyRefExp((_22 = expression.property) === null || _22 === void 0 ? void 0 : _22.ref)) {
+            // For self property references, we dynamically resolve the property path
+            let selfPropertyPath = `context.object.system.${(_24 = (_23 = expression.property) === null || _23 === void 0 ? void 0 : _23.ref) === null || _24 === void 0 ? void 0 : _24.name.toLowerCase()}`;
+            let subProperty = "";
+            label = `${(_26 = (_25 = expression.property) === null || _25 === void 0 ? void 0 : _25.ref) === null || _26 === void 0 ? void 0 : _26.name}`;
+            if (((_27 = expression.property) === null || _27 === void 0 ? void 0 : _27.ref.propertyType) == "resource" || ((_28 = expression.property) === null || _28 === void 0 ? void 0 : _28.ref.propertyType) == "tracker" || ((_29 = expression.property) === null || _29 === void 0 ? void 0 : _29.ref.propertyType) == "choice"
+                && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] !== "value")) {
+                subProperty = "?.value";
+            }
+            if (((_30 = expression.property) === null || _30 === void 0 ? void 0 : _30.ref.propertyType) == "attribute" && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] !== "mod")) {
+                subProperty = "?.mod";
+            }
+            console.log(label, selfPropertyPath);
+            return expandToNode `
+                        "${label.replaceAll(".", "").replaceAll(" ", "").toLowerCase()}": foundry.utils.getProperty(context.object, "system." + ${selfPropertyPath}.toLowerCase())${subProperty}
+                    `;
+        }
+        else {
+            // Special handling for document choices - expand into individual data entries
+            if (expression.property && isDocumentChoicesExp(expression.property.ref) && expression.subProperties && expression.subProperties.length > 0) {
+                const choicesFieldName = expression.property.ref.name.toLowerCase();
+                const subPropertyName = expression.subProperties[0].toLowerCase();
+                // Generate data for each document in the choices array
+                return expandToNode `
+                            ...Object.fromEntries(context.object.system.${choicesFieldName}.map((doc, index) => {
+                                if (!doc || !doc.system) return null;
+                                
+                                // Determine the accessor based on property type
+                                let accessor = '.${subPropertyName}';
+                                ${isResourceExp((_31 = expression.property) === null || _31 === void 0 ? void 0 : _31.ref) || isTrackerExp((_32 = expression.property) === null || _32 === void 0 ? void 0 : _32.ref) ? `
+                                if (doc.system.${subPropertyName} && typeof doc.system.${subPropertyName} === 'object' && 'value' in doc.system.${subPropertyName}) {
+                                    accessor = '.${subPropertyName}.value';
+                                }` : ''}
+                                ${isAttributeExp((_33 = expression.property) === null || _33 === void 0 ? void 0 : _33.ref) ? `
+                                if (doc.system.${subPropertyName} && typeof doc.system.${subPropertyName} === 'object' && 'mod' in doc.system.${subPropertyName}) {
+                                    accessor = '.${subPropertyName}.mod';
+                                }` : ''}
+                                
+                                const key = doc.uuid.replace(/[^a-zA-Z0-9]/g, '').toLowerCase() + '${subPropertyName}';
+                                const value = foundry.utils.getProperty(doc, 'system' + accessor) ?? 0;
+                                return [key, value];
+                            }).filter(Boolean))
+                        `;
+            }
+            path = `${path}.${(_35 = (_34 = expression.property) === null || _34 === void 0 ? void 0 : _34.ref) === null || _35 === void 0 ? void 0 : _35.name.toLowerCase()}`;
+            label = `${(_37 = (_36 = expression.property) === null || _36 === void 0 ? void 0 : _36.ref) === null || _37 === void 0 ? void 0 : _37.name}`;
+            if ((isResourceExp((_38 = expression.property) === null || _38 === void 0 ? void 0 : _38.ref) || isTrackerExp((_39 = expression.property) === null || _39 === void 0 ? void 0 : _39.ref) || isStringChoiceField((_40 = expression.property) === null || _40 === void 0 ? void 0 : _40.ref))
+                && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] == "value")) {
+                path = `${path}.value`;
+            }
+            if (isDiceField((_41 = expression.property) === null || _41 === void 0 ? void 0 : _41.ref) && (expression.subProperties == undefined || expression.subProperties.length == 0)) {
+                // For dice fields without subproperties, use the dice value
+                path = `${path}.value`;
+            }
+            if (isDieField((_42 = expression.property) === null || _42 === void 0 ? void 0 : _42.ref)) {
+                // For die fields, the value is just the die size (e.g., "d6"), we want to use the field name as label
+                // Don't change the path, just ensure the label is the field name
+            }
+            if (isAttributeExp((_43 = expression.property) === null || _43 === void 0 ? void 0 : _43.ref) && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] !== "mod")) {
+                path = `${path}.mod`;
+            }
+        }
+        for (const subProperty of (_44 = expression.subProperties) !== null && _44 !== void 0 ? _44 : []) {
+            path = `${path}.${subProperty}`;
+            label = `${label} ${humanize(subProperty)}`;
+        }
+        console.log(label, path);
+        return expandToNode `
+                    "${label.replaceAll(".", "").replaceAll(" ", "").toLowerCase()}": ${path} ?? 0
+                `;
+    }
+    if (isFleetingAccess(expression)) {
+        console.log("Fleeting Access:", (_45 = expression.variable.ref) === null || _45 === void 0 ? void 0 : _45.name);
+        // If this is a roll expression, just skip it
+        if (isRoll((_46 = expression.variable.ref) === null || _46 === void 0 ? void 0 : _46.value)) {
+            return;
+        }
+        let path = (_47 = expression.variable.ref) === null || _47 === void 0 ? void 0 : _47.name;
+        // The roll-data key must match the formula's `@`-reference, which collapses the
+        // dotted path and lowercases it (see translateDiceParts: `@answer.bonus` -> `@answerbonus`).
+        let label = (_50 = (_49 = (_48 = expression.variable.ref) === null || _48 === void 0 ? void 0 : _48.name) === null || _49 === void 0 ? void 0 : _49.toLowerCase()) !== null && _50 !== void 0 ? _50 : "";
+        if (expression.subProperty != undefined) {
+            path = `${path}.${fleetingSubProperty(expression)}`;
+            label = `${label}${expression.subProperty.toLowerCase()}`;
+        }
+        if (expression.arrayAccess != undefined) {
+            console.log("Array Access:", expression.arrayAccess.$type);
+            let accessExp = translateExpression(entry, id, expression.arrayAccess, preDerived, generatingProperty);
+            path = `${path}[${(_51 = accessExp === null || accessExp === void 0 ? void 0 : accessExp.contents) === null || _51 === void 0 ? void 0 : _51.toString()}]`;
+        }
+        console.log(label, path);
+        return expandToNode `
+                    "${label}": ${path} ?? 0
+                `;
+    }
+    // if (isVariableAccess(expression)) {
+    //     console.log("Variable Access:", expression.name);
+    //     if (isParameter(expression)) {
+    //         console.log("Parameter:", expression.name);
+    //         return expandToNode`
+    //             "${expression.name}": ${expression.name}
+    //         `;
+    //     }
+    //     if (isVariableExpression(expression)) {
+    //         console.log("Variable Expression:", expression.name);
+    //         if (isExpression(expression.value)) {
+    //             console.log("Expression:", expression.name);
+    //             return translateDiceData(expression.value);
+    //         }
+    //         if (isPrompt(expression.value)) {
+    //             console.log("Prompt:", expression.name);
+    //             return expandToNode`
+    //                 "${expression.name}": ${expression.name}
+    //             `;
+    //         }
+    //     }
+    //     throw new Error("Variable Access not implemented");
+    // }
+    if (isRef(expression)) {
+        console.log("Ref:", (_52 = expression.val.ref) === null || _52 === void 0 ? void 0 : _52.name);
+        // If string or number, return the value
+        if (typeof expression.val == "string" || typeof expression.val == "number") {
+            console.log(expression.val);
+            return expandToNode `
+                        "${expression.val}": ${expression.val}
+                    `;
+        }
+        if (expression.val.ref == undefined) {
+            return;
+        }
+        if (expression.subProperties != undefined && expression.subProperties.length > 0) {
+            return expandToNode `
+                        "${(_53 = expression.val.ref) === null || _53 === void 0 ? void 0 : _53.name.toLowerCase()}${expression.subProperties[0].toLowerCase()}": ${(_54 = expression.val.ref) === null || _54 === void 0 ? void 0 : _54.name}.${expression.subProperties[0].toLowerCase()} ?? 0
+                    `;
+        }
+        console.log((_55 = expression.val.ref) === null || _55 === void 0 ? void 0 : _55.name, (_56 = expression.val.ref) === null || _56 === void 0 ? void 0 : _56.$type);
+        return expandToNode `
+                    "${(_59 = (_58 = (_57 = expression.val.ref) === null || _57 === void 0 ? void 0 : _57.name) === null || _58 === void 0 ? void 0 : _58.toLowerCase()) !== null && _59 !== void 0 ? _59 : expression.val.$refText}": ${(_61 = (_60 = expression.val.ref) === null || _60 === void 0 ? void 0 : _60.name) !== null && _61 !== void 0 ? _61 : expression.val.$refText} ?? 0
+                `;
+    }
+    if (isBinaryExpression(expression)) {
+        const expressions = [expression.e1, expression.e2];
+        return expandToNode `
+                    ${joinToNode(expressions, e => translateDiceData(e, entry, id, preDerived, generatingProperty), { separator: ", " })}
+                `;
+    }
+    if (isGroup(expression)) {
+        return expandToNode `
+                    ${translateDiceData(expression.ge, entry, id, preDerived, generatingProperty)}
+                `;
+    }
+    return undefined;
+}
 export function translateExpression(entry, id, expression, preDerived = false, generatingProperty = undefined) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
     function humanize(string) {
@@ -17,14 +504,14 @@ export function translateExpression(entry, id, expression, preDerived = false, g
     //console.log(preDerived, generatingProperty);
     function translateMethodExpression(expression) {
         //console.log("Translating Method Expression: " + expression.name);
-        return expandToNode `
-            ${expression.type == "fleeting" ? "let" : "const"} ${expression.name} = ${translateExpression(entry, id, expression.value, preDerived, generatingProperty)};
+        return expandToNode `
+            ${expression.type == "fleeting" ? "let" : "const"} ${expression.name} = ${translateExpression(entry, id, expression.value, preDerived, generatingProperty)};
         `;
     }
     function translateReturnExpression(expression) {
         //console.log("Translating Return Expression: " + expression.value);
-        return expandToNode `
-            return ${translateExpression(entry, id, expression.value, preDerived, generatingProperty)};
+        return expandToNode `
+            return ${translateExpression(entry, id, expression.value, preDerived, generatingProperty)};
         `;
     }
     function translateAssignmentExpression(expression) {
@@ -37,46 +524,46 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             const fieldName = (_e = (_d = expression.property) === null || _d === void 0 ? void 0 : _d.ref) === null || _e === void 0 ? void 0 : _e.name.toLowerCase();
             const modifier = expression.term == "++" ? "+ 1" : "- 1";
             const readPath = getSystemPath((_f = expression.property) === null || _f === void 0 ? void 0 : _f.ref, expression.subProperties, (_g = expression.propertyLookup) === null || _g === void 0 ? void 0 : _g.ref);
-            return expandToNode `
-                const ${fieldName}DieChoices = ["d4","d6","d8","d10","d12","d20"];
-                const ${fieldName}CurrentDieIndex = ${fieldName}DieChoices.indexOf(context.object.${readPath});
-                if (${fieldName}CurrentDieIndex === -1) {
-                    console.error("Invalid die size: " + context.object.${readPath});
-                    update["${systemPath}"] = 'd4';
-                    return;
-                }
-                let ${fieldName}NewDieIndex = ${fieldName}CurrentDieIndex;
-                ${fieldName}NewDieIndex = Math.max(0, Math.min(${fieldName}DieChoices.length - 1, ${fieldName}CurrentDieIndex ${modifier}));
-                update["${systemPath}"] = ${fieldName}DieChoices[${fieldName}NewDieIndex];
+            return expandToNode `
+                const ${fieldName}DieChoices = ["d4","d6","d8","d10","d12","d20"];
+                const ${fieldName}CurrentDieIndex = ${fieldName}DieChoices.indexOf(context.object.${readPath});
+                if (${fieldName}CurrentDieIndex === -1) {
+                    console.error("Invalid die size: " + context.object.${readPath});
+                    update["${systemPath}"] = 'd4';
+                    return;
+                }
+                let ${fieldName}NewDieIndex = ${fieldName}CurrentDieIndex;
+                ${fieldName}NewDieIndex = Math.max(0, Math.min(${fieldName}DieChoices.length - 1, ${fieldName}CurrentDieIndex ${modifier}));
+                update["${systemPath}"] = ${fieldName}DieChoices[${fieldName}NewDieIndex];
             `;
         }
         if ((isResourceExp((_h = expression.property) === null || _h === void 0 ? void 0 : _h.ref) || isTrackerExp((_j = expression.property) === null || _j === void 0 ? void 0 : _j.ref)) && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] == "temp")) {
             // We need to check for temp first when decrementing
             const tempPath = `system.${(_l = (_k = expression.property) === null || _k === void 0 ? void 0 : _k.ref) === null || _l === void 0 ? void 0 : _l.name.toLowerCase()}.temp`;
             if (isIncrementDecrementAssignment(expression) && expression.term == "--") {
-                return expandToNode `
-                    if ( context.object.${tempPath} > 0 ) {
-                        update["${tempPath}"] = context.object.${tempPath} - 1;
-                    }
-                    else {
-                        update["${systemPath}"] = context.object.${systemPath} - 1;
-                    }
+                return expandToNode `
+                    if ( context.object.${tempPath} > 0 ) {
+                        update["${tempPath}"] = context.object.${tempPath} - 1;
+                    }
+                    else {
+                        update["${systemPath}"] = context.object.${systemPath} - 1;
+                    }
                 `;
             }
             if (isQuickModifyAssignment(expression) && expression.term == "-=") {
-                return expandToNode `
-                    if ( context.object.${tempPath} > 0 ) {
-                        update["${tempPath}"] = context.object.${tempPath} - ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
-
-                        if ( update["${tempPath}"] < 0 ) {
-                            // Apply the remainder to the system property
-                            update["${systemPath}"] = context.object.${systemPath} + update["${tempPath}"];
-                            update["${tempPath}"] = 0;
-                        }
-                    }
-                    else {
-                        update["${systemPath}"] = context.object.${systemPath} - ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
-                    }
+                return expandToNode `
+                    if ( context.object.${tempPath} > 0 ) {
+                        update["${tempPath}"] = context.object.${tempPath} - ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
+
+                        if ( update["${tempPath}"] < 0 ) {
+                            // Apply the remainder to the system property
+                            update["${systemPath}"] = context.object.${systemPath} + update["${tempPath}"];
+                            update["${tempPath}"] = 0;
+                        }
+                    }
+                    else {
+                        update["${systemPath}"] = context.object.${systemPath} - ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
+                    }
                 `;
             }
         }
@@ -88,8 +575,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             function generateModification() {
                 if (isIncrementDecrementAssignment(expression)) {
                     const modifier = expression.term == "++" ? "+" : "-";
-                    return expandToNode `
-                        ${propertyName}NewDieIndex = Math.max(0, Math.min(${propertyName}DieChoices.length - 1, ${propertyName}CurrentDieIndex ${modifier} 1));
+                    return expandToNode `
+                        ${propertyName}NewDieIndex = Math.max(0, Math.min(${propertyName}DieChoices.length - 1, ${propertyName}CurrentDieIndex ${modifier} 1));
                     `;
                 }
                 if (isQuickModifyAssignment(expression)) {
@@ -111,25 +598,25 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                             modifier = "+";
                             break;
                     }
-                    return expandToNode `
-                        ${propertyName}NewDieIndex = Math.max(0, Math.min(${propertyName}DieChoices.length - 1, ${propertyName}CurrentDieIndex ${modifier} ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)}));
+                    return expandToNode `
+                        ${propertyName}NewDieIndex = Math.max(0, Math.min(${propertyName}DieChoices.length - 1, ${propertyName}CurrentDieIndex ${modifier} ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)}));
                     `;
                 }
-                return expandToNode `
-                    ${propertyName}NewDieIndex = Math.max(0, Math.min(${propertyName}DieChoices.length - 1, ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)}));
+                return expandToNode `
+                    ${propertyName}NewDieIndex = Math.max(0, Math.min(${propertyName}DieChoices.length - 1, ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)}));
                 `;
             }
-            return expandToNode `
-                const ${propertyName}DieChoices = ${JSON.stringify(dieChoices)};
-                const ${propertyName}CurrentDieIndex = ${propertyName}DieChoices.indexOf(context.object.${systemPath});
-                if (${propertyName}CurrentDieIndex === -1) {
-                    console.error("Invalid die size: " + context.object.${systemPath});
-                    update["${systemPath}"] = '${dieChoices[0]}';
-                    return;
-                }
-                let ${propertyName}NewDieIndex = ${propertyName}CurrentDieIndex;
-                ${generateModification()}
-                update["${systemPath}"] = ${propertyName}DieChoices[${propertyName}NewDieIndex];
+            return expandToNode `
+                const ${propertyName}DieChoices = ${JSON.stringify(dieChoices)};
+                const ${propertyName}CurrentDieIndex = ${propertyName}DieChoices.indexOf(context.object.${systemPath});
+                if (${propertyName}CurrentDieIndex === -1) {
+                    console.error("Invalid die size: " + context.object.${systemPath});
+                    update["${systemPath}"] = '${dieChoices[0]}';
+                    return;
+                }
+                let ${propertyName}NewDieIndex = ${propertyName}CurrentDieIndex;
+                ${generateModification()}
+                update["${systemPath}"] = ${propertyName}DieChoices[${propertyName}NewDieIndex];
             `;
         }
         // Special case for dice fields with .die subproperty - use die choice navigation
@@ -138,23 +625,23 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             const fieldName = (_v = (_u = expression.property) === null || _u === void 0 ? void 0 : _u.ref) === null || _v === void 0 ? void 0 : _v.name.toLowerCase();
             const modifier = expression.term == "++" ? "+ 1" : "- 1";
             const readPath = getSystemPath((_w = expression.property) === null || _w === void 0 ? void 0 : _w.ref, expression.subProperties, (_x = expression.propertyLookup) === null || _x === void 0 ? void 0 : _x.ref);
-            return expandToNode `
-                const ${fieldName}DieChoices = ["d4","d6","d8","d10","d12","d20"];
-                const ${fieldName}CurrentDieIndex = ${fieldName}DieChoices.indexOf(context.object.${readPath});
-                if (${fieldName}CurrentDieIndex === -1) {
-                    console.error("Invalid die size: " + context.object.${readPath});
-                    update["${systemPath}"] = 'd4';
-                    return;
-                }
-                let ${fieldName}NewDieIndex = ${fieldName}CurrentDieIndex;
-                ${fieldName}NewDieIndex = Math.max(0, Math.min(${fieldName}DieChoices.length - 1, ${fieldName}CurrentDieIndex ${modifier}));
-                update["${systemPath}"] = ${fieldName}DieChoices[${fieldName}NewDieIndex];
+            return expandToNode `
+                const ${fieldName}DieChoices = ["d4","d6","d8","d10","d12","d20"];
+                const ${fieldName}CurrentDieIndex = ${fieldName}DieChoices.indexOf(context.object.${readPath});
+                if (${fieldName}CurrentDieIndex === -1) {
+                    console.error("Invalid die size: " + context.object.${readPath});
+                    update["${systemPath}"] = 'd4';
+                    return;
+                }
+                let ${fieldName}NewDieIndex = ${fieldName}CurrentDieIndex;
+                ${fieldName}NewDieIndex = Math.max(0, Math.min(${fieldName}DieChoices.length - 1, ${fieldName}CurrentDieIndex ${modifier}));
+                update["${systemPath}"] = ${fieldName}DieChoices[${fieldName}NewDieIndex];
             `;
         }
         if (isIncrementDecrementAssignment(expression)) {
             const modifier = expression.term == "++" ? "+" : "-";
-            return expandToNode `
-                update["${systemPath}"] = context.object.${systemPath} ${modifier} 1;
+            return expandToNode `
+                update["${systemPath}"] = context.object.${systemPath} ${modifier} 1;
             `;
         }
         if (isQuickModifyAssignment(expression)) {
@@ -176,12 +663,12 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                     modifier = "+";
                     break;
             }
-            return expandToNode `
-                update["${systemPath}"] = context.object.${systemPath} ${modifier} ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
+            return expandToNode `
+                update["${systemPath}"] = context.object.${systemPath} ${modifier} ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
             `;
         }
-        return expandToNode `
-            update["${systemPath}"] = ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
+        return expandToNode `
+            update["${systemPath}"] = ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
         `;
     }
     function translateVariableAssignment(expression) {
@@ -192,18 +679,18 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         }
         // ++ or --
         if (isVariableIncrementDecrementAssignment(expression)) {
-            return expandToNode `
-                ${name}${expression.term};
+            return expandToNode `
+                ${name}${expression.term};
             `;
         }
         // +=, -=, *=, /=
         if (isVariableQuickModifyAssignment(expression)) {
-            return expandToNode `
-                ${name} ${expression.term} ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
+            return expandToNode `
+                ${name} ${expression.term} ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
             `;
         }
-        return expandToNode `
-            ${name} = ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
+        return expandToNode `
+            ${name} = ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
         `;
     }
     function translateParentAssignmentExpression(expression) {
@@ -212,8 +699,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         let systemPath = getSystemPath((_a = expression.property) === null || _a === void 0 ? void 0 : _a.ref, expression.subProperties, (_b = expression.propertyLookup) === null || _b === void 0 ? void 0 : _b.ref, false, true);
         if (isParentIncrementDecrementAssignment(expression)) {
             const modifier = expression.term == "++" ? "+" : "-";
-            return expandToNode `
-                parentUpdate["${systemPath}"] = context.object.parent.${systemPath} ${modifier} 1;
+            return expandToNode `
+                parentUpdate["${systemPath}"] = context.object.parent.${systemPath} ${modifier} 1;
             `;
         }
         if (isParentQuickModifyAssignment(expression)) {
@@ -235,12 +722,12 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                     modifier = "+";
                     break;
             }
-            return expandToNode `
-                parentUpdate["${systemPath}"] = context.object.parent.${systemPath} ${modifier} ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
+            return expandToNode `
+                parentUpdate["${systemPath}"] = context.object.parent.${systemPath} ${modifier} ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
             `;
         }
-        return expandToNode `
-            parentUpdate["${systemPath}"] = ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
+        return expandToNode `
+            parentUpdate["${systemPath}"] = ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
         `;
     }
     function translateTargetAssignmentExpression(expression) {
@@ -248,8 +735,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         let systemPath = getSystemPath((_a = expression.property) === null || _a === void 0 ? void 0 : _a.ref, expression.subProperties, undefined, false, true);
         if (isTargetIncrementDecrementAssignment(expression)) {
             const modifier = expression.term == "++" ? "+" : "-";
-            return expandToNode `
-                targetUpdate["${systemPath}"] = context.target.${systemPath} ${modifier} 1;
+            return expandToNode `
+                targetUpdate["${systemPath}"] = context.target.${systemPath} ${modifier} 1;
             `;
         }
         if (isTargetQuickModifyAssignment(expression)) {
@@ -271,12 +758,12 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                     modifier = "+";
                     break;
             }
-            return expandToNode `
-                targetUpdate["${systemPath}"] = context.target.${systemPath} ${modifier} ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
+            return expandToNode `
+                targetUpdate["${systemPath}"] = context.target.${systemPath} ${modifier} ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
             `;
         }
-        return expandToNode `
-            targetUpdate["${systemPath}"] = ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
+        return expandToNode `
+            targetUpdate["${systemPath}"] = ${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)};
         `;
     }
     function translateBinaryExpression(expression) {
@@ -306,26 +793,26 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         console.log("Translating Literal Expression: " + expression.val);
         if (typeof expression.val == "string") {
             if (expression.val == "nothing") {
-                return expandToNode `
-                    null
+                return expandToNode `
+                    null
                 `;
             }
             else if (expression.val == "true" || expression.val == "false") {
-                return expandToNode `
-                    ${expression.val}
+                return expandToNode `
+                    ${expression.val}
                 `;
             }
             if (isInitiativeProperty(generatingProperty)) {
-                return expandToNode `
-                    ${expression.val}
+                return expandToNode `
+                    ${expression.val}
                 `;
             }
-            return expandToNode `
-             "${expression.val}"
+            return expandToNode `
+             "${expression.val}"
             `;
         }
-        return expandToNode `
-            ${expression.val}
+        return expandToNode `
+            ${expression.val}
         `;
     }
     function translateReferenceExpression(expression) {
@@ -365,14 +852,14 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             accessPath = `${accessPath}.total`;
         }
         console.log("Access Path: ", accessPath);
-        return expandToNode `
-            ${accessPath}
+        return expandToNode `
+            ${accessPath}
         `;
     }
     function translateGroupedExpression(expression) {
         //console.log("Translating Grouped Expression: " + expression.ge);
-        return expandToNode `
-            (${translateExpression(entry, id, expression.ge, preDerived, generatingProperty)})
+        return expandToNode `
+            (${translateExpression(entry, id, expression.ge, preDerived, generatingProperty)})
         `;
     }
     function translateNegatedExpression(expression) {
@@ -380,12 +867,12 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         var _a;
         // If this is a boolean, we need to negate it differently
         if (isAccess(expression.ne) && isBooleanExp((_a = expression.ne.property) === null || _a === void 0 ? void 0 : _a.ref)) {
-            return expandToNode `
-                !${translateExpression(entry, id, expression.ne, preDerived, generatingProperty)}
+            return expandToNode `
+                !${translateExpression(entry, id, expression.ne, preDerived, generatingProperty)}
             `;
         }
-        return expandToNode `
-            -(${translateExpression(entry, id, expression.ne, preDerived, generatingProperty)})
+        return expandToNode `
+            -(${translateExpression(entry, id, expression.ne, preDerived, generatingProperty)})
         `;
     }
     function translateAccessExpression(expression, generatingProperty = undefined) {
@@ -404,8 +891,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                     break;
             }
             console.log("Access Name: ", accessName);
-            return expandToNode `
-                context.object.${accessName}
+            return expandToNode `
+                context.object.${accessName}
             `;
         }
         if (((_a = expression.property) === null || _a === void 0 ? void 0 : _a.ref) == undefined) {
@@ -416,20 +903,20 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         if (generatingProperty && ((_c = expression.property) === null || _c === void 0 ? void 0 : _c.ref) == generatingProperty) {
             console.log("Generating self referencing Property Access: ", (_d = expression.property.ref) === null || _d === void 0 ? void 0 : _d.name);
             if (isInitiativeProperty(generatingProperty)) {
-                return expandToNode `
-                    @system.${(_e = expression.property.ref) === null || _e === void 0 ? void 0 : _e.name.toLowerCase()}
+                return expandToNode `
+                    @system.${(_e = expression.property.ref) === null || _e === void 0 ? void 0 : _e.name.toLowerCase()}
                 `;
             }
             // Special case: For attribute self-references, use .value instead of .mod to avoid recursion
             if (isAttributeExp(generatingProperty)) {
                 const systemPath = `system.${(_f = expression.property.ref) === null || _f === void 0 ? void 0 : _f.name.toLowerCase()}.value`;
-                return expandToNode `
-                    ${systemPath}
+                return expandToNode `
+                    ${systemPath}
                 `;
             }
             const systemPath = getSystemPath((_g = expression.property) === null || _g === void 0 ? void 0 : _g.ref, expression.subProperties, generatingProperty);
-            return expandToNode `
-                ${systemPath}
+            return expandToNode `
+                ${systemPath}
             `;
         }
         // Parent/Self property references store a *path* to another property (e.g. a chosen parent
@@ -452,13 +939,13 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             }
             if (isParentPropertyRefExp((_l = expression.property) === null || _l === void 0 ? void 0 : _l.ref)) {
                 // Parent refs store a full path (e.g. "system.fight") resolved against the parent.
-                return expandToNode `
-                    foundry.utils.getProperty(context.object.parent, context.object.system.${refName}.toLowerCase())${accessor}
+                return expandToNode `
+                    foundry.utils.getProperty(context.object.parent, context.object.system.${refName}.toLowerCase())${accessor}
                 `;
             }
             // Self refs store a property name resolved against this document under system.
-            return expandToNode `
-                foundry.utils.getProperty(context.object, "system." + context.object.system.${refName}.toLowerCase())${accessor}
+            return expandToNode `
+                foundry.utils.getProperty(context.object, "system." + context.object.system.${refName}.toLowerCase())${accessor}
             `;
         }
         let systemPath = getSystemPath((_m = expression.property) === null || _m === void 0 ? void 0 : _m.ref, expression.subProperties, expression);
@@ -468,24 +955,24 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         }
         console.log("System Path: ", systemPath);
         if (isInitiativeProperty(generatingProperty)) {
-            return expandToNode `
-                @${systemPath}
+            return expandToNode `
+                @${systemPath}
             `;
         }
         if (isAction(generatingProperty)) {
-            return expandToNode `
-                context.object.${systemPath}
+            return expandToNode `
+                context.object.${systemPath}
             `;
         }
         // If accessing a property on a document choice, wrap with ?? 0 to handle missing documents
         const needsNullCoalescing = isDocumentChoiceExp((_o = expression.property) === null || _o === void 0 ? void 0 : _o.ref) && expression.subProperties && expression.subProperties.length > 0;
         if (needsNullCoalescing) {
-            return expandToNode `
-                (${systemPath} ?? 0)
+            return expandToNode `
+                (${systemPath} ?? 0)
             `;
         }
-        return expandToNode `
-            ${systemPath}
+        return expandToNode `
+            ${systemPath}
         `;
     }
     // function translateResourceAccessExpression(expression: ResourceAccess): CompositeGeneratorNode | undefined {
@@ -504,35 +991,35 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         //console.log("Translating If Statement: ");
         var _a;
         function translateElseIfStatement(elif) {
-            return expandToNode `
-                else if (${translateExpression(entry, id, elif.expression, preDerived, generatingProperty)}) {
-                    ${translateBodyExpressionToJavascript(entry, id, elif.method.body, preDerived, generatingProperty)}
-                }
+            return expandToNode `
+                else if (${translateExpression(entry, id, elif.expression, preDerived, generatingProperty)}) {
+                    ${translateBodyExpressionToJavascript(entry, id, elif.method.body, preDerived, generatingProperty)}
+                }
             `;
         }
-        return expandToNode `
-            if (${translateExpression(entry, id, expression.expression, preDerived, generatingProperty)}) {
-                ${translateBodyExpressionToJavascript(entry, id, expression.method.body, preDerived, generatingProperty)}
-            }
-            ${joinToNode(expression.elseIfs, translateElseIfStatement, { appendNewLineIfNotEmpty: true })}
-            ${expression.elseMethod != undefined ? expandToNode `
-                else {
-                    ${translateBodyExpressionToJavascript(entry, id, (_a = expression.elseMethod) === null || _a === void 0 ? void 0 : _a.body, preDerived, generatingProperty)}
-                }
-            `.appendNewLineIfNotEmpty() : ""}
+        return expandToNode `
+            if (${translateExpression(entry, id, expression.expression, preDerived, generatingProperty)}) {
+                ${translateBodyExpressionToJavascript(entry, id, expression.method.body, preDerived, generatingProperty)}
+            }
+            ${joinToNode(expression.elseIfs, translateElseIfStatement, { appendNewLineIfNotEmpty: true })}
+            ${expression.elseMethod != undefined ? expandToNode `
+                else {
+                    ${translateBodyExpressionToJavascript(entry, id, (_a = expression.elseMethod) === null || _a === void 0 ? void 0 : _a.body, preDerived, generatingProperty)}
+                }
+            `.appendNewLineIfNotEmpty() : ""}
         `;
     }
     function translateComparisonExpression(expression) {
         var _a, _b, _c, _d, _e, _f;
         console.log("Translating Comparison Expression: ");
         if (isParentTypeCheckExpression(expression)) {
-            return expandToNode `
-                context.object.parent && context.object.parent.type == "${(_b = (_a = expression.document.ref) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.toLowerCase()}"
+            return expandToNode `
+                context.object.parent && context.object.parent.type == "${(_b = (_a = expression.document.ref) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.toLowerCase()}"
             `;
         }
         if (isTargetTypeCheckExpression(expression)) {
-            return expandToNode `
-                context.target && context.target.type == "${(_d = (_c = expression.document.ref) === null || _c === void 0 ? void 0 : _c.name) === null || _d === void 0 ? void 0 : _d.toLowerCase()}"
+            return expandToNode `
+                context.target && context.target.type == "${(_d = (_c = expression.document.ref) === null || _c === void 0 ? void 0 : _c.name) === null || _d === void 0 ? void 0 : _d.toLowerCase()}"
             `;
         }
         // If the term is "equals" or "==", we need to translate it to "===" in JavaScript
@@ -543,70 +1030,70 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         if (isShorthandComparisonExpression(expression)) {
             console.log("Shorthand Comparison Expression: ", term);
             if (term == "exists") {
-                return expandToNode `
-                    ${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)} != undefined
+                return expandToNode `
+                    ${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)} != undefined
                 `;
             }
             else if (term == "!exists") {
-                return expandToNode `
-                    ${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)} == undefined
+                return expandToNode `
+                    ${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)} == undefined
                 `;
             }
             else if (term == "isEmpty") {
-                return expandToNode `
-                    (${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.length === 0
+                return expandToNode `
+                    (${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.length === 0
                 `;
             }
             else if (term == "isNotEmpty") {
-                return expandToNode `
-                    (${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.length > 0
+                return expandToNode `
+                    (${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.length > 0
                 `;
             }
-            return expandToNode `
-                ${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)} ${term}
+            return expandToNode `
+                ${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)} ${term}
             `;
         }
         console.log("Comparison Expression: ", expression.e1.$type, term, expression.e2.$type);
         if (term == "has") {
-            return expandToNode `
-                (${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.includes(${translateExpression(entry, id, expression.e2, preDerived, generatingProperty)})
+            return expandToNode `
+                (${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.includes(${translateExpression(entry, id, expression.e2, preDerived, generatingProperty)})
             `;
         }
         if (term == "excludes") {
-            return expandToNode `
-                !(${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.includes(${translateExpression(entry, id, expression.e2, preDerived, generatingProperty)})
+            return expandToNode `
+                !(${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.includes(${translateExpression(entry, id, expression.e2, preDerived, generatingProperty)})
             `;
         }
         if (term == "startsWith") {
-            return expandToNode `
-                (${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.startsWith(${translateExpression(entry, id, expression.e2, preDerived, generatingProperty)})
+            return expandToNode `
+                (${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.startsWith(${translateExpression(entry, id, expression.e2, preDerived, generatingProperty)})
             `;
         }
         if (term == "endsWith") {
-            return expandToNode `
-                (${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.endsWith(${translateExpression(entry, id, expression.e2, preDerived, generatingProperty)})
+            return expandToNode `
+                (${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)})?.endsWith(${translateExpression(entry, id, expression.e2, preDerived, generatingProperty)})
             `;
         }
-        return expandToNode `
-            ${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)} ${term} ${translateExpression(entry, id, expression.e2, preDerived, generatingProperty)}
+        return expandToNode `
+            ${translateExpression(entry, id, expression.e1, preDerived, generatingProperty)} ${term} ${translateExpression(entry, id, expression.e2, preDerived, generatingProperty)}
         `;
     }
     if (expression == undefined) {
         return;
     }
     if (typeof expression == "string" && expression == "nothing") {
-        return expandToNode `
-            null
+        return expandToNode `
+            null
         `;
     }
     if (typeof expression == "string") {
-        return expandToNode `
-            "${expression}"
+        return expandToNode `
+            "${expression}"
         `;
     }
     if (typeof expression == "number") {
-        return expandToNode `
-            ${expression}
+        return expandToNode `
+            ${expression}
         `;
     }
     if (isMethodBlock(expression)) {
@@ -657,8 +1144,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         let systemPath = getSystemPath((_a = expression.property) === null || _a === void 0 ? void 0 : _a.ref, expression.subProperties, expression, true);
         path = `${path}?.${systemPath}`;
         console.log("Translating Parent Access Expression: ", path);
-        return expandToNode `
-            ${path} ?? 0
+        return expandToNode `
+            ${path} ?? 0
         `;
     }
     if (isTargetAccess(expression)) {
@@ -666,8 +1153,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         let systemPath = getSystemPath((_b = expression.property) === null || _b === void 0 ? void 0 : _b.ref, expression.subProperties, undefined, true);
         path = `${path}?.${systemPath}`;
         console.log("Translating Target Access Expression: ", path);
-        return expandToNode `
-            ${path}
+        return expandToNode `
+            ${path}
         `;
     }
     if (isItemAccess(expression)) {
@@ -689,8 +1176,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                 }
             }
         }
-        return expandToNode `
-            ${path}
+        return expandToNode `
+            ${path}
         `;
     }
     if (isIfStatement(expression)) {
@@ -702,7 +1189,7 @@ export function translateExpression(entry, id, expression, preDerived = false, g
     if (isFleetingAccess(expression)) {
         let accessPath = (_h = expression.variable.ref) === null || _h === void 0 ? void 0 : _h.name;
         if (expression.subProperty != undefined) {
-            accessPath = `${accessPath}.${expression.subProperty}`;
+            accessPath = `${accessPath}.${fleetingSubProperty(expression)}`;
         }
         else if (expression.arrayAccess != undefined) {
             accessPath = `${accessPath}[${translateExpression(entry, id, expression.arrayAccess, preDerived, generatingProperty)}]`;
@@ -715,19 +1202,19 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             // for dice display, so this does not affect "chat { roll1 }".
             accessPath = `${accessPath}.total`;
         }
-        return expandToNode `
-            ${accessPath}
+        return expandToNode `
+            ${accessPath}
         `;
     }
     if (isParameter(expression)) {
-        return expandToNode `
-            ${expression.name}
+        return expandToNode `
+            ${expression.name}
         `;
     }
     if (isJS(expression)) {
         // Remove the last "}" from the JS expression
-        return expandToNode `
-            ${expression.js.replace("@js{", "").slice(0, -1)}
+        return expandToNode `
+            ${expression.js.replace("@js{", "").slice(0, -1)}
         `;
     }
     if (isChatCard(expression)) {
@@ -744,43 +1231,43 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                         case "Effects":
                             return undefined; // Renders in a different way
                         case "DocumentType":
-                            return expandToNode `
-                                { isRoll: false, label: "Type", value: context.object.type, wide: ${wide}, hasValue: context.object.type != "" },
+                            return expandToNode `
+                                { isRoll: false, label: "Type", value: context.object.type, wide: ${wide}, hasValue: context.object.type != "" },
                             `;
                         case "EditMode":
-                            return expandToNode `
-                                { isRoll: false, label: "Edit Mode", value: context.object.getFlag('${id}', 'editMode') ?? true, wide: ${wide}, hasValue: context.object.getFlag('${id}', 'editMode') != undefined },
+                            return expandToNode `
+                                { isRoll: false, label: "Edit Mode", value: context.object.getFlag('${id}', 'editMode') ?? true, wide: ${wide}, hasValue: context.object.getFlag('${id}', 'editMode') != undefined },
                             `;
                         // Properties on the document
                         default:
-                            return expandToNode `
-                                { isRoll: false, label: "${expression.access.toString()}", value: context.object.${expression.access.toString().toLowerCase()}, wide: ${wide}, hasValue: context.object.${expression.access.toString().toLowerCase()} != "" },
+                            return expandToNode `
+                                { isRoll: false, label: "${expression.access.toString()}", value: context.object.${expression.access.toString().toLowerCase()}, wide: ${wide}, hasValue: context.object.${expression.access.toString().toLowerCase()} != "" },
                             `;
                     }
                 }
                 if (isMeasuredTemplateField((_d = expression.property) === null || _d === void 0 ? void 0 : _d.ref)) {
-                    return expandToNode `
-                        { isRoll: false, isMeasuredTemplate: true, label: "${humanize((_g = (_f = (_e = expression.property) === null || _e === void 0 ? void 0 : _e.ref) === null || _f === void 0 ? void 0 : _f.name) !== null && _g !== void 0 ? _g : "")}", value: context.object.${systemPath}?.summary, wide: true, hasValue: context.object.${systemPath} != undefined, object: context.object.${systemPath} },
+                    return expandToNode `
+                        { isRoll: false, isMeasuredTemplate: true, label: "${humanize((_g = (_f = (_e = expression.property) === null || _e === void 0 ? void 0 : _e.ref) === null || _f === void 0 ? void 0 : _f.name) !== null && _g !== void 0 ? _g : "")}", value: context.object.${systemPath}?.summary, wide: true, hasValue: context.object.${systemPath} != undefined, object: context.object.${systemPath} },
                     `;
                 }
                 if (isParentPropertyRefExp((_h = expression.property) === null || _h === void 0 ? void 0 : _h.ref)) {
-                    return expandToNode `
-                        { isRoll: false, label: "${humanize((_l = (_k = (_j = expression.property) === null || _j === void 0 ? void 0 : _j.ref) === null || _k === void 0 ? void 0 : _k.name) !== null && _l !== void 0 ? _l : "")}", value: context.object.${systemPath}.replace("system", "").replaceAll(".", "").titleCase(), wide: ${wide}, hasValue: context.object.${systemPath} != "" },
+                    return expandToNode `
+                        { isRoll: false, label: "${humanize((_l = (_k = (_j = expression.property) === null || _j === void 0 ? void 0 : _j.ref) === null || _k === void 0 ? void 0 : _k.name) !== null && _l !== void 0 ? _l : "")}", value: context.object.${systemPath}.replace("system", "").replaceAll(".", "").titleCase(), wide: ${wide}, hasValue: context.object.${systemPath} != "" },
                     `;
                 }
                 if (isSelfPropertyRefExp((_m = expression.property) === null || _m === void 0 ? void 0 : _m.ref)) {
-                    return expandToNode `
-                        { isRoll: false, label: "${humanize((_q = (_p = (_o = expression.property) === null || _o === void 0 ? void 0 : _o.ref) === null || _p === void 0 ? void 0 : _p.name) !== null && _q !== void 0 ? _q : "")}", value: foundry.utils.getProperty(context.object, context.object.${systemPath}).replace("system", "").replaceAll(".", "").titleCase(), wide: ${wide}, hasValue: context.object.${systemPath} != "" },
+                    return expandToNode `
+                        { isRoll: false, label: "${humanize((_q = (_p = (_o = expression.property) === null || _o === void 0 ? void 0 : _o.ref) === null || _p === void 0 ? void 0 : _p.name) !== null && _q !== void 0 ? _q : "")}", value: foundry.utils.getProperty(context.object, context.object.${systemPath}).replace("system", "").replaceAll(".", "").titleCase(), wide: ${wide}, hasValue: context.object.${systemPath} != "" },
                     `;
                 }
-                return expandToNode `
-                    { isRoll: false, label: "${humanize((_t = (_s = (_r = expression.property) === null || _r === void 0 ? void 0 : _r.ref) === null || _s === void 0 ? void 0 : _s.name) !== null && _t !== void 0 ? _t : "")}", value: context.object.${systemPath}, wide: ${wide}, hasValue: context.object.${systemPath} != "" },
+                return expandToNode `
+                    { isRoll: false, label: "${humanize((_t = (_s = (_r = expression.property) === null || _r === void 0 ? void 0 : _r.ref) === null || _s === void 0 ? void 0 : _s.name) !== null && _t !== void 0 ? _t : "")}", value: context.object.${systemPath}, wide: ${wide}, hasValue: context.object.${systemPath} != "" },
                 `;
             }
             if (isFleetingAccess(expression)) {
                 let accessPath = (_u = expression.variable.ref) === null || _u === void 0 ? void 0 : _u.name;
                 if (expression.subProperty != undefined) {
-                    accessPath = `${accessPath}.${expression.subProperty}`;
+                    accessPath = `${accessPath}.${fleetingSubProperty(expression)}`;
                 }
                 let roll = false;
                 let wide = expression.type == "wide" ? true : false;
@@ -789,49 +1276,49 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                 if (isDamageRoll((_v = expression.variable.ref) === null || _v === void 0 ? void 0 : _v.value)) {
                     roll = true;
                     wide = true;
-                    return expandToNode `
-                        { 
-                            isRoll: ${roll}, 
-                            isDamageRoll: true,
-                            label: "${humanize((_x = (_w = expression.variable.ref) === null || _w === void 0 ? void 0 : _w.name) !== null && _x !== void 0 ? _x : "")}", 
-                            value: ${accessPath}, 
-                            wide: ${wide}, 
-                            tooltip: await ${accessPath}.getTooltip(),
-                            damageType: ${accessPath}.options.type.value,
-                            damageIcon: ${accessPath}.options.type.icon,
-                            damageColor: ${accessPath}.options.type.color,
-                            damageMetadata: ${accessPath}.options.type
-                        },
+                    return expandToNode `
+                        { 
+                            isRoll: ${roll}, 
+                            isDamageRoll: true,
+                            label: "${humanize((_x = (_w = expression.variable.ref) === null || _w === void 0 ? void 0 : _w.name) !== null && _x !== void 0 ? _x : "")}", 
+                            value: ${accessPath}, 
+                            wide: ${wide}, 
+                            tooltip: await ${accessPath}.getTooltip(),
+                            damageType: ${accessPath}.options.type.value,
+                            damageIcon: ${accessPath}.options.type.icon,
+                            damageColor: ${accessPath}.options.type.color,
+                            damageMetadata: ${accessPath}.options.type
+                        },
                     `;
                 }
                 if (isRoll((_y = expression.variable.ref) === null || _y === void 0 ? void 0 : _y.value)) {
                     roll = true;
                     wide = true;
-                    return expandToNode `
-                        { isRoll: ${roll}, label: "${humanize((_0 = (_z = expression.variable.ref) === null || _z === void 0 ? void 0 : _z.name) !== null && _0 !== void 0 ? _0 : "")}", value: ${accessPath}, wide: ${wide}, tooltip: await ${accessPath}.getTooltip() },
+                    return expandToNode `
+                        { isRoll: ${roll}, label: "${humanize((_0 = (_z = expression.variable.ref) === null || _z === void 0 ? void 0 : _z.name) !== null && _0 !== void 0 ? _0 : "")}", value: ${accessPath}, wide: ${wide}, tooltip: await ${accessPath}.getTooltip() },
                     `;
                 }
-                return expandToNode `
-                    { isRoll: ${roll}, label: "${humanize((_2 = (_1 = expression.variable.ref) === null || _1 === void 0 ? void 0 : _1.name) !== null && _2 !== void 0 ? _2 : "")}", value: ${accessPath}, wide: ${wide}, hasValue: ${accessPath} != "" },
+                return expandToNode `
+                    { isRoll: ${roll}, label: "${humanize((_2 = (_1 = expression.variable.ref) === null || _1 === void 0 ? void 0 : _1.name) !== null && _2 !== void 0 ? _2 : "")}", value: ${accessPath}, wide: ${wide}, hasValue: ${accessPath} != "" },
                 `;
             }
             if (isParentAccess(expression)) {
                 let systemPath = getSystemPath((_3 = expression.property) === null || _3 === void 0 ? void 0 : _3.ref, expression.subProperties, undefined, true);
                 const wide = expression.type == "wide" ? true : false;
-                return expandToNode `
-                    { isRoll: false, label: "${humanize((_6 = (_5 = (_4 = expression.property) === null || _4 === void 0 ? void 0 : _4.ref) === null || _5 === void 0 ? void 0 : _5.name) !== null && _6 !== void 0 ? _6 : "")}", value: context.object.parent?.${systemPath}, wide: ${wide}, hasValue: context.object.parent?.${systemPath} != "" },
+                return expandToNode `
+                    { isRoll: false, label: "${humanize((_6 = (_5 = (_4 = expression.property) === null || _4 === void 0 ? void 0 : _4.ref) === null || _5 === void 0 ? void 0 : _5.name) !== null && _6 !== void 0 ? _6 : "")}", value: context.object.parent?.${systemPath}, wide: ${wide}, hasValue: context.object.parent?.${systemPath} != "" },
                 `;
             }
             if (isTargetAccess(expression)) {
                 let systemPath = getSystemPath((_7 = expression.property) === null || _7 === void 0 ? void 0 : _7.ref, expression.subProperties, undefined, true);
                 const wide = expression.type == "wide" ? true : false;
-                return expandToNode `
-                    { isRoll: false, label: "${humanize((_10 = (_9 = (_8 = expression.property) === null || _8 === void 0 ? void 0 : _8.ref) === null || _9 === void 0 ? void 0 : _9.name) !== null && _10 !== void 0 ? _10 : "")}", value: context.target?.${systemPath}, wide: ${wide}, hasValue: context.target?.${systemPath} != "" },
+                return expandToNode `
+                    { isRoll: false, label: "${humanize((_10 = (_9 = (_8 = expression.property) === null || _8 === void 0 ? void 0 : _8.ref) === null || _9 === void 0 ? void 0 : _9.name) !== null && _10 !== void 0 ? _10 : "")}", value: context.target?.${systemPath}, wide: ${wide}, hasValue: context.target?.${systemPath} != "" },
                 `;
             }
             if (isExpression(expression)) {
-                return expandToNode `
-                    { isParagraph: true, value: ${translateExpression(entry, id, expression, preDerived, generatingProperty)} },
+                return expandToNode `
+                    { isParagraph: true, value: ${translateExpression(entry, id, expression, preDerived, generatingProperty)} },
                 `;
             }
             return;
@@ -840,475 +1327,60 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             var _a, _b, _c;
             if (isAccess(expression)) {
                 let systemPath = getSystemPath((_a = expression.property) === null || _a === void 0 ? void 0 : _a.ref, expression.subProperties, (_b = expression.propertyLookup) === null || _b === void 0 ? void 0 : _b.ref);
-                return expandToNode `
-                    context.object.${systemPath}
+                return expandToNode `
+                    context.object.${systemPath}
                 `;
             }
             if (isFleetingAccess(expression)) {
                 let accessPath = (_c = expression.variable.ref) === null || _c === void 0 ? void 0 : _c.name;
                 if (expression.subProperty != undefined) {
-                    accessPath = `${accessPath}.${expression.subProperty}`;
+                    accessPath = `${accessPath}.${fleetingSubProperty(expression)}`;
                 }
-                return expandToNode `
-                    ${accessPath}
+                return expandToNode `
+                    ${accessPath}
                 `;
             }
             if (isExpression(expression)) {
-                return expandToNode `
-                    ${translateExpression(entry, id, expression, preDerived, generatingProperty)}
+                return expandToNode `
+                    ${translateExpression(entry, id, expression, preDerived, generatingProperty)}
                 `;
             }
             return;
         }
         const flavorTag = expression.body.chatExp.find(x => x.type == "flavor");
         const shouldShowEffects = expression.body.chatExp.some(x => isAccess(x) && x.access === "Effects");
-        return expandToNode `
-            // Create the chat message
-            const ${expression.name}Description = context.object.description ?? context.object.system.description;
-            const ${expression.name}Context = { 
-                cssClass: "${id} ${toMachineIdentifier(expression.name)}",
-                document: context.object,
-                description: ${expression.name}Description,
-                hasDescription: ${expression.name}Description!= "",
-                hasEffects: ${shouldShowEffects},
-                parts: [
-                    ${joinToNode(expression.body.chatExp.filter(x => x.type != "tag"), (expression) => translateChatBodyExpression(expression), { appendNewLineIfNotEmpty: true })}
-                ],
-                tags: [
-                    ${joinToNode(expression.body.chatExp.filter(x => x.type == "tag"), (expression) => translateChatBodyExpression(expression), { appendNewLineIfNotEmpty: true })}
-                ]
-            };
-            const ${expression.name}Content = await renderTemplate("systems/${id}/system/templates/chat/standard-card.hbs", ${expression.name}Context);
-            const ${expression.name}ChatFlavor = (system) => {
-                return ${flavorTag != undefined ? translateChatBodyExpressionForFlavor(flavorTag) : `""`}
-            }
-            await ChatMessage.create({
-                user: game.user._id,
-                speaker: ChatMessage.getSpeaker(),
-                content: ${expression.name}Content,
-                flavor: ${expression.name}ChatFlavor(context.object.system),
-                ...(${expression.name}Context.parts.find(x => x.isRoll) ? {} : { style: CONST.CHAT_MESSAGE_STYLES.IC }),
-                rolls: Array.from(${expression.name}Context.parts.filter(x => x.isRoll).map(x => x.value)),
-            });
+        return expandToNode `
+            // Create the chat message
+            const ${expression.name}Description = context.object.description ?? context.object.system.description;
+            const ${expression.name}Context = { 
+                cssClass: "${id} ${toMachineIdentifier(expression.name)}",
+                document: context.object,
+                description: ${expression.name}Description,
+                hasDescription: ${expression.name}Description!= "",
+                hasEffects: ${shouldShowEffects},
+                parts: [
+                    ${joinToNode(expression.body.chatExp.filter(x => x.type != "tag"), (expression) => translateChatBodyExpression(expression), { appendNewLineIfNotEmpty: true })}
+                ],
+                tags: [
+                    ${joinToNode(expression.body.chatExp.filter(x => x.type == "tag"), (expression) => translateChatBodyExpression(expression), { appendNewLineIfNotEmpty: true })}
+                ]
+            };
+            const ${expression.name}Content = await renderTemplate("systems/${id}/system/templates/chat/standard-card.hbs", ${expression.name}Context);
+            const ${expression.name}ChatFlavor = (system) => {
+                return ${flavorTag != undefined ? translateChatBodyExpressionForFlavor(flavorTag) : `""`}
+            }
+            await ChatMessage.create({
+                user: game.user._id,
+                speaker: ChatMessage.getSpeaker(),
+                content: ${expression.name}Content,
+                flavor: ${expression.name}ChatFlavor(context.object.system),
+                ...(${expression.name}Context.parts.find(x => x.isRoll) ? {} : { style: CONST.CHAT_MESSAGE_STYLES.IC }),
+                rolls: Array.from(${expression.name}Context.parts.filter(x => x.isRoll).map(x => x.value)),
+            });
         `;
     }
     if (isRoll(expression) || isDamageRoll(expression)) {
         console.log("Translating Roll Expression");
-        function translateDiceParts(expression, noLabels = false) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32;
-            console.log("Translating Dice Part: ", expression.$type);
-            if (isLiteral(expression)) {
-                if (typeof expression.val == "string") {
-                    return expandToNode `
-                        "${expression.val}"
-                    `;
-                }
-                return expandToNode `
-                    "${expression.val}"
-                `;
-            }
-            if (isRef(expression)) {
-                // If string or number, return the value
-                if (typeof expression.val == "string" || typeof expression.val == "number") {
-                    return expandToNode `
-                        "${expression.val}"
-                    `;
-                }
-                if (expression.val.ref == undefined) {
-                    return;
-                }
-                if (expression.subProperties != undefined && expression.subProperties.length > 0) {
-                    const subLabel = noLabels ? "" : `[${humanize(expression.subProperties[0])}]`;
-                    return expandToNode `
-                        "@${(_a = expression.val.ref) === null || _a === void 0 ? void 0 : _a.name}${expression.subProperties[0].toLowerCase()}${subLabel}"
-                    `;
-                }
-                console.log("Ref:", `${expression.val.$refText}`);
-                if (IntelligentSystemDesignLanguageTerminals.DICE.test(`${expression.val}`)) {
-                    return expandToNode `
-                        "${expression.val}"
-                    `;
-                }
-                const refLabel = noLabels ? "" : `[${humanize((_c = (_b = expression.val.ref) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : expression.val.$refText)}]`;
-                return expandToNode `
-                    "@${(_f = (_e = (_d = expression.val.ref) === null || _d === void 0 ? void 0 : _d.name) === null || _e === void 0 ? void 0 : _e.toLowerCase()) !== null && _f !== void 0 ? _f : expression.val.$refText}${refLabel}"
-                `;
-            }
-            if (isParentAccess(expression)) {
-                let path = (_j = (_h = (_g = expression.property) === null || _g === void 0 ? void 0 : _g.ref) === null || _h === void 0 ? void 0 : _h.name) !== null && _j !== void 0 ? _j : "";
-                let label = humanize((_m = (_l = (_k = expression.property) === null || _k === void 0 ? void 0 : _k.ref) === null || _l === void 0 ? void 0 : _l.name) !== null && _m !== void 0 ? _m : "");
-                const document = getParentDocument(expression);
-                if (document != undefined) {
-                    path = `${document.name.toLowerCase()}${path}`;
-                    label = `${humanize(document.name)} ${label}`;
-                }
-                // else if ( expression.propertyLookup != undefined ) {
-                //     path = `${path}${expression.propertyLookup.ref?.name.toLowerCase()}`;
-                //     label = `${label} \${context.object.system.${expression.propertyLookup.ref?.name.toLowerCase()}\}`;
-                // }
-                else {
-                    path = `${path}${(_p = (_o = expression.property) === null || _o === void 0 ? void 0 : _o.ref) === null || _p === void 0 ? void 0 : _p.name.toLowerCase()}`;
-                    label = `${label} ${humanize((_s = (_r = (_q = expression.property) === null || _q === void 0 ? void 0 : _q.ref) === null || _r === void 0 ? void 0 : _r.name) !== null && _s !== void 0 ? _s : "")}`;
-                }
-                for (const subProperty of (_t = expression.subProperties) !== null && _t !== void 0 ? _t : []) {
-                    path = `${path}${subProperty}`;
-                    label = `${label} ${humanize(subProperty)}`;
-                }
-                label = label.trim();
-                const parentLabelSuffix = noLabels ? "" : `[${label}]`;
-                return expandToNode `
-                    \`@${path.replaceAll(".", "").toLowerCase()}${parentLabelSuffix}\`
-                `;
-            }
-            if (isTargetAccess(expression)) {
-                let path = (_w = (_v = (_u = expression.property) === null || _u === void 0 ? void 0 : _u.ref) === null || _v === void 0 ? void 0 : _v.name) !== null && _w !== void 0 ? _w : "";
-                let label = humanize((_z = (_y = (_x = expression.property) === null || _x === void 0 ? void 0 : _x.ref) === null || _y === void 0 ? void 0 : _y.name) !== null && _z !== void 0 ? _z : "");
-                const document = getTargetDocument(expression);
-                if (document != undefined) {
-                    path = `${document.name.toLowerCase()}${path}`;
-                    label = `${humanize(document.name)} ${label}`;
-                }
-                // else if ( expression.propertyLookup != undefined ) {
-                //     path = `${path}${expression.propertyLookup.ref?.name.toLowerCase()}`;
-                //     label = `${label} \${context.object.system.${expression.propertyLookup.ref?.name.toLowerCase()}\}`;
-                // }
-                else {
-                    path = `${path}${(_1 = (_0 = expression.property) === null || _0 === void 0 ? void 0 : _0.ref) === null || _1 === void 0 ? void 0 : _1.name.toLowerCase()}`;
-                    label = `${label} ${humanize((_4 = (_3 = (_2 = expression.property) === null || _2 === void 0 ? void 0 : _2.ref) === null || _3 === void 0 ? void 0 : _3.name) !== null && _4 !== void 0 ? _4 : "")}`;
-                }
-                for (const subProperty of (_5 = expression.subProperties) !== null && _5 !== void 0 ? _5 : []) {
-                    path = `${path}${subProperty}`;
-                    label = `${label} ${humanize(subProperty)}`;
-                }
-                label = label.trim();
-                const targetLabelSuffix = noLabels ? "" : `[${label}]`;
-                return expandToNode `
-                    \`@${path.replaceAll(".", "").toLowerCase()}${targetLabelSuffix}\`
-                `;
-            }
-            if (isAccess(expression)) {
-                let path = (_13 = (_9 = (_8 = (_7 = (_6 = expression.property) === null || _6 === void 0 ? void 0 : _6.ref) === null || _7 === void 0 ? void 0 : _7.name) === null || _8 === void 0 ? void 0 : _8.toLowerCase()) !== null && _9 !== void 0 ? _9 : (_12 = (_11 = (_10 = expression.propertyLookup) === null || _10 === void 0 ? void 0 : _10.ref) === null || _11 === void 0 ? void 0 : _11.name) === null || _12 === void 0 ? void 0 : _12.toLowerCase()) !== null && _13 !== void 0 ? _13 : "";
-                let label = humanize((_19 = (_16 = (_15 = (_14 = expression.property) === null || _14 === void 0 ? void 0 : _14.ref) === null || _15 === void 0 ? void 0 : _15.name) !== null && _16 !== void 0 ? _16 : (_18 = (_17 = expression.propertyLookup) === null || _17 === void 0 ? void 0 : _17.ref) === null || _18 === void 0 ? void 0 : _18.name) !== null && _19 !== void 0 ? _19 : "");
-                // if (isDieField(expression.property?.ref)) {
-                //     return expandToNode`
-                //         \'@${path.replaceAll(".", "")}\'
-                //     `;
-                // }
-                // Special handling for document choices - expand into individual terms
-                if (expression.property && isDocumentChoicesExp(expression.property.ref) && expression.subProperties && expression.subProperties.length > 0) {
-                    const choicesFieldName = expression.property.ref.name.toLowerCase();
-                    const subPropertyName = expression.subProperties[0].toLowerCase();
-                    const subPropertyLabel = humanize(expression.subProperties[0]);
-                    // Generate dynamic expansion for each document in the choices array
-                    return expandToNode `
-                        context.object.system.${choicesFieldName}.map((doc, index) => {
-                            if (!doc || !doc.system) return '';
-                            return '@' + doc.uuid.replace(/[^a-zA-Z0-9]/g, '').toLowerCase() + '${subPropertyName}[' + doc.name + ' ${subPropertyLabel}]';
-                        }).filter(Boolean).join(' + ')
-                    `;
-                }
-                if (isParentPropertyRefExp((_20 = expression.property) === null || _20 === void 0 ? void 0 : _20.ref)) {
-                    label = `${label} - \${context.object.system.${(_22 = (_21 = expression.property) === null || _21 === void 0 ? void 0 : _21.ref) === null || _22 === void 0 ? void 0 : _22.name.toLowerCase()}.replace("system.", "").replaceAll(".", " ").titleCase()\}`;
-                }
-                else if (isSelfPropertyRefExp((_23 = expression.property) === null || _23 === void 0 ? void 0 : _23.ref)) {
-                    label = `${label} - \${context.object.system.${(_25 = (_24 = expression.property) === null || _24 === void 0 ? void 0 : _24.ref) === null || _25 === void 0 ? void 0 : _25.name.toLowerCase()}.replace("system.", "").replaceAll(".", " ").titleCase()\}`;
-                }
-                else {
-                    for (const subProperty of (_26 = expression.subProperties) !== null && _26 !== void 0 ? _26 : []) {
-                        path = `${path}.${subProperty}`;
-                        label = `${label} ${humanize(subProperty)}`;
-                    }
-                }
-                console.log("Access:", path, label);
-                const accessLabelSuffix = noLabels ? "" : `[${label}]`;
-                return expandToNode `
-                    \`@${path.replaceAll(".", "").toLowerCase()}${accessLabelSuffix}\`
-                `;
-            }
-            if (isFleetingAccess(expression)) {
-                // If this is a roll expression, just output it directly
-                if (isRoll((_27 = expression.variable.ref) === null || _27 === void 0 ? void 0 : _27.value)) {
-                    return expandToNode `
-                        ${(_28 = expression.variable.ref) === null || _28 === void 0 ? void 0 : _28.name}
-                    `;
-                }
-                let path = (_30 = (_29 = expression.variable.ref) === null || _29 === void 0 ? void 0 : _29.name) !== null && _30 !== void 0 ? _30 : "";
-                let label = humanize((_32 = (_31 = expression.variable.ref) === null || _31 === void 0 ? void 0 : _31.name) !== null && _32 !== void 0 ? _32 : "");
-                if (expression.subProperty != undefined) {
-                    path = `${path}.${expression.subProperty}`;
-                    label = `${label} ${humanize(expression.subProperty)}`;
-                }
-                const fleetingLabelSuffix = noLabels ? "" : `[${label}]`;
-                return expandToNode `
-                    \`@${path.replaceAll(".", "").toLowerCase()}${fleetingLabelSuffix}\`
-                `;
-            }
-            if (isBinaryExpression(expression)) {
-                return expandToNode `
-                    ${translateDiceParts(expression.e1, noLabels)} + "${expression.op}" + ${translateDiceParts(expression.e2, noLabels)}
-                `;
-            }
-            if (isGroup(expression)) {
-                return expandToNode `
-                    "(" + ${translateDiceParts(expression.ge, noLabels)} + ")"
-                `;
-            }
-            return;
-        }
-        function translateDisplayFormula(expression) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-            if (isLiteral(expression)) {
-                return `${expression.val}`;
-            }
-            if (isGroup(expression)) {
-                const inner = translateDisplayFormula(expression.ge);
-                return inner != null ? `(${inner})` : undefined;
-            }
-            if (isBinaryExpression(expression)) {
-                const left = translateDisplayFormula(expression.e1);
-                const right = translateDisplayFormula(expression.e2);
-                return left != null && right != null ? `${left} ${expression.op} ${right}` : undefined;
-            }
-            if (isAccess(expression)) {
-                if (isParentPropertyRefExp((_a = expression.property) === null || _a === void 0 ? void 0 : _a.ref) || isSelfPropertyRefExp((_b = expression.property) === null || _b === void 0 ? void 0 : _b.ref)) {
-                    return undefined;
-                }
-                let label = humanize((_h = (_e = (_d = (_c = expression.property) === null || _c === void 0 ? void 0 : _c.ref) === null || _d === void 0 ? void 0 : _d.name) !== null && _e !== void 0 ? _e : (_g = (_f = expression.propertyLookup) === null || _f === void 0 ? void 0 : _f.ref) === null || _g === void 0 ? void 0 : _g.name) !== null && _h !== void 0 ? _h : "");
-                for (const sub of (_j = expression.subProperties) !== null && _j !== void 0 ? _j : []) {
-                    label += ` ${humanize(sub)}`;
-                }
-                return label.trim();
-            }
-            if (isParentAccess(expression)) {
-                return humanize((_m = (_l = (_k = expression.property) === null || _k === void 0 ? void 0 : _k.ref) === null || _l === void 0 ? void 0 : _l.name) !== null && _m !== void 0 ? _m : "");
-            }
-            if (isTargetAccess(expression)) {
-                return humanize((_q = (_p = (_o = expression.property) === null || _o === void 0 ? void 0 : _o.ref) === null || _p === void 0 ? void 0 : _p.name) !== null && _q !== void 0 ? _q : "");
-            }
-            if (isFleetingAccess(expression)) {
-                return humanize((_s = (_r = expression.variable.ref) === null || _r === void 0 ? void 0 : _r.name) !== null && _s !== void 0 ? _s : "");
-            }
-            return undefined;
-        }
-        function translateDiceData(expression) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52;
-            console.log("Translating Dice Data: ", expression.$type);
-            if (isParentAccess(expression)) {
-                let path = "context.object.parent.system";
-                let label = (_c = (_b = (_a = expression.property) === null || _a === void 0 ? void 0 : _a.ref) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : "";
-                console.log("Parent Access:", (_e = (_d = expression.property) === null || _d === void 0 ? void 0 : _d.ref) === null || _e === void 0 ? void 0 : _e.name);
-                const document = getParentDocument(expression);
-                if (document != undefined) {
-                    path = `${path}.${(_h = (_g = (_f = expression.property) === null || _f === void 0 ? void 0 : _f.ref) === null || _g === void 0 ? void 0 : _g.name) === null || _h === void 0 ? void 0 : _h.toLowerCase()}`;
-                    label = `${humanize(document.name)}.${label}`;
-                }
-                else {
-                    path = `${path}.${(_l = (_k = (_j = expression.property) === null || _j === void 0 ? void 0 : _j.ref) === null || _k === void 0 ? void 0 : _k.name) === null || _l === void 0 ? void 0 : _l.toLowerCase()}`;
-                    label = `${label}.${expression.property}`;
-                }
-                for (const subProperty of (_m = expression.subProperties) !== null && _m !== void 0 ? _m : []) {
-                    path = `${path}.${subProperty}`;
-                    label = `${label}.${subProperty}`;
-                }
-                return expandToNode `
-                    "${label.replaceAll(".", "").toLowerCase()}": ${path}
-                `;
-            }
-            if (isTargetAccess(expression)) {
-                let path = "context.target.system";
-                let label = (_q = (_p = (_o = expression.property) === null || _o === void 0 ? void 0 : _o.ref) === null || _p === void 0 ? void 0 : _p.name) !== null && _q !== void 0 ? _q : "";
-                console.log("Target Access:", (_s = (_r = expression.property) === null || _r === void 0 ? void 0 : _r.ref) === null || _s === void 0 ? void 0 : _s.name);
-                const document = getTargetDocument(expression);
-                if (document != undefined) {
-                    path = `${path}.${(_v = (_u = (_t = expression.property) === null || _t === void 0 ? void 0 : _t.ref) === null || _u === void 0 ? void 0 : _u.name) === null || _v === void 0 ? void 0 : _v.toLowerCase()}`;
-                    label = `${humanize(document.name)}.${label}`;
-                }
-                else {
-                    path = `${path}.${(_y = (_x = (_w = expression.property) === null || _w === void 0 ? void 0 : _w.ref) === null || _x === void 0 ? void 0 : _x.name) === null || _y === void 0 ? void 0 : _y.toLowerCase()}`;
-                    label = `${label}.${expression.property}`;
-                }
-                for (const subProperty of (_z = expression.subProperties) !== null && _z !== void 0 ? _z : []) {
-                    path = `${path}.${subProperty}`;
-                    label = `${label}.${subProperty}`;
-                }
-                return expandToNode `
-                    "${label.replaceAll(".", "").toLowerCase()}": ${path}
-                `;
-            }
-            if (isAccess(expression)) {
-                let path = "context.object.system";
-                let label = "";
-                console.log("Access:", (_1 = (_0 = expression.property) === null || _0 === void 0 ? void 0 : _0.ref) === null || _1 === void 0 ? void 0 : _1.name, (_3 = (_2 = expression.propertyLookup) === null || _2 === void 0 ? void 0 : _2.ref) === null || _3 === void 0 ? void 0 : _3.name);
-                if (expression.propertyLookup != undefined) {
-                    path = `${path}[context.object.${getSystemPath(expression.propertyLookup.ref)}.toLowerCase()]`;
-                    label = `${(_4 = expression.propertyLookup.ref) === null || _4 === void 0 ? void 0 : _4.name}`;
-                }
-                else if (isParentPropertyRefExp((_5 = expression.property) === null || _5 === void 0 ? void 0 : _5.ref)) {
-                    path = `${path}.${(_7 = (_6 = expression.property) === null || _6 === void 0 ? void 0 : _6.ref) === null || _7 === void 0 ? void 0 : _7.name.toLowerCase()}`;
-                    label = `${(_9 = (_8 = expression.property) === null || _8 === void 0 ? void 0 : _8.ref) === null || _9 === void 0 ? void 0 : _9.name}`;
-                    let subProperty = "";
-                    if (((_10 = expression.property) === null || _10 === void 0 ? void 0 : _10.ref.propertyType) == "resource" || ((_11 = expression.property) === null || _11 === void 0 ? void 0 : _11.ref.propertyType) == "tracker" || ((_12 = expression.property) === null || _12 === void 0 ? void 0 : _12.ref.propertyType) == "choice"
-                        && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] !== "value")) {
-                        subProperty = "?.value";
-                    }
-                    if (((_13 = expression.property) === null || _13 === void 0 ? void 0 : _13.ref.propertyType) == "attribute" && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] !== "mod")) {
-                        subProperty = "?.mod";
-                    }
-                    console.log(label, path);
-                    return expandToNode `
-                        "${label.replaceAll(".", "").replaceAll(" ", "").toLowerCase()}": foundry.utils.getProperty(context.object.parent, ${path}.toLowerCase())${subProperty}
-                    `;
-                }
-                else if (isSelfPropertyRefExp((_14 = expression.property) === null || _14 === void 0 ? void 0 : _14.ref)) {
-                    // For self property references, we dynamically resolve the property path
-                    let selfPropertyPath = `context.object.system.${(_16 = (_15 = expression.property) === null || _15 === void 0 ? void 0 : _15.ref) === null || _16 === void 0 ? void 0 : _16.name.toLowerCase()}`;
-                    let subProperty = "";
-                    label = `${(_18 = (_17 = expression.property) === null || _17 === void 0 ? void 0 : _17.ref) === null || _18 === void 0 ? void 0 : _18.name}`;
-                    if (((_19 = expression.property) === null || _19 === void 0 ? void 0 : _19.ref.propertyType) == "resource" || ((_20 = expression.property) === null || _20 === void 0 ? void 0 : _20.ref.propertyType) == "tracker" || ((_21 = expression.property) === null || _21 === void 0 ? void 0 : _21.ref.propertyType) == "choice"
-                        && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] !== "value")) {
-                        subProperty = "?.value";
-                    }
-                    if (((_22 = expression.property) === null || _22 === void 0 ? void 0 : _22.ref.propertyType) == "attribute" && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] !== "mod")) {
-                        subProperty = "?.mod";
-                    }
-                    console.log(label, selfPropertyPath);
-                    return expandToNode `
-                        "${label.replaceAll(".", "").replaceAll(" ", "").toLowerCase()}": foundry.utils.getProperty(context.object, "system." + ${selfPropertyPath}.toLowerCase())${subProperty}
-                    `;
-                }
-                else {
-                    // Special handling for document choices - expand into individual data entries
-                    if (expression.property && isDocumentChoicesExp(expression.property.ref) && expression.subProperties && expression.subProperties.length > 0) {
-                        const choicesFieldName = expression.property.ref.name.toLowerCase();
-                        const subPropertyName = expression.subProperties[0].toLowerCase();
-                        // Generate data for each document in the choices array
-                        return expandToNode `
-                            ...Object.fromEntries(context.object.system.${choicesFieldName}.map((doc, index) => {
-                                if (!doc || !doc.system) return null;
-                                
-                                // Determine the accessor based on property type
-                                let accessor = '.${subPropertyName}';
-                                ${isResourceExp((_23 = expression.property) === null || _23 === void 0 ? void 0 : _23.ref) || isTrackerExp((_24 = expression.property) === null || _24 === void 0 ? void 0 : _24.ref) ? `
-                                if (doc.system.${subPropertyName} && typeof doc.system.${subPropertyName} === 'object' && 'value' in doc.system.${subPropertyName}) {
-                                    accessor = '.${subPropertyName}.value';
-                                }` : ''}
-                                ${isAttributeExp((_25 = expression.property) === null || _25 === void 0 ? void 0 : _25.ref) ? `
-                                if (doc.system.${subPropertyName} && typeof doc.system.${subPropertyName} === 'object' && 'mod' in doc.system.${subPropertyName}) {
-                                    accessor = '.${subPropertyName}.mod';
-                                }` : ''}
-                                
-                                const key = doc.uuid.replace(/[^a-zA-Z0-9]/g, '').toLowerCase() + '${subPropertyName}';
-                                const value = foundry.utils.getProperty(doc, 'system' + accessor) ?? 0;
-                                return [key, value];
-                            }).filter(Boolean))
-                        `;
-                    }
-                    path = `${path}.${(_27 = (_26 = expression.property) === null || _26 === void 0 ? void 0 : _26.ref) === null || _27 === void 0 ? void 0 : _27.name.toLowerCase()}`;
-                    label = `${(_29 = (_28 = expression.property) === null || _28 === void 0 ? void 0 : _28.ref) === null || _29 === void 0 ? void 0 : _29.name}`;
-                    if ((isResourceExp((_30 = expression.property) === null || _30 === void 0 ? void 0 : _30.ref) || isTrackerExp((_31 = expression.property) === null || _31 === void 0 ? void 0 : _31.ref) || isStringChoiceField((_32 = expression.property) === null || _32 === void 0 ? void 0 : _32.ref))
-                        && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] == "value")) {
-                        path = `${path}.value`;
-                    }
-                    if (isDiceField((_33 = expression.property) === null || _33 === void 0 ? void 0 : _33.ref) && (expression.subProperties == undefined || expression.subProperties.length == 0)) {
-                        // For dice fields without subproperties, use the dice value
-                        path = `${path}.value`;
-                    }
-                    if (isDieField((_34 = expression.property) === null || _34 === void 0 ? void 0 : _34.ref)) {
-                        // For die fields, the value is just the die size (e.g., "d6"), we want to use the field name as label
-                        // Don't change the path, just ensure the label is the field name
-                    }
-                    if (isAttributeExp((_35 = expression.property) === null || _35 === void 0 ? void 0 : _35.ref) && (expression.subProperties == undefined || expression.subProperties.length == 0 || expression.subProperties[0] !== "mod")) {
-                        path = `${path}.mod`;
-                    }
-                }
-                for (const subProperty of (_36 = expression.subProperties) !== null && _36 !== void 0 ? _36 : []) {
-                    path = `${path}.${subProperty}`;
-                    label = `${label} ${humanize(subProperty)}`;
-                }
-                console.log(label, path);
-                return expandToNode `
-                    "${label.replaceAll(".", "").replaceAll(" ", "").toLowerCase()}": ${path} ?? 0
-                `;
-            }
-            if (isFleetingAccess(expression)) {
-                console.log("Fleeting Access:", (_37 = expression.variable.ref) === null || _37 === void 0 ? void 0 : _37.name);
-                // If this is a roll expression, just skip it
-                if (isRoll((_38 = expression.variable.ref) === null || _38 === void 0 ? void 0 : _38.value)) {
-                    return;
-                }
-                let path = (_39 = expression.variable.ref) === null || _39 === void 0 ? void 0 : _39.name;
-                if (expression.subProperty != undefined) {
-                    path = `${path}.${expression.subProperty}`;
-                }
-                if (expression.arrayAccess != undefined) {
-                    console.log("Array Access:", expression.arrayAccess.$type);
-                    let accessExp = translateExpression(entry, id, expression.arrayAccess, preDerived, generatingProperty);
-                    path = `${path}[${(_40 = accessExp === null || accessExp === void 0 ? void 0 : accessExp.contents) === null || _40 === void 0 ? void 0 : _40.toString()}]`;
-                }
-                const label = (_42 = (_41 = expression.variable.ref) === null || _41 === void 0 ? void 0 : _41.name.toLowerCase()) !== null && _42 !== void 0 ? _42 : "";
-                console.log(label, path);
-                return expandToNode `
-                    "${label}": ${path} ?? 0
-                `;
-            }
-            // if (isVariableAccess(expression)) {
-            //     console.log("Variable Access:", expression.name);
-            //     if (isParameter(expression)) {
-            //         console.log("Parameter:", expression.name);
-            //         return expandToNode`
-            //             "${expression.name}": ${expression.name}
-            //         `;
-            //     }
-            //     if (isVariableExpression(expression)) {
-            //         console.log("Variable Expression:", expression.name);
-            //         if (isExpression(expression.value)) {
-            //             console.log("Expression:", expression.name);
-            //             return translateDiceData(expression.value);
-            //         }
-            //         if (isPrompt(expression.value)) {
-            //             console.log("Prompt:", expression.name);
-            //             return expandToNode`
-            //                 "${expression.name}": ${expression.name}
-            //             `;
-            //         }
-            //     }
-            //     throw new Error("Variable Access not implemented");
-            // }
-            if (isRef(expression)) {
-                console.log("Ref:", (_43 = expression.val.ref) === null || _43 === void 0 ? void 0 : _43.name);
-                // If string or number, return the value
-                if (typeof expression.val == "string" || typeof expression.val == "number") {
-                    console.log(expression.val);
-                    return expandToNode `
-                        "${expression.val}": ${expression.val}
-                    `;
-                }
-                if (expression.val.ref == undefined) {
-                    return;
-                }
-                if (expression.subProperties != undefined && expression.subProperties.length > 0) {
-                    return expandToNode `
-                        "${(_44 = expression.val.ref) === null || _44 === void 0 ? void 0 : _44.name.toLowerCase()}${expression.subProperties[0].toLowerCase()}": ${(_45 = expression.val.ref) === null || _45 === void 0 ? void 0 : _45.name}.${expression.subProperties[0].toLowerCase()} ?? 0
-                    `;
-                }
-                console.log((_46 = expression.val.ref) === null || _46 === void 0 ? void 0 : _46.name, (_47 = expression.val.ref) === null || _47 === void 0 ? void 0 : _47.$type);
-                return expandToNode `
-                    "${(_50 = (_49 = (_48 = expression.val.ref) === null || _48 === void 0 ? void 0 : _48.name) === null || _49 === void 0 ? void 0 : _49.toLowerCase()) !== null && _50 !== void 0 ? _50 : expression.val.$refText}": ${(_52 = (_51 = expression.val.ref) === null || _51 === void 0 ? void 0 : _51.name) !== null && _52 !== void 0 ? _52 : expression.val.$refText} ?? 0
-                `;
-            }
-            if (isBinaryExpression(expression)) {
-                const expressions = [expression.e1, expression.e2];
-                return expandToNode `
-                    ${joinToNode(expressions, e => translateDiceData(e), { separator: ", " })}
-                `;
-            }
-            if (isGroup(expression)) {
-                return expandToNode `
-                    ${translateDiceData(expression.ge)}
-                `;
-            }
-            return undefined;
-        }
         if (isDamageRoll(expression)) {
             const rollParam = expression.params.find(isRollParam);
             const rollExpression = rollParam.value;
@@ -1322,13 +1394,13 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                 const parentPath = (_s = (_r = (_q = (_p = typeParam.value.property) === null || _p === void 0 ? void 0 : _p.ref) === null || _q === void 0 ? void 0 : _q.name) === null || _r === void 0 ? void 0 : _r.toLowerCase()) !== null && _s !== void 0 ? _s : '';
                 damageTypeDataAccess = `context.object.parent?.system.${parentPath}`;
             }
-            return expandToNode `
-                await new ${entry.config.name}DamageRoll(
-                    ${joinToNode(rollExpression.parts, e => translateDiceParts(e), { separator: " + " })},
-                     {${joinToNode(rollExpression.parts, e => translateDiceData(e), { separator: ", " })}, 
-                     actor: context.actor},
-                     { type: ${damageTypeDataAccess} }
-                ).roll()
+            return expandToNode `
+                await new ${entry.config.name}DamageRoll(
+                    ${joinToNode(rollExpression.parts, e => translateDiceParts(e), { separator: " + " })},
+                     {${joinToNode(rollExpression.parts, e => translateDiceData(e, entry, id, preDerived, generatingProperty), { separator: ", " })},
+                     actor: context.actor},
+                     { type: ${damageTypeDataAccess} }
+                ).roll()
             `;
         }
         const rollParts = expression.parts;
@@ -1336,32 +1408,32 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         const displayFormula = displayFormulaParts.every(p => p != null)
             ? displayFormulaParts.join("")
             : undefined;
-        return expandToNode `
+        return expandToNode `
             Object.assign(await new ${entry.config.name}Roll(${joinToNode(rollParts, (e, idx) => {
             const nextPart = rollParts[idx + 1];
             const nextIsDice = nextPart != null && isLiteral(nextPart) && typeof nextPart.val === 'string' && IntelligentSystemDesignLanguageTerminals.DICE.test(nextPart.val);
             return translateDiceParts(e, nextIsDice);
-        }, { separator: " + " })}, {${joinToNode(rollParts, e => translateDiceData(e), { separator: ", " })}}).roll(), ${displayFormula != null ? `{_displayFormula: "${displayFormula}"}` : '{}'})
+        }, { separator: " + " })}, {${joinToNode(rollParts, e => translateDiceData(e, entry, id, preDerived, generatingProperty), { separator: ", " })}}).roll(), ${displayFormula != null ? `{_displayFormula: "${displayFormula}"}` : '{}'})
         `;
     }
     if (isSelfMethod(expression)) {
         switch (expression.method) {
             case "delete()": {
-                return expandToNode `
-                    await document.delete();
-                    selfDeleted = true;
+                return expandToNode `
+                    await document.delete();
+                    selfDeleted = true;
                 `;
             }
             case "update()": {
-                return expandToNode `
-                    if (selfDeleted) {
-                        ui.notifications.error("Cannot update a deleted document");
-                    }
-                    else if (Object.keys(update).length > 0) {
-                        await document.update(update);
-                        context.object.system = document.system;
-                    }
-                    update = {};
+                return expandToNode `
+                    if (selfDeleted) {
+                        ui.notifications.error("Cannot update a deleted document");
+                    }
+                    else if (Object.keys(update).length > 0) {
+                        await document.update(update);
+                        context.object.system = document.system;
+                    }
+                    update = {};
                 `.appendNewLine();
             }
             default: {
@@ -1370,8 +1442,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         }
     }
     if (isArrayExpression(expression)) {
-        return expandToNode `
-            [${joinToNode(expression.items, e => translateExpression(entry, id, e, preDerived, generatingProperty), { separator: ", " })}]
+        return expandToNode `
+            [${joinToNode(expression.items, e => translateExpression(entry, id, e, preDerived, generatingProperty), { separator: ", " })}]
         `;
     }
     if (isEach(expression)) {
@@ -1379,10 +1451,10 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         const eachExpression = expression;
         const collection = translateExpression(entry, id, expression.collection, preDerived, generatingProperty);
         if (isNumberRange(expression.collection)) {
-            return expandToNode `
-            for (const ${translateExpression(entry, id, expression.var, preDerived, generatingProperty)} of ${collection} ?? []) {
-                ${translateBodyExpressionToJavascript(entry, id, expression.method.body, preDerived, generatingProperty)}
-            }
+            return expandToNode `
+            for (const ${translateExpression(entry, id, expression.var, preDerived, generatingProperty)} of ${collection} ?? []) {
+                ${translateBodyExpressionToJavascript(entry, id, expression.method.body, preDerived, generatingProperty)}
+            }
             `;
         }
         let updateExpression;
@@ -1391,26 +1463,26 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             return isVariableAssignment(x) && x.variable.ref == eachExpression.var;
         })) {
             if (isParentAccess(expression.collection)) {
-                updateExpression = expandToNode `
-            parentEmbeddedUpdate["${getSystemPath((_t = expression.collection.property) === null || _t === void 0 ? void 0 : _t.ref, [], undefined, false)}"] = ${collection};
+                updateExpression = expandToNode `
+            parentEmbeddedUpdate["${getSystemPath((_t = expression.collection.property) === null || _t === void 0 ? void 0 : _t.ref, [], undefined, false)}"] = ${collection};
             `;
             }
             else if (isTargetAccess(expression.collection)) {
-                updateExpression = expandToNode `
-            targetEmbeddedUpdate["${getSystemPath((_u = expression.collection.property) === null || _u === void 0 ? void 0 : _u.ref, [], undefined, false)}"] = ${collection};
+                updateExpression = expandToNode `
+            targetEmbeddedUpdate["${getSystemPath((_u = expression.collection.property) === null || _u === void 0 ? void 0 : _u.ref, [], undefined, false)}"] = ${collection};
             `;
             }
             else {
-                updateExpression = expandToNode `
-            embeddedUpdate["${collection}"] = ${collection};
+                updateExpression = expandToNode `
+            embeddedUpdate["${collection}"] = ${collection};
             `;
             }
         }
-        return expandToNode `
-            for (const ${translateExpression(entry, id, expression.var, preDerived, generatingProperty)} of ${collection} ?? []) {
-            ${translateBodyExpressionToJavascript(entry, id, expression.method.body, preDerived, generatingProperty)}
-            }
-            ${updateExpression}
+        return expandToNode `
+            for (const ${translateExpression(entry, id, expression.var, preDerived, generatingProperty)} of ${collection} ?? []) {
+            ${translateBodyExpressionToJavascript(entry, id, expression.method.body, preDerived, generatingProperty)}
+            }
+            ${updateExpression}
         `;
     }
     if (isPrompt(expression)) {
@@ -1442,185 +1514,185 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             else if (units === "minutes") {
                 durationMod = ` * 60 * 1000`;
             }
-            durationExpression = expandToNode `
-                ${duration}${durationMod}
+            durationExpression = expandToNode `
+                ${duration}${durationMod}
             `;
         }
         if (target == "gm") {
-            return expandToNode `
-                await new Promise((resolve, reject) => {
-
-                    const firstGm = game.users.find(u => u.isGM && u.active);
-                    const uuid = foundry.utils.randomID();
-
-                    // Setup a listener that will wait for this response
-                    game.socket.on("system.${id}", (data) => {
-                        if (data.type != "promptResponse" || data.uuid != uuid) return;
-
-                        // Resolve the promise with the data
-                        resolve(data.data);
-                    });
-
-                    game.socket.emit("system.${id}", {
-                        uuid: uuid,
-                        type: "prompt",
-                        userId: game.user.id,
-                        ${widthParam ? `width: ${widthParam.value},` : ""}
-                        ${heightParam ? `height: ${heightParam.value},` : ""}
-                        ${locationParam ? expandToNode `left: ${translateExpression(entry, id, locationParam.x, false, generatingProperty)},
-                        top: ${translateExpression(entry, id, locationParam.y, false, generatingProperty)},` : ""}
-                        ${timeLimitParam ? expandToNode `timeLimit: ${durationExpression},` : ""}
-                        title: "${title}",
-                        promptKey: "${promptKey}",
-                        documentUuid: context.object.uuid,
-                    }, {recipients: [firstGm.id]});
-                });
+            return expandToNode `
+                await new Promise((resolve, reject) => {
+
+                    const firstGm = game.users.find(u => u.isGM && u.active);
+                    const uuid = foundry.utils.randomID();
+
+                    // Setup a listener that will wait for this response
+                    game.socket.on("system.${id}", (data) => {
+                        if (data.type != "promptResponse" || data.uuid != uuid) return;
+
+                        // Resolve the promise with the data
+                        resolve(data.data);
+                    });
+
+                    game.socket.emit("system.${id}", {
+                        uuid: uuid,
+                        type: "prompt",
+                        userId: game.user.id,
+                        ${widthParam ? `width: ${widthParam.value},` : ""}
+                        ${heightParam ? `height: ${heightParam.value},` : ""}
+                        ${locationParam ? expandToNode `left: ${translateExpression(entry, id, locationParam.x, false, generatingProperty)},
+                        top: ${translateExpression(entry, id, locationParam.y, false, generatingProperty)},` : ""}
+                        ${timeLimitParam ? expandToNode `timeLimit: ${durationExpression},` : ""}
+                        title: "${title}",
+                        promptKey: "${promptKey}",
+                        documentUuid: context.object.uuid,
+                    }, {recipients: [firstGm.id]});
+                });
             `;
         }
         if (target == "target") {
-            return expandToNode `
-                await new Promise((resolve, reject) => {
-                    // Try to find a non-GM owner
-                    let owner = game.users.find(u => u.active && !u.isGM && u.id != game.user.id && context.target.testUserPermission(u, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER));
-                    
-                    // If no owner is found, use the first active user
-                    if (!owner) {
-                        owner = game.users.find(u => u.active && u.id != game.user.id && context.target.testUserPermission(u, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER));
-                    }
-                    
-                    // If still no owner is found, default to the current user
-                    if (!owner) {
-                        owner = game.user.id;
-                    }
-                    let ownerId = owner.id;
-                    const uuid = foundry.utils.randomID();
-
-                    // Setup a listener that will wait for this response
-                    game.socket.on("system.${id}", (data) => {
-                        if (data.type != "promptResponse" || data.uuid != uuid) return;
-
-                        // Resolve the promise with the data
-                        resolve(data.data);
-                    });
-
-                    game.socket.emit("system.${id}", {
-                        uuid: uuid,
-                        type: "prompt",
-                        userId: game.user.id,
-                        ${widthParam ? `width: ${widthParam.value},` : ""}
-                        ${heightParam ? `height: ${heightParam.value},` : ""}
-                        ${locationParam ? expandToNode `left: ${translateExpression(entry, id, locationParam.x, false, generatingProperty)},
-                        top: ${translateExpression(entry, id, locationParam.y, false, generatingProperty)},` : ""}
-                        ${timeLimitParam ? expandToNode `timeLimit: ${durationExpression},` : ""}
-                        title: "${title}",
-                        promptKey: "${promptKey}",
-                        documentUuid: context.object.uuid,
-                    }, {recipients: [ownerId]});
-                });
+            return expandToNode `
+                await new Promise((resolve, reject) => {
+                    // Try to find a non-GM owner
+                    let owner = game.users.find(u => u.active && !u.isGM && u.id != game.user.id && context.target.testUserPermission(u, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER));
+                    
+                    // If no owner is found, use the first active user
+                    if (!owner) {
+                        owner = game.users.find(u => u.active && u.id != game.user.id && context.target.testUserPermission(u, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER));
+                    }
+                    
+                    // If still no owner is found, default to the current user
+                    if (!owner) {
+                        owner = game.user.id;
+                    }
+                    let ownerId = owner.id;
+                    const uuid = foundry.utils.randomID();
+
+                    // Setup a listener that will wait for this response
+                    game.socket.on("system.${id}", (data) => {
+                        if (data.type != "promptResponse" || data.uuid != uuid) return;
+
+                        // Resolve the promise with the data
+                        resolve(data.data);
+                    });
+
+                    game.socket.emit("system.${id}", {
+                        uuid: uuid,
+                        type: "prompt",
+                        userId: game.user.id,
+                        ${widthParam ? `width: ${widthParam.value},` : ""}
+                        ${heightParam ? `height: ${heightParam.value},` : ""}
+                        ${locationParam ? expandToNode `left: ${translateExpression(entry, id, locationParam.x, false, generatingProperty)},
+                        top: ${translateExpression(entry, id, locationParam.y, false, generatingProperty)},` : ""}
+                        ${timeLimitParam ? expandToNode `timeLimit: ${durationExpression},` : ""}
+                        title: "${title}",
+                        promptKey: "${promptKey}",
+                        documentUuid: context.object.uuid,
+                    }, {recipients: [ownerId]});
+                });
             `;
         }
         if (target == "user") {
-            return expandToNode `
-            await new Promise(async (resolve, reject) => {
-
-                const allActiveUsers = game.users.filter(u => u.active && u.id != game.user.id);
-                const targetedUser = await Dialog.prompt({
-                    title: "Select User",
-                    content: \`<form>
-                        <div class="form-group">
-                            <label>\${game.i18n.localize("User")}</label>
-                            <select name="user">
-                                \${allActiveUsers.map(u => \`<option value="\${u.id}">\${u.name}</option>\`).join("")}
-                            </select>
-                        </div>
-                    </form>\`,
-                    callback: (html, event) => {
-                        const formData = new FormDataExtended(html[0].querySelector("form"));
-                        return formData.get("user");
-                    },
-                    options: {
-                        classes: ["${id}", "dialog"],
-                    }
-                });
-                const uuid = foundry.utils.randomID();
-
-                // Setup a listener that will wait for this response
-                game.socket.on("system.${id}", (data) => {
-                    if (data.type != "promptResponse" || data.uuid != uuid) return;
-
-                    // Resolve the promise with the data
-                    resolve(data.data);
-                });
-
-                game.socket.emit("system.${id}", {
-                    uuid: uuid,
-                    type: "prompt",
-                    userId: game.user.id,
-                    title: "${title}",
-                    promptKey: "${promptKey}",
-                    documentUuid: context.object.uuid,
-                    ${widthParam ? expandToNode `width: ${widthParam.value},` : ""}
-                    ${heightParam ? expandToNode `height: ${heightParam.value},` : ""}
-                    ${locationParam ? expandToNode `left: ${translateExpression(entry, id, locationParam.x, false, generatingProperty)},
-                    top: ${translateExpression(entry, id, locationParam.y, false, generatingProperty)},` : ""}
-                    ${timeLimitParam ? expandToNode `timeLimit: ${durationExpression},` : ""}
-                }, {recipients: [targetedUser]});
-            });
+            return expandToNode `
+            await new Promise(async (resolve, reject) => {
+
+                const allActiveUsers = game.users.filter(u => u.active && u.id != game.user.id);
+                const targetedUser = await Dialog.prompt({
+                    title: "Select User",
+                    content: \`<form>
+                        <div class="form-group">
+                            <label>\${game.i18n.localize("User")}</label>
+                            <select name="user">
+                                \${allActiveUsers.map(u => \`<option value="\${u.id}">\${u.name}</option>\`).join("")}
+                            </select>
+                        </div>
+                    </form>\`,
+                    callback: (html, event) => {
+                        const formData = new FormDataExtended(html[0].querySelector("form"));
+                        return formData.get("user");
+                    },
+                    options: {
+                        classes: ["${id}", "dialog"],
+                    }
+                });
+                const uuid = foundry.utils.randomID();
+
+                // Setup a listener that will wait for this response
+                game.socket.on("system.${id}", (data) => {
+                    if (data.type != "promptResponse" || data.uuid != uuid) return;
+
+                    // Resolve the promise with the data
+                    resolve(data.data);
+                });
+
+                game.socket.emit("system.${id}", {
+                    uuid: uuid,
+                    type: "prompt",
+                    userId: game.user.id,
+                    title: "${title}",
+                    promptKey: "${promptKey}",
+                    documentUuid: context.object.uuid,
+                    ${widthParam ? expandToNode `width: ${widthParam.value},` : ""}
+                    ${heightParam ? expandToNode `height: ${heightParam.value},` : ""}
+                    ${locationParam ? expandToNode `left: ${translateExpression(entry, id, locationParam.x, false, generatingProperty)},
+                    top: ${translateExpression(entry, id, locationParam.y, false, generatingProperty)},` : ""}
+                    ${timeLimitParam ? expandToNode `timeLimit: ${durationExpression},` : ""}
+                }, {recipients: [targetedUser]});
+            });
         `;
         }
         // Self-target: open the generated Vue prompt app (game.system.prompts.<doc><action>).
         // The app resolves this promise with the user's input (or {} on cancel/close).
-        return expandToNode `
-            await new Promise(async (resolve, reject) => {
-                const promptApp = new game.system.prompts.${promptKey}(context.object, { promptResolve: resolve });
-                promptApp.render(true);
-            });
+        return expandToNode `
+            await new Promise(async (resolve, reject) => {
+                const promptApp = new game.system.prompts.${promptKey}(context.object, { promptResolve: resolve });
+                promptApp.render(true);
+            });
         `;
     }
     if (isMathExpression(expression)) {
         expression = expression;
         console.log("Translating Math Expression: ", expression.operation);
         if (isMathEmptyExpression(expression)) {
-            return expandToNode `
-                Math.${expression.operation}()
+            return expandToNode `
+                Math.${expression.operation}()
             `;
         }
         if (isMathSingleExpression(expression)) {
-            return expandToNode `
-                Math.${expression.operation}(${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)})
+            return expandToNode `
+                Math.${expression.operation}(${translateExpression(entry, id, expression.exp, preDerived, generatingProperty)})
             `;
         }
         if (isMathParamExpression(expression)) {
-            return expandToNode `
-                Math.${expression.operation}(${joinToNode(expression.params, x => translateExpression(entry, id, x, preDerived, generatingProperty), { separator: ", " })})
+            return expandToNode `
+                Math.${expression.operation}(${joinToNode(expression.params, x => translateExpression(entry, id, x, preDerived, generatingProperty), { separator: ", " })})
             `;
         }
         throw new Error("Unknown Math Expression type encountered while translating to JavaScript ");
     }
     if (isLogExpression(expression)) {
         console.log("Translating Log Expression: ");
-        return expandToNode `
-            console.log(${joinToNode(expression.params, x => translateExpression(entry, id, x, preDerived, generatingProperty), { separator: ", " })})
+        return expandToNode `
+            console.log(${joinToNode(expression.params, x => translateExpression(entry, id, x, preDerived, generatingProperty), { separator: ", " })})
         `;
     }
     if (isUpdate(expression)) {
         console.log("Translating Update Expression:");
         let systemPath = getSystemPath((_y = expression.property) === null || _y === void 0 ? void 0 : _y.ref, expression.subProperties, (_z = expression.propertyLookup) === null || _z === void 0 ? void 0 : _z.ref, false);
         if (isUpdateParent(expression)) {
-            return expandToNode `
-                parentUpdate["${systemPath}"] = foundry.utils.getProperty(context.object.parent, "system.${systemPath}");
+            return expandToNode `
+                parentUpdate["${systemPath}"] = foundry.utils.getProperty(context.object.parent, "system.${systemPath}");
             `;
         }
         else if (isUpdateSelf(expression)) {
-            return expandToNode `
-                update["system.${systemPath}"] = system.${systemPath};
+            return expandToNode `
+                update["system.${systemPath}"] = system.${systemPath};
             `;
         }
     }
     if (isVisibilityValue(expression)) {
         console.log("Translating Visibility Value Expression: ", expression.visibility);
-        return expandToNode `
-            "${expression.visibility}"
+        return expandToNode `
+            "${expression.visibility}"
         `;
     }
     if (isFunctionCall(expression)) {
@@ -1634,16 +1706,16 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         // closures in the _prepare<Doc>DerivedData scope (see derived-data-generator). They take the
         // in-scope `system` and no update/await — derived values run synchronously and must be pure.
         if (preDerived) {
-            return expandToNode `
-                function_${(_0 = expression.method.ref) === null || _0 === void 0 ? void 0 : _0.name}(system${expression.params.length ? ", " : ""}${args})
+            return expandToNode `
+                function_${(_0 = expression.method.ref) === null || _0 === void 0 ? void 0 : _0.name}(system${expression.params.length ? ", " : ""}${args})
             `;
         }
         let accessPath = "this";
         if (isTrackerExp(generatingProperty)) {
             accessPath = "document.sheet";
         }
-        return expandToNode `
-            await ${accessPath}.function_${(_1 = expression.method.ref) === null || _1 === void 0 ? void 0 : _1.name}(context, update, embeddedUpdate, parentUpdate, parentEmbeddedUpdate, targetUpdate, targetEmbeddedUpdate, ${args})
+        return expandToNode `
+            await ${accessPath}.function_${(_1 = expression.method.ref) === null || _1 === void 0 ? void 0 : _1.name}(context, update, embeddedUpdate, parentUpdate, parentEmbeddedUpdate, targetUpdate, targetEmbeddedUpdate, ${args})
         `;
     }
     if (isNumberRange(expression)) {
@@ -1651,8 +1723,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         const to = translateExpression(entry, id, expression.end, preDerived, generatingProperty);
         console.log("Translating Number Range Expression: ", from, to);
         // Make a JS array of numbers from from to to
-        return expandToNode `
-            Array.from({length: ${to} - ${from} + 1}, (_, i) => ${from} + i)
+        return expandToNode `
+            Array.from({length: ${to} - ${from} + 1}, (_, i) => ${from} + i)
         `;
     }
     if (isWait(expression)) {
@@ -1666,8 +1738,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         else if (units === "minutes") {
             durationMod = ` * 60 * 1000`;
         }
-        return expandToNode `
-            await new Promise(resolve => setTimeout(resolve, ${duration}${durationMod})); // Wait for ${expression.duration} ${units}
+        return expandToNode `
+            await new Promise(resolve => setTimeout(resolve, ${duration}${durationMod})); // Wait for ${expression.duration} ${units}
         `;
     }
     if (isPlayAudio(expression)) {
@@ -1676,44 +1748,44 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             return undefined;
         const volumeParam = expression.params.find(x => isPlayAudioVolume(x));
         const volume = (_2 = volumeParam === null || volumeParam === void 0 ? void 0 : volumeParam.value) !== null && _2 !== void 0 ? _2 : 0.5;
-        return expandToNode `
-            await game.system.utils.playSfx(${translateExpression(entry, id, fileParam.value, false, generatingProperty)}, ${translateExpression(entry, id, volume, false, generatingProperty)});
+        return expandToNode `
+            await game.system.utils.playSfx(${translateExpression(entry, id, fileParam.value, false, generatingProperty)}, ${translateExpression(entry, id, volume, false, generatingProperty)});
         `;
     }
     if (isCombatMethods(expression)) {
         const method = expression.method;
-        return expandToNode `
-            if (!game.combat) {
-                return;
-            }
-            if (game.combat.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)) {
-                ${method == "nextTurn" ? expandToNode `game.combat.nextTurn();` : ""}
-                ${method == "end" ? expandToNode `game.combat.endCombat();` : ""}
-            }
-            else {
-                await new Promise((resolve, reject) => {
-                    const firstGm = game.users.find(u => u.isGM && u.active);
-                    if (!firstGm) {
-                        ui.notifications.error("No active GM found to handle combat method request");
-                        return;
-                    }
-                    const uuid = foundry.utils.randomID();
-
-                    // Setup a listener that will wait for this response
-                    game.socket.on("system.${id}", (data) => {
-                        if (data.type != "combatResponse" || data.uuid != uuid) return;
-
-                        resolve();
-                    });
-
-                    game.socket.emit("system.${id}", {
-                        uuid: uuid,
-                        type: "combat",
-                        userId: game.user.id,
-                        method: "${method}",
-                    }, {recipients: [firstGm.id]});
-                });
-            }
+        return expandToNode `
+            if (!game.combat) {
+                return;
+            }
+            if (game.combat.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)) {
+                ${method == "nextTurn" ? expandToNode `game.combat.nextTurn();` : ""}
+                ${method == "end" ? expandToNode `game.combat.endCombat();` : ""}
+            }
+            else {
+                await new Promise((resolve, reject) => {
+                    const firstGm = game.users.find(u => u.isGM && u.active);
+                    if (!firstGm) {
+                        ui.notifications.error("No active GM found to handle combat method request");
+                        return;
+                    }
+                    const uuid = foundry.utils.randomID();
+
+                    // Setup a listener that will wait for this response
+                    game.socket.on("system.${id}", (data) => {
+                        if (data.type != "combatResponse" || data.uuid != uuid) return;
+
+                        resolve();
+                    });
+
+                    game.socket.emit("system.${id}", {
+                        uuid: uuid,
+                        type: "combat",
+                        userId: game.user.id,
+                        method: "${method}",
+                    }, {recipients: [firstGm.id]});
+                });
+            }
         `;
     }
     if (isCombatProperty(expression)) {
@@ -1736,8 +1808,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
     }
     if (isMacroExecute(expression)) {
         const systemPath = getSystemPath(expression.macro.ref, [], undefined, false);
-        return expandToNode `
-            await context.object.${systemPath}?.execute();
+        return expandToNode `
+            await context.object.${systemPath}?.execute();
         `;
     }
     console.log(expression.$type);
@@ -1796,4 +1868,24 @@ export function translateBodyExpressionToJavascript(entry, id, body, preDerived
     //      */
     return joinToNode(body, (expression) => translateExpression(entry, id, expression, preDerived, generatingProperty), { appendNewLineIfNotEmpty: true });
 }
+// Compile a rollVisualizer field's value: expression into a Foundry roll formula
+// string (containing @refs) plus the data object that resolves those refs from the
+// live, reactive document/prompt context. This mirrors the roll() codegen path but
+// returns the two pieces separately, so the visualizer component can ANALYZE the
+// formula (convolve / simulate) rather than evaluate it as a roll.
+//
+// Phase 1 supports Expression values (including an explicit roll(...) node). A
+// MethodBlock value yields an empty formula -- there is nothing to visualize from a
+// statically-unknown computed string -- and the component renders its empty state.
+export function compileVisualizerFormula(entry, id, field) {
+    const valueParam = field.params.find(isRollVisualizerValueParam);
+    const value = valueParam === null || valueParam === void 0 ? void 0 : valueParam.value;
+    if (!value || isMethodBlock(value)) {
+        return { formula: expandToNode `""`, data: expandToNode `{}` };
+    }
+    const parts = isRoll(value) ? value.parts : [value];
+    const formula = expandToNode `${joinToNode(parts, e => translateDiceParts(e, true), { separator: " + " })}`;
+    const data = expandToNode `{${joinToNode(parts, e => translateDiceData(e, entry, id, false, undefined), { separator: ", " })}}`;
+    return { formula, data };
+}
 //# sourceMappingURL=method-generator.js.map