intelligent-system-design-language 0.3.34 → 0.4.1

package/out/cli/components/dev-module-generator.js

@@ -0,0 +1,399 @@
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+import { expandToNode, toString } from 'langium/generate';
+import { isConfigExpression, isActor, isItem } from '../../language/generated/ast.js';
+export function generateDevModule(entry, id, devDest) {
+    var _a, _b, _c, _d;
+    const scriptsDir = path.join(devDest, 'scripts');
+    if (!fs.existsSync(scriptsDir)) {
+        fs.mkdirSync(scriptsDir, { recursive: true });
+    }
+    const title = (_b = (_a = entry.config.body.find(x => isConfigExpression(x) && x.type === 'label')) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : id;
+    const author = (_d = (_c = entry.config.body.find(x => isConfigExpression(x) && x.type === 'author')) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : '';
+    // Foundry fires `render${ClassName}` — for our generated sheets that's `render<Doc>VueSheet`
+    // (e.g. renderHeroVueSheet), NOT the generic renderActorSheet. Hook the real class names so
+    // the dev overlays actually attach.
+    const sheetHooks = entry.documents
+        .filter(d => isActor(d) || isItem(d))
+        .map(d => `render${d.name}VueSheet`);
+    generateModuleJson(id, title, author, devDest);
+    generateDevTools(id, title, devDest, sheetHooks);
+}
+function generateModuleJson(id, title, author, devDest) {
+    const filePath = path.join(devDest, 'module.json');
+    const fileNode = expandToNode `
+        {
+            "id": "${id}-dev",
+            "title": "${title} — Dev Tools",
+            "description": "Developer companion module for ${title}. Install locally; never distribute to players.",
+            "version": "dev",
+            "compatibility": {
+                "minimum": 12,
+                "verified": 14
+            },
+            "authors": [
+                { "name": "${author}" }
+            ],
+            "esmodules": [
+                "scripts/dev-tools.mjs"
+            ],
+            "relationships": {
+                "systems": [
+                    {
+                        "id": "${id}",
+                        "type": "system",
+                        "reason": "Dev tools require the ${title} system to be active"
+                    }
+                ]
+            }
+        }
+    `.appendNewLineIfNotEmpty();
+    fs.writeFileSync(filePath, toString(fileNode));
+}
+function generateDevTools(id, title, devDest, sheetHooks) {
+    const filePath = path.join(devDest, 'scripts', 'dev-tools.mjs');
+    const allRenderHooks = ['renderActorSheet', 'renderActorSheetV2', 'renderItemSheet', 'renderItemSheetV2', ...sheetHooks];
+    const fileNode = expandToNode `
+        // ${id}-dev — developer companion for ${title}
+        // Regenerated on each build. Customise ${id}-custom.mjs instead.
+
+        const MODULE_ID = "${id}-dev";
+
+        // ─── Vue DevTools ───────────────────────────────────────────────────
+        // Only enable if the Vue DevTools extension is already installed —
+        // creating a stub hook causes Vue to call emit() on a no-op object and break.
+        if (window.__VUE_DEVTOOLS_GLOBAL_HOOK__) {
+            window.__VUE_DEVTOOLS_GLOBAL_HOOK__.enabled = true;
+        }
+
+        // ─── Tooltip styles ─────────────────────────────────────────────────
+        {
+            const style = document.createElement("style");
+            style.textContent = \`
+                .isdl-dev-tooltip {
+                    position: fixed;
+                    background: #1a1a2e;
+                    border: 1px solid #4a9eff;
+                    border-radius: 4px;
+                    padding: 6px 8px;
+                    font-family: monospace;
+                    font-size: 11px;
+                    color: #e0e0e0;
+                    box-shadow: 0 2px 8px rgba(0,0,0,.6);
+                    pointer-events: none;
+                    min-width: 220px;
+                    z-index: 10000;
+                }
+                .isdl-dev-section-header {
+                    font-size: 10px;
+                    font-weight: bold;
+                    color: #c0d8f0;
+                    border-bottom: 1px solid #2a3a5a;
+                    padding-bottom: 3px;
+                    margin-bottom: 4px;
+                    display: flex;
+                    align-items: center;
+                    gap: 5px;
+                }
+                .isdl-dev-section-hint {
+                    font-weight: normal;
+                    font-size: 9px;
+                    color: #6a8aaa;
+                    margin-left: auto;
+                }
+                .isdl-dev-label {
+                    font-size: 9px;
+                    text-transform: uppercase;
+                    letter-spacing: 0.05em;
+                    color: #6a8aaa;
+                    margin-top: 5px;
+                    margin-bottom: 1px;
+                }
+                .isdl-dev-label:first-child { margin-top: 0; }
+                .isdl-dev-row {
+                    display: flex;
+                    align-items: center;
+                    gap: 6px;
+                    padding: 2px 0;
+                }
+                .isdl-dev-row i { color: #4a9eff; width: 14px; text-align: center; }
+                .isdl-dev-row code { flex: 1; font-size: 10px; color: #a0cfff; word-break: break-all; }
+                .isdl-dev-copy {
+                    background: none;
+                    border: 1px solid #4a9eff;
+                    border-radius: 2px;
+                    color: #4a9eff;
+                    cursor: pointer;
+                    padding: 1px 5px;
+                    font-size: 10px;
+                    line-height: 1.4;
+                }
+                .isdl-dev-copy:hover { background: #4a9eff; color: #1a1a2e; }
+                .isdl-pick-mode-btn { opacity: 0.4; transition: opacity 0.15s, color 0.15s; }
+                .isdl-pick-mode-btn.isdl-pick-active { opacity: 1; color: #f6a623 !important; }
+                .isdl-dev-tooltip.isdl-dev-locked { border-color: #f6a623; box-shadow: 0 4px 16px rgba(0,0,0,.8); pointer-events: auto; }
+                .isdl-dev-tip-header { display: flex; align-items: center; justify-content: space-between; margin-bottom: 6px; padding-bottom: 4px; border-bottom: 1px solid #2a3a5a; }
+                .isdl-dev-tip-title { font-size: 10px; font-weight: bold; color: #f6a623; letter-spacing: 0.05em; }
+                .isdl-dev-dismiss { background: none; border: 1px solid #f6a623; border-radius: 2px; color: #f6a623; cursor: pointer; padding: 0 5px; font-size: 11px; line-height: 1.6; }
+                .isdl-dev-dismiss:hover { background: #f6a623; color: #1a1a2e; }
+                .isdl-inspector { display: flex; flex-direction: column; gap: 8px; padding: 4px 0; }
+                .isdl-inspector-hint { font-size: 12px; color: #888; margin: 0; }
+                .isdl-inspector-hint code { font-size: 11px; background: #eee; padding: 1px 3px; border-radius: 2px; }
+                .isdl-inspector-copy-all { align-self: flex-end; cursor: pointer; }
+                .isdl-inspector-pre {
+                    max-height: 420px;
+                    overflow: auto;
+                    font-size: 11px;
+                    font-family: monospace;
+                    background: #1a1a2e;
+                    color: #a0cfff;
+                    padding: 10px;
+                    border-radius: 4px;
+                    margin: 0;
+                    white-space: pre;
+                    line-height: 1.5;
+                }
+            \`;
+            document.head.appendChild(style);
+        }
+
+        // ─── Pick-mode field inspector ──────────────────────────────────────
+        let _pickMode = false;
+        let _hoverTip = null;
+        let _lockedTip = null;
+
+        function _setPickMode(enabled) {
+            _pickMode = enabled;
+            if (!enabled) { _clearLockedTip(); _clearHoverTip(); }
+            document.querySelectorAll(".isdl-pick-mode-btn")
+                .forEach(b => b.classList.toggle("isdl-pick-active", enabled));
+            console.log(\`[\${MODULE_ID}] pick mode \${enabled ? "ON — hover a field, click to lock" : "off"}\`);
+        }
+        function _clearHoverTip() { _hoverTip?.remove(); _hoverTip = null; }
+        function _clearLockedTip() { _lockedTip?.remove(); _lockedTip = null; }
+
+        function _makeRow(iconClass, label, value) {
+            return \`
+                <div class="isdl-dev-label">\${label}</div>
+                <div class="isdl-dev-row">
+                    <i class="\${iconClass}"></i>
+                    <code>\${value}</code>
+                    <button type="button" class="isdl-dev-copy" data-copy="\${value}" title="Copy">
+                        <i class="fa-solid fa-copy"></i>
+                    </button>
+                </div>
+            \`;
+        }
+
+        function _buildTipBody(systemPath, typeSelector, nameSelector) {
+            return \`<div class="isdl-dev-section-header"><i class="fa-solid fa-database"></i> Data Path<span class="isdl-dev-section-hint">for macros &amp; scripts</span></div>\`
+                + _makeRow("fa-solid fa-folder-open", "system path", systemPath)
+                + \`<div class="isdl-dev-section-header" style="margin-top:8px"><i class="fa-solid fa-paintbrush"></i> CSS Selectors<span class="isdl-dev-section-hint">for custom.css</span></div>\`
+                + (typeSelector ? _makeRow("fa-solid fa-layer-group", "all fields of this type", typeSelector) : "")
+                + (nameSelector ? _makeRow("fa-solid fa-crosshairs", "just this field", nameSelector) : "");
+        }
+
+        function _positionTip(tip, el) {
+            const rect = el.getBoundingClientRect();
+            tip.style.top = (rect.bottom + 4) + "px";
+            tip.style.left = rect.left + "px";
+        }
+
+        function _showHoverTip(el, systemPath, typeSelector, nameSelector) {
+            _clearHoverTip();
+            if (!_pickMode || _lockedTip) return;
+            const tip = document.createElement("div");
+            tip.className = "isdl-dev-tooltip";
+            tip.innerHTML = _buildTipBody(systemPath, typeSelector, nameSelector);
+            _positionTip(tip, el);
+            document.body.appendChild(tip);
+            _hoverTip = tip;
+        }
+
+        function _lockTip(el, systemPath, typeSelector, nameSelector) {
+            _clearHoverTip();
+            _clearLockedTip();
+            const tip = document.createElement("div");
+            tip.className = "isdl-dev-tooltip isdl-dev-locked";
+            tip.innerHTML =
+                \`<div class="isdl-dev-tip-header"><span class="isdl-dev-tip-title"><i class="fa-solid fa-crosshairs"></i> FIELD INFO</span><button type="button" class="isdl-dev-dismiss" title="Dismiss">&times;</button></div>\`
+                + _buildTipBody(systemPath, typeSelector, nameSelector);
+            tip.querySelector(".isdl-dev-dismiss").addEventListener("click", e => { e.stopPropagation(); _clearLockedTip(); });
+            tip.querySelectorAll(".isdl-dev-copy").forEach(btn => {
+                btn.addEventListener("click", e => {
+                    e.stopPropagation();
+                    navigator.clipboard.writeText(btn.dataset.copy).then(() => {
+                        const icon = btn.querySelector("i");
+                        icon.className = "fa-solid fa-check";
+                        setTimeout(() => icon.className = "fa-solid fa-copy", 1500);
+                    });
+                });
+            });
+            _positionTip(tip, el);
+            document.body.appendChild(tip);
+            _lockedTip = tip;
+        }
+
+        // Delegated field listeners — attached once on document, so they work for Vue-mounted
+        // fields regardless of render timing and survive sheet re-renders.
+        let _pickWired = false;
+        function _wirePickDelegation() {
+            if (_pickWired) return;
+            _pickWired = true;
+            let _curField = null;
+            const _fieldAt = t => {
+                const el = t?.closest?.("[class*='isdl-']");
+                if (!el) return null;
+                const input = el.querySelector("input[name^='system.'], select[name^='system.'], textarea[name^='system.']");
+                if (!input) return null;
+                const { typeSelector, nameSelector } = _buildCssSelectors(el);
+                return { el, systemPath: input.getAttribute("name"), typeSelector, nameSelector };
+            };
+            document.addEventListener("mouseover", e => {
+                if (!_pickMode) return;
+                const f = _fieldAt(e.target);
+                if (f && f.el !== _curField) { _curField = f.el; _showHoverTip(f.el, f.systemPath, f.typeSelector, f.nameSelector); }
+                else if (!f && _curField) { _curField = null; _clearHoverTip(); }
+            });
+            document.addEventListener("click", e => {
+                if (!_pickMode) return;
+                const f = _fieldAt(e.target);
+                if (f) { e.stopPropagation(); _lockTip(f.el, f.systemPath, f.typeSelector, f.nameSelector); }
+            }, true);
+        }
+
+        function _buildCssSelectors(el) {
+            const classes = [...el.classList];
+            // e.g. isdl-field-brawn → "Just this field"
+            const nameClass = classes.find(c => /^isdl-field-[a-z]/.test(c));
+            // e.g. isdl-number, isdl-attribute — the field type, skip field/visibility/name classes
+            const typeClass = classes.find(c =>
+                c.startsWith("isdl-") &&
+                c !== "isdl-field" &&
+                !c.startsWith("isdl-visibility-") &&
+                !c.startsWith("isdl-field-")
+            );
+            return {
+                typeSelector: typeClass ? \`.\${typeClass}\` : null,
+                nameSelector: nameClass ? \`.\${nameClass}\` : null
+            };
+        }
+
+        // ─── System data inspector ──────────────────────────────────────────
+        function _openInspector(doc) {
+            const data = doc.system?.toObject?.() ?? doc.system ?? {};
+            const json = JSON.stringify(data, null, 2);
+            new Dialog({
+                title: \`System Data — \${doc.name}\`,
+                content: \`
+                    <div class="isdl-inspector">
+                        <p class="isdl-inspector-hint">
+                            <i class="fa-solid fa-circle-info"></i>
+                            Everything stored in <code>actor.system</code> for this document.
+                            Use these paths in macros, roll formulas, and scripts.
+                        </p>
+                        <button type="button" class="isdl-inspector-copy-all">
+                            <i class="fa-solid fa-copy"></i> Copy all
+                        </button>
+                        <pre class="isdl-inspector-pre">\${json}</pre>
+                    </div>
+                \`,
+                buttons: { close: { label: "Close" } },
+                render: html => {
+                    const root = html instanceof HTMLElement ? html : html?.[0];
+                    root?.querySelector(".isdl-inspector-copy-all")?.addEventListener("click", () => {
+                        navigator.clipboard.writeText(json).then(() => {
+                            const btn = root.querySelector(".isdl-inspector-copy-all");
+                            if (btn) {
+                                btn.innerHTML = \`<i class="fa-solid fa-check"></i> Copied!\`;
+                                setTimeout(() => { btn.innerHTML = \`<i class="fa-solid fa-copy"></i> Copy all\`; }, 1500);
+                            }
+                        });
+                    });
+                }
+            }).render(true);
+        }
+
+        // ─── Sheet overlay ──────────────────────────────────────────────────
+        function _addHeaderControl(header, btn) {
+            const closeBtn = header.querySelector(".close, [data-action='close'], [aria-label='Close']");
+            if (closeBtn) closeBtn.before(btn); else header.append(btn);
+        }
+
+        function _activateOverlays(doc, html) {
+            const root = html instanceof HTMLElement ? html : html?.[0];
+            if (!root) return;
+
+            // v14: header is a direct child of the form (root IS the sheet element)
+            // v12/v13: header is a sibling of root inside .window-app
+            const header = root.querySelector(".window-header, .window-controls")
+                ?? root.closest(".window-app, .application")?.querySelector(".window-header, .window-controls");
+
+            // System Data Viewer button — icon as an <i> child (not a class on the button),
+            // inserted before the close control so it sits on the right.
+            if (header && !header.querySelector(".isdl-inspector-btn")) {
+                const btn = document.createElement("button");
+                btn.type = "button";
+                btn.className = "isdl-inspector-btn header-control";
+                btn.innerHTML = '<i class="fa-solid fa-magnifying-glass"></i>';
+                btn.setAttribute("aria-label", "Inspect System Data");
+                btn.setAttribute("data-tooltip", "Inspect System Data");
+                btn.addEventListener("click", e => { e.preventDefault(); _openInspector(doc); });
+                _addHeaderControl(header, btn);
+            }
+
+            // Pick Mode button — toggles the field path/CSS picker: hover a field to preview
+            // its data path + CSS selectors, click to lock the tooltip.
+            if (header && !header.querySelector(".isdl-pick-mode-btn")) {
+                const btn = document.createElement("button");
+                btn.type = "button";
+                btn.className = "isdl-pick-mode-btn header-control";
+                btn.innerHTML = '<i class="fa-solid fa-crosshairs"></i>';
+                btn.setAttribute("aria-label", "Pick Mode");
+                btn.setAttribute("data-tooltip", "Pick Mode — hover a field to preview its data path & CSS, click to lock the tooltip");
+                btn.addEventListener("click", e => { e.preventDefault(); _setPickMode(!_pickMode); });
+                _addHeaderControl(header, btn);
+            }
+
+            // Field hover/click is handled by a single delegated listener (wired once below),
+            // so it works for Vue-mounted fields regardless of render timing.
+            _wirePickDelegation();
+        }
+
+        // ─── Verbose logging ────────────────────────────────────────────────
+        Hooks.once("init", () => {
+            console.group(\`[\${MODULE_ID}] init\`);
+            console.log("system:", game.system);
+            console.groupEnd();
+        });
+
+        Hooks.once("ready", () => {
+            console.group(\`[\${MODULE_ID}] ready\`);
+            console.log("actors:", game.actors?.size ?? 0);
+            console.log("items:", game.items?.size ?? 0);
+            console.groupEnd();
+        });
+
+        // ApplicationV2 (Foundry v13+) fires renderActorSheetV2 / renderItemSheetV2
+        // ApplicationV1 fires the legacy renderActorSheet / renderItemSheet
+        // Foundry fires render<ClassName>; our sheets are <Doc>VueSheet. The generic
+        // ActorSheet/ItemSheet names are kept as a fallback for other Foundry versions.
+        for (const hook of ${JSON.stringify(allRenderHooks)}) {
+            Hooks.on(hook, (app, html) => {
+                const doc = app.actor ?? app.item ?? app.document;
+                _activateOverlays(doc, html instanceof HTMLElement ? html : html?.[0] ?? app.element);
+                console.log(\`[\${MODULE_ID}] \${hook}\`, doc?.name);
+            });
+        }
+
+        Hooks.on("preUpdateActor", (actor, changes) => {
+            console.log(\`[\${MODULE_ID}] preUpdateActor\`, actor.name, changes);
+        });
+
+        Hooks.on("preUpdateItem", (item, changes) => {
+            console.log(\`[\${MODULE_ID}] preUpdateItem\`, item.name, changes);
+        });
+    `.appendNewLineIfNotEmpty();
+    fs.writeFileSync(filePath, toString(fileNode));
+}
+//# sourceMappingURL=dev-module-generator.js.map

package/out/cli/components/dev-module-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-module-generator.js","sourceRoot":"","sources":["../../../src/cli/components/dev-module-generator.ts"],"names":[],"mappings":"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"}

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

@@ -66,6 +66,10 @@ export function translateDiceParts(expression, noLabels = false) {
                 `;
     }
     if (isParentAccess(expression)) {
+        if (expression.nameAccess) {
+            const suffix = noLabels ? "" : "[Name]";
+            return expandToNode `"@name${suffix}"`;
+        }
         let path = (_j = (_h = (_g = expression.property) === null || _g === void 0 ? void 0 : _g.ref) === null || _h === void 0 ? void 0 : _h.name) !== null && _j !== void 0 ? _j : "";
         let label = humanize((_m = (_l = (_k = expression.property) === null || _k === void 0 ? void 0 : _k.ref) === null || _l === void 0 ? void 0 : _l.name) !== null && _m !== void 0 ? _m : "");
         const document = getParentDocument(expression);
@@ -92,6 +96,10 @@ export function translateDiceParts(expression, noLabels = false) {
                 `;
     }
     if (isTargetAccess(expression)) {
+        if (expression.nameAccess) {
+            const suffix = noLabels ? "" : "[Name]";
+            return expandToNode `"@name${suffix}"`;
+        }
         let path = (_w = (_v = (_u = expression.property) === null || _u === void 0 ? void 0 : _u.ref) === null || _v === void 0 ? void 0 : _v.name) !== null && _w !== void 0 ? _w : "";
         let label = humanize((_z = (_y = (_x = expression.property) === null || _x === void 0 ? void 0 : _x.ref) === null || _y === void 0 ? void 0 : _y.name) !== null && _z !== void 0 ? _z : "");
         const document = getTargetDocument(expression);
@@ -222,9 +230,13 @@ function translateDisplayFormula(expression) {
         return label.trim();
     }
     if (isParentAccess(expression)) {
+        if (expression.nameAccess)
+            return "Name";
         return humanize((_m = (_l = (_k = expression.property) === null || _k === void 0 ? void 0 : _k.ref) === null || _l === void 0 ? void 0 : _l.name) !== null && _m !== void 0 ? _m : "");
     }
     if (isTargetAccess(expression)) {
+        if (expression.nameAccess)
+            return "Name";
         return humanize((_q = (_p = (_o = expression.property) === null || _o === void 0 ? void 0 : _o.ref) === null || _p === void 0 ? void 0 : _p.name) !== null && _q !== void 0 ? _q : "");
     }
     if (isFleetingAccess(expression)) {
@@ -236,6 +248,11 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61;
     console.log("Translating Dice Data: ", expression.$type);
     if (isParentAccess(expression)) {
+        if (expression.nameAccess) {
+            return expandToNode `
+                        "name": context.object.parent?.name
+                    `;
+        }
         let path = "context.object.parent.system";
         let label = (_c = (_b = (_a = expression.property) === null || _a === void 0 ? void 0 : _a.ref) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : "";
         console.log("Parent Access:", (_e = (_d = expression.property) === null || _d === void 0 ? void 0 : _d.ref) === null || _e === void 0 ? void 0 : _e.name);
@@ -257,6 +274,11 @@ export function translateDiceData(expression, entry, id, preDerived, generatingP
                 `;
     }
     if (isTargetAccess(expression)) {
+        if (expression.nameAccess) {
+            return expandToNode `
+                        "name": context.target?.name
+                    `;
+        }
         let path = "context.target.system";
         let label = (_q = (_p = (_o = expression.property) === null || _o === void 0 ? void 0 : _o.ref) === null || _p === void 0 ? void 0 : _p.name) !== null && _q !== void 0 ? _q : "";
         console.log("Target Access:", (_s = (_r = expression.property) === null || _r === void 0 ? void 0 : _r.ref) === null || _s === void 0 ? void 0 : _s.name);
@@ -823,11 +845,30 @@ export function translateExpression(entry, id, expression, preDerived = false, g
             throw new Error("Reference expression has no reference");
         }
         console.log("Translating Reference Expression: " + accessPath);
-        // Check if we are in an each loop
-        const eachExp = AstUtils.getContainerOfType(expression.$container, isEach);
-        if (eachExp != undefined) {
-            if (isAccess(eachExp.collection) || isParentAccess(eachExp.collection) || isTargetAccess(eachExp.collection)) {
-                accessPath = `${accessPath}.system`;
+        // If this reference resolves to an `each` loop variable, the loop iterates over a
+        // collection of Foundry Documents (embedded items). Custom fields on a Document live
+        // under `.system` (e.g. `sk.Expertise` -> `sk.system.expertise`), so member access on
+        // the loop variable needs the `.system` hop. Built-in Document props like `.name` are
+        // handled separately below and must NOT get `.system`.
+        //
+        // Only the loop VARIABLE itself gets this treatment. Function/method parameters and
+        // other locals that merely appear inside the loop body (e.g. `SkillName`, `Expt`) are
+        // plain JS values and must be referenced by their bare name -- appending `.system` to a
+        // string param produced `SkillName.system` (undefined at runtime). See bug #123.
+        //
+        // Walk every enclosing `each` (not just the innermost) so a reference to an outer loop
+        // variable from within a nested loop still resolves correctly.
+        const refTarget0 = expression.val.ref;
+        if (isParameter(refTarget0)) {
+            let eachAncestor = AstUtils.getContainerOfType(expression.$container, isEach);
+            while (eachAncestor != undefined) {
+                if (eachAncestor.var === refTarget0) {
+                    if (isAccess(eachAncestor.collection) || isParentAccess(eachAncestor.collection) || isTargetAccess(eachAncestor.collection)) {
+                        accessPath = `${accessPath}.system`;
+                    }
+                    break;
+                }
+                eachAncestor = AstUtils.getContainerOfType(eachAncestor.$container, isEach);
             }
         }
         const refTargetIsRoll = isVariableExpression(expression.val.ref) && isRoll(expression.val.ref.value);
@@ -1173,6 +1214,11 @@ export function translateExpression(entry, id, expression, preDerived = false, g
     }
     if (isParentAccess(expression)) {
         let path = "context.object.parent";
+        if (expression.nameAccess) {
+            return expandToNode `
+                ${path}?.name
+            `;
+        }
         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);
@@ -1182,6 +1228,11 @@ export function translateExpression(entry, id, expression, preDerived = false, g
     }
     if (isTargetAccess(expression)) {
         let path = "context.target";
+        if (expression.nameAccess) {
+            return expandToNode `
+                ${path}?.name
+            `;
+        }
         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);
@@ -1353,15 +1404,25 @@ export function translateExpression(entry, id, expression, preDerived = false, g
                 `;
             }
             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;
+                if (expression.nameAccess) {
+                    return expandToNode `
+                        { isRoll: false, label: "Name", value: context.object.parent?.name, wide: ${wide}, hasValue: context.object.parent?.name != "" },
+                    `;
+                }
+                let systemPath = getSystemPath((_3 = expression.property) === null || _3 === void 0 ? void 0 : _3.ref, expression.subProperties, undefined, true);
                 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;
+                if (expression.nameAccess) {
+                    return expandToNode `
+                        { isRoll: false, label: "Name", value: context.target?.name, wide: ${wide}, hasValue: context.target?.name != "" },
+                    `;
+                }
+                let systemPath = getSystemPath((_7 = expression.property) === null || _7 === void 0 ? void 0 : _7.ref, expression.subProperties, undefined, true);
                 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} != "" },
                 `;