intelligent-system-design-language 0.3.22 → 0.3.24

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

@@ -1,5 +1,5 @@
 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, isRollVisualizerValueParam, isPromptInputAccess } 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, isRollResultAccess, isCritParam, isFumbleParam, isSuccessParam, isFailureParam, } 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';
@@ -30,19 +30,19 @@ export function translateDiceParts(expression, noLabels = false) {
     console.log("Translating Dice Part: ", expression.$type);
     if (isLiteral(expression)) {
         if (typeof expression.val == "string") {
-            return expandToNode `
-                        "${expression.val}"
+            return expandToNode `
+                        "${expression.val}"
                     `;
         }
-        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}"
+            return expandToNode `
+                        "${expression.val}"
                     `;
         }
         if (expression.val.ref == undefined) {
@@ -50,19 +50,19 @@ export function translateDiceParts(expression, noLabels = false) {
         }
         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}"
+            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}"
+            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}"
+        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)) {
@@ -87,8 +87,8 @@ export function translateDiceParts(expression, noLabels = false) {
         }
         label = label.trim();
         const parentLabelSuffix = noLabels ? "" : `[${label}]`;
-        return expandToNode `
-                    \`@${path.replaceAll(".", "").toLowerCase()}${parentLabelSuffix}\`
+        return expandToNode `
+                    \`@${path.replaceAll(".", "").toLowerCase()}${parentLabelSuffix}\`
                 `;
     }
     if (isTargetAccess(expression)) {
@@ -113,8 +113,8 @@ export function translateDiceParts(expression, noLabels = false) {
         }
         label = label.trim();
         const targetLabelSuffix = noLabels ? "" : `[${label}]`;
-        return expandToNode `
-                    \`@${path.replaceAll(".", "").toLowerCase()}${targetLabelSuffix}\`
+        return expandToNode `
+                    \`@${path.replaceAll(".", "").toLowerCase()}${targetLabelSuffix}\`
                 `;
     }
     if (isPromptInputAccess(expression)) {
@@ -124,8 +124,8 @@ export function translateDiceParts(expression, noLabels = false) {
         for (const subProperty of (_10 = expression.subProperties) !== null && _10 !== void 0 ? _10 : []) {
             key = `${key}.${subProperty}`;
         }
-        return expandToNode `
-                    \`@${key.replaceAll(".", "").toLowerCase()}\`
+        return expandToNode `
+                    \`@${key.replaceAll(".", "").toLowerCase()}\`
                 `;
     }
     if (isAccess(expression)) {
@@ -142,11 +142,11 @@ export function translateDiceParts(expression, noLabels = false) {
             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(' + ')
+            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)) {
@@ -163,15 +163,15 @@ export function translateDiceParts(expression, noLabels = false) {
         }
         console.log("Access:", path, label);
         const accessLabelSuffix = noLabels ? "" : `[${label}]`;
-        return expandToNode `
-                    \`@${path.replaceAll(".", "").toLowerCase()}${accessLabelSuffix}\`
+        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}
+            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 : "";
@@ -181,18 +181,18 @@ export function translateDiceParts(expression, noLabels = false) {
             label = `${label} ${humanize(expression.subProperty)}`;
         }
         const fleetingLabelSuffix = noLabels ? "" : `[${label}]`;
-        return expandToNode `
-                    \`@${path.replaceAll(".", "").toLowerCase()}${fleetingLabelSuffix}\`
+        return expandToNode `
+                    \`@${path.replaceAll(".", "").toLowerCase()}${fleetingLabelSuffix}\`
                 `;
     }
     if (isBinaryExpression(expression)) {
-        return expandToNode `
-                    ${translateDiceParts(expression.e1, noLabels)} + "${expression.op}" + ${translateDiceParts(expression.e2, noLabels)}
+        return expandToNode `
+                    ${translateDiceParts(expression.e1, noLabels)} + "${expression.op}" + ${translateDiceParts(expression.e2, noLabels)}
                 `;
     }
     if (isGroup(expression)) {
-        return expandToNode `
-                    "(" + ${translateDiceParts(expression.ge, noLabels)} + ")"
+        return expandToNode `
+                    "(" + ${translateDiceParts(expression.ge, noLabels)} + ")"
                 `;
     }
     return;
@@ -252,8 +252,8 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
             path = `${path}.${subProperty}`;
             label = `${label}.${subProperty}`;
         }
-        return expandToNode `
-                    "${label.replaceAll(".", "").toLowerCase()}": ${path}
+        return expandToNode `
+                    "${label.replaceAll(".", "").toLowerCase()}": ${path}
                 `;
     }
     if (isTargetAccess(expression)) {
@@ -273,8 +273,8 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
             path = `${path}.${subProperty}`;
             label = `${label}.${subProperty}`;
         }
-        return expandToNode `
-                    "${label.replaceAll(".", "").toLowerCase()}": ${path}
+        return expandToNode `
+                    "${label.replaceAll(".", "").toLowerCase()}": ${path}
                 `;
     }
     if (isPromptInputAccess(expression)) {
@@ -293,14 +293,14 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
         // 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}\`
+            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}
+            return expandToNode `
+                        "${fieldName}": ${base}
                     `;
         }
         let key = fieldName;
@@ -309,8 +309,8 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
             key = `${key}.${subProperty}`;
             dataPath = `${dataPath}.${subProperty.toLowerCase()}`;
         }
-        return expandToNode `
-                    "${key.replaceAll(".", "").toLowerCase()}": ${dataPath} ?? 0
+        return expandToNode `
+                    "${key.replaceAll(".", "").toLowerCase()}": ${dataPath} ?? 0
                 `;
     }
     if (isAccess(expression)) {
@@ -333,8 +333,8 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
                 subProperty = "?.mod";
             }
             console.log(label, path);
-            return expandToNode `
-                        "${label.replaceAll(".", "").replaceAll(" ", "").toLowerCase()}": foundry.utils.getProperty(context.object.parent, ${path}.toLowerCase())${subProperty}
+            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)) {
@@ -350,8 +350,8 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
                 subProperty = "?.mod";
             }
             console.log(label, selfPropertyPath);
-            return expandToNode `
-                        "${label.replaceAll(".", "").replaceAll(" ", "").toLowerCase()}": foundry.utils.getProperty(context.object, "system." + ${selfPropertyPath}.toLowerCase())${subProperty}
+            return expandToNode `
+                        "${label.replaceAll(".", "").replaceAll(" ", "").toLowerCase()}": foundry.utils.getProperty(context.object, "system." + ${selfPropertyPath}.toLowerCase())${subProperty}
                     `;
         }
         else {
@@ -360,25 +360,25 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
                 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))
+                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()}`;
@@ -404,8 +404,8 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
             label = `${label} ${humanize(subProperty)}`;
         }
         console.log(label, path);
-        return expandToNode `
-                    "${label.replaceAll(".", "").replaceAll(" ", "").toLowerCase()}": ${path} ?? 0
+        return expandToNode `
+                    "${label.replaceAll(".", "").replaceAll(" ", "").toLowerCase()}": ${path} ?? 0
                 `;
     }
     if (isFleetingAccess(expression)) {
@@ -428,8 +428,8 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
             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
+        return expandToNode `
+                    "${label}": ${path} ?? 0
                 `;
     }
     // if (isVariableAccess(expression)) {
@@ -460,38 +460,38 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
         // 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}
+            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
+            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
+        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: ", " })}
+        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 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;
+    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;
     function humanize(string) {
         if (string == undefined) {
             return "";
@@ -504,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) {
@@ -524,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)};
+                    }
                 `;
             }
         }
@@ -575,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)) {
@@ -598,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
@@ -625,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)) {
@@ -663,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) {
@@ -679,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) {
@@ -699,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)) {
@@ -722,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) {
@@ -735,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)) {
@@ -758,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) {
@@ -793,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) {
@@ -830,12 +830,18 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                 accessPath = `${accessPath}.system`;
             }
         }
+        const refTargetIsRoll = isVariableExpression(expression.val.ref) && isRoll(expression.val.ref.value);
         for (const subProperty of (_c = expression.subProperties) !== null && _c !== void 0 ? _c : []) {
-            if (subProperty.toLowerCase() == "name") {
+            const lowerSub = subProperty.toLowerCase();
+            if (lowerSub == "name") {
                 accessPath = `${(_d = expression.val.ref) === null || _d === void 0 ? void 0 : _d.name}.name`;
             }
+            else if (refTargetIsRoll && lowerSub == "dice") {
+                // Foundry's Roll#dice returns DiceTerms; the face-value array lives on diceFaces.
+                accessPath = `${accessPath}.diceFaces`;
+            }
             else {
-                accessPath = `${accessPath}.${subProperty.toLowerCase()}`;
+                accessPath = `${accessPath}.${lowerSub}`;
             }
         }
         // A bare reference to a roll variable (e.g. `fleeting r = roll(d20 + 1)`
@@ -852,14 +858,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) {
@@ -867,12 +873,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) {
@@ -891,8 +897,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) {
@@ -903,20 +909,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
@@ -939,13 +945,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);
@@ -955,24 +961,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 {
@@ -991,35 +997,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
@@ -1030,70 +1036,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)) {
@@ -1144,8 +1150,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)) {
@@ -1153,8 +1159,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)) {
@@ -1176,8 +1182,8 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                 }
             }
         }
-        return expandToNode `
-            ${path}
+        return expandToNode `
+            ${path}
         `;
     }
     if (isIfStatement(expression)) {
@@ -1186,15 +1192,29 @@ export function translateExpression(entry, id, expression, preDerived = false, g
     if (isWhenExpressions(expression)) {
         return translateComparisonExpression(expression);
     }
+    if (isRollResultAccess(expression)) {
+        const target = (_h = expression.variable.ref) === null || _h === void 0 ? void 0 : _h.name;
+        const jsMethod = expression.method === "count" ? "countDice"
+            : expression.method === "contains" ? "containsDie"
+                : expression.method;
+        const arg = expression.arg;
+        const argJs = arg.param != undefined
+            ? expandToNode `(${arg.param.name}) => ${translateExpression(entry, id, arg.body, preDerived, generatingProperty)}`
+            : translateExpression(entry, id, arg.value, preDerived, generatingProperty);
+        return expandToNode `${target}.${jsMethod}(${argJs})`;
+    }
     if (isFleetingAccess(expression)) {
-        let accessPath = (_h = expression.variable.ref) === null || _h === void 0 ? void 0 : _h.name;
+        let accessPath = (_j = expression.variable.ref) === null || _j === void 0 ? void 0 : _j.name;
         if (expression.subProperty != undefined) {
-            accessPath = `${accessPath}.${fleetingSubProperty(expression)}`;
+            // Foundry's Roll#dice returns DiceTerms; remap r.dice to the face-value getter.
+            const isRollDice = (isRoll((_k = expression.variable.ref) === null || _k === void 0 ? void 0 : _k.value) || isDamageRoll((_l = expression.variable.ref) === null || _l === void 0 ? void 0 : _l.value))
+                && expression.subProperty.toLowerCase() === "dice";
+            accessPath = `${accessPath}.${isRollDice ? "diceFaces" : fleetingSubProperty(expression)}`;
         }
         else if (expression.arrayAccess != undefined) {
             accessPath = `${accessPath}[${translateExpression(entry, id, expression.arrayAccess, preDerived, generatingProperty)}]`;
         }
-        else if (isRoll((_j = expression.variable.ref) === null || _j === void 0 ? void 0 : _j.value) || isDamageRoll((_k = expression.variable.ref) === null || _k === void 0 ? void 0 : _k.value)) {
+        else if (isRoll((_m = expression.variable.ref) === null || _m === void 0 ? void 0 : _m.value) || isDamageRoll((_o = expression.variable.ref) === null || _o === void 0 ? void 0 : _o.value)) {
             // A bare reference to a roll variable used in a general expression
             // (comparison, arithmetic, assignment, return, function arg) should
             // use the roll's numeric total rather than the Roll object itself.
@@ -1202,19 +1222,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)) {
@@ -1231,37 +1251,37 @@ 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)) {
@@ -1276,49 +1296,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;
@@ -1327,8 +1347,8 @@ 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)) {
@@ -1336,47 +1356,47 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                 if (expression.subProperty != undefined) {
                     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)) {
@@ -1387,20 +1407,20 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             const typeParam = expression.params.find(isTypeParam);
             let damageTypeDataAccess = '';
             if (isAccess(typeParam.value)) {
-                damageTypeDataAccess = `context.object.system.${(_o = (_m = (_l = typeParam.value) === null || _l === void 0 ? void 0 : _l.property) === null || _m === void 0 ? void 0 : _m.ref) === null || _o === void 0 ? void 0 : _o.name.toLowerCase()}`;
+                damageTypeDataAccess = `context.object.system.${(_r = (_q = (_p = typeParam.value) === null || _p === void 0 ? void 0 : _p.property) === null || _q === void 0 ? void 0 : _q.ref) === null || _r === void 0 ? void 0 : _r.name.toLowerCase()}`;
             }
             else if (isParentAccess(typeParam.value)) {
                 // Handle parent.SomeDamageType
-                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 : '';
+                const parentPath = (_v = (_u = (_t = (_s = typeParam.value.property) === null || _s === void 0 ? void 0 : _s.ref) === null || _t === void 0 ? void 0 : _t.name) === null || _u === void 0 ? void 0 : _u.toLowerCase()) !== null && _v !== void 0 ? _v : '';
                 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, entry, id, preDerived, generatingProperty), { 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;
@@ -1408,32 +1428,51 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         const displayFormula = displayFormulaParts.every(p => p != null)
             ? displayFormulaParts.join("")
             : undefined;
-        return expandToNode `
+        // Build the detection-config options (crit/fumble/success/failure) passed as the
+        // Roll constructor's 3rd arg, so getters can read them off this.options after .roll().
+        const critParam = expression.params.find(isCritParam);
+        const fumbleParam = expression.params.find(isFumbleParam);
+        const successParam = expression.params.find(isSuccessParam);
+        const failureParam = expression.params.find(isFailureParam);
+        const optionEntries = [];
+        const thresholdEntry = (key, p) => { var _a; return expandToNode `${key}: { op: "${(_a = p.op) !== null && _a !== void 0 ? _a : '=='}", value: ${translateExpression(entry, id, p.value, preDerived, generatingProperty)} }`; };
+        if (critParam)
+            optionEntries.push(thresholdEntry("crit", critParam));
+        if (fumbleParam)
+            optionEntries.push(thresholdEntry("fumble", fumbleParam));
+        if (successParam)
+            optionEntries.push(thresholdEntry("success", successParam));
+        if (failureParam)
+            optionEntries.push(thresholdEntry("failure", failureParam));
+        const rollOptions = optionEntries.length > 0
+            ? expandToNode `, { ${joinToNode(optionEntries, e => e, { separator: ", " })} }`
+            : undefined;
+        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, entry, id, preDerived, generatingProperty), { separator: ", " })}}).roll(), ${displayFormula != null ? `{_displayFormula: "${displayFormula}"}` : '{}'})
+        }, { separator: " + " })}, {${joinToNode(rollParts, e => translateDiceData(e, entry, id, preDerived, generatingProperty), { separator: ", " })}}${rollOptions !== null && rollOptions !== void 0 ? rollOptions : ''}).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: {
@@ -1442,8 +1481,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)) {
@@ -1451,10 +1490,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;
@@ -1463,33 +1502,33 @@ 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((_w = expression.collection.property) === null || _w === void 0 ? void 0 : _w.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((_x = expression.collection.property) === null || _x === void 0 ? void 0 : _x.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)) {
         const labelParam = expression.params.find(x => isLabelParam(x));
-        const title = (_v = labelParam === null || labelParam === void 0 ? void 0 : labelParam.value) !== null && _v !== void 0 ? _v : "Prompt";
+        const title = (_y = labelParam === null || labelParam === void 0 ? void 0 : labelParam.value) !== null && _y !== void 0 ? _y : "Prompt";
         const targetParam = expression.params.find(x => isTargetParam(x));
-        const target = (_w = targetParam === null || targetParam === void 0 ? void 0 : targetParam.value) !== null && _w !== void 0 ? _w : "self";
+        const target = (_z = targetParam === null || targetParam === void 0 ? void 0 : targetParam.value) !== null && _z !== void 0 ? _z : "self";
         // Registry key for the generated Vue prompt app (game.system.prompts.<doc><action><variable>).
         const promptAction = AstUtils.getContainerOfType(expression, isAction);
         const promptDocument = AstUtils.getContainerOfType(expression, isDocument);
@@ -1507,192 +1546,192 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         if (timeLimitParam != undefined) {
             let durationMod = "";
             const duration = translateExpression(entry, id, timeLimitParam.value, preDerived, generatingProperty);
-            let units = (_x = timeLimitParam.unit) !== null && _x !== void 0 ? _x : "ms";
+            let units = (_0 = timeLimitParam.unit) !== null && _0 !== void 0 ? _0 : "ms";
             if (units === "seconds") {
                 durationMod = ` * 1000`;
             }
             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);
+        let systemPath = getSystemPath((_1 = expression.property) === null || _1 === void 0 ? void 0 : _1.ref, expression.subProperties, (_2 = expression.propertyLookup) === null || _2 === void 0 ? void 0 : _2.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)) {
@@ -1706,16 +1745,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_${(_3 = expression.method.ref) === null || _3 === void 0 ? void 0 : _3.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_${(_4 = expression.method.ref) === null || _4 === void 0 ? void 0 : _4.name}(context, update, embeddedUpdate, parentUpdate, parentEmbeddedUpdate, targetUpdate, targetEmbeddedUpdate, ${args})
         `;
     }
     if (isNumberRange(expression)) {
@@ -1723,8 +1762,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)) {
@@ -1738,8 +1777,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)) {
@@ -1747,45 +1786,45 @@ export function translateExpression(entry, id, expression, preDerived = false, g
         if (!fileParam)
             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)});
+        const volume = (_5 = volumeParam === null || volumeParam === void 0 ? void 0 : volumeParam.value) !== null && _5 !== void 0 ? _5 : 0.5;
+        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)) {
@@ -1808,8 +1847,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);