- 0}
- fallback={
-
- {(group) => (
-
-
-
- );
-};
diff --git a/src/components/journal/VariableView.tsx b/src/components/journal/VariableView.tsx
new file mode 100644
index 0000000..9e388be
--- /dev/null
+++ b/src/components/journal/VariableView.tsx
@@ -0,0 +1,243 @@
+/**
+ * VariableView — table view of all variable key-value pairs and active tags.
+ *
+ * Shows variables grouped by type (declared, plain, tag-typed) and an
+ * active tags section showing which variable activates each tag and
+ * what modifier effects are in play.
+ */
+
+import { Component, For, createMemo, Show } from "solid-js";
+import { useJournalStream } from "../stores/journalStream";
+import { useJournalCompletions } from "./completions";
+import { computeActiveTags } from "./var-reactivity";
+import { extractDependencies } from "./var-reactivity";
+import type { VarDeclaration } from "./declare-parser";
+
+export const VariableView: Component = () => {
+ const stream = useJournalStream();
+ const comp = useJournalCompletions();
+
+ const declarations = createMemo(() => comp.data.declarations);
+ const tagModifiers = createMemo(() => comp.data.tagModifiers);
+ const values = createMemo(() => stream.variables);
+
+ /** Build a map: $key → VarDeclaration */
+ const declMap = createMemo(() => {
+ const map = new Map- 暂无属性定义。在文档中使用 ```yaml role=stat 代码块定义属性。 -
- } - > -
-
- )}
-
-
- {group.label}
-
-
-
-
- {({ fullKey: fk, def }) => {
- const val = () => values()[fk];
- const comp = () => computedValue(fk);
- const hasModifiers = () => {
- for (const [mfk, md] of defMap()) {
- if (
- md.type === "modifier" &&
- md.target &&
- fullKeyTarget(md.target, md, def)
- ) {
- return true;
- }
- }
- return false;
- };
- const canRoll = () =>
- def.roll ||
- def.formula ||
- def.type === "enum" ||
- def.type === "template";
-
- return (
-
-
-
-
- );
- }}
-
-
- {modifierLabel(def, statDefs())}
-
-
- {def.key}
-
-
-
- →{def.target}
-
-
-
-
-
-
- {def.default ?? "—"}
-
- }
- >
-
- {val()}
-
-
-
-
-
- = {comp()}
-
-
-
-
-
-
-
-
+
+ 暂无变量定义。在文档中使用 ```csv role=declare 代码块定义变量。
+
+ }
+ >
+ {/* Active Tags */}
+ 0}>
+
+
+ {/* Declared Variables */}
+ 0}>
+
+
+ {/* Plain Variables */}
+ 0}>
+
+
+ {/* Tag Variables */}
+ 0}>
+
+
+
+ );
+};
\ No newline at end of file
diff --git a/src/components/journal/command-completions.ts b/src/components/journal/command-completions.ts
index 4b79cc9..3804ae1 100644
--- a/src/components/journal/command-completions.ts
+++ b/src/components/journal/command-completions.ts
@@ -23,7 +23,7 @@ export function buildCompletions(
{ label: "/roll", kind: "command" as const, insertText: "/roll " },
{ label: "/spark", kind: "command" as const, insertText: "/spark " },
{ label: "/link", kind: "command" as const, insertText: "/link " },
- { label: "/stat", kind: "command" as const, insertText: "/stat " },
+ { label: "/set", kind: "command" as const, insertText: "/set " },
];
// Show commands when user types / or starts typing a command name
@@ -33,7 +33,7 @@ export function buildCompletions(
c.label.toLowerCase().startsWith(prefix),
);
if (!isGm) {
- matches = matches.filter((c) => c.label === "/stat");
+ matches = matches.filter((c) => c.label === "/set");
}
return matches.length > 0
? matches
@@ -101,50 +101,43 @@ export function buildCompletions(
});
}
- // After /stat — show subcommands or stat keys
- if (raw.startsWith("/stat ")) {
- const rest = raw.slice("/stat ".length).trim();
+ // After /set — show known variable and tag names
+ if (raw.startsWith("/set ")) {
+ const rest = raw.slice("/set ".length).trim();
- if (!rest || rest.length < 3) {
- const subs = ["set", "del", "roll"];
- const matches = subs.filter((s) => s.startsWith(rest.toLowerCase()));
- if (matches.length === 0)
- return [{ label: "set/del/roll", kind: "no-results", insertText: "" }];
- return matches.map((s) => ({
- label: `/stat ${s}`,
- kind: "value" as const,
- insertText: `/stat ${s} `,
- }));
- }
-
- if (rest.startsWith("set ")) {
- const prefix = rest.slice("set ".length).toLowerCase();
- const matches = data.stats
- .filter((s) => s.key.toLowerCase().includes(prefix))
+ // Already has a key? Show tag suggestions
+ if (rest.includes(" ")) {
+ const afterSpace = rest.slice(rest.indexOf(" ") + 1).toLowerCase();
+ const tags = data.tagModifiers.map((tm) => tm.tag);
+ // Also gather unique tags from declarations
+ const uniqueTags = [...new Set(tags)];
+ const matches = uniqueTags
+ .filter((t) => t.toLowerCase().startsWith(afterSpace))
.slice(0, 8);
- if (matches.length === 0)
- return [{ label: "未找到属性", kind: "no-results", insertText: "" }];
- return matches.map((s) => ({
- label: `${s.key} (${s.label})`,
+ if (matches.length === 0) {
+ return [{ label: "输入表达式", kind: "no-results", insertText: "" }];
+ }
+ return matches.map((t) => ({
+ label: t,
kind: "value" as const,
- insertText: `/stat set ${s.key}=`,
+ insertText: raw + t,
}));
}
- if (rest.startsWith("del ") || rest.startsWith("roll ")) {
- const [cmd, ...restParts] = rest.split(" ");
- const prefix = restParts.join(" ").toLowerCase();
- const matches = data.stats
- .filter((s) => s.key.toLowerCase().startsWith(prefix))
- .slice(0, 8);
- if (matches.length === 0)
- return [{ label: "未找到属性", kind: "no-results", insertText: "" }];
- return matches.map((s) => ({
- label: `${s.key} (${s.label})`,
- kind: "value" as const,
- insertText: `/stat ${cmd} ${s.key}`,
- }));
+ // Show variable name suggestions
+ const prefix = rest.toLowerCase();
+ const varNames = data.declarations.map((d) => d.key);
+ const matches = varNames
+ .filter((v) => v.toLowerCase().startsWith(prefix))
+ .slice(0, 8);
+ if (matches.length === 0) {
+ return [{ label: "$variable", kind: "no-results", insertText: "" }];
}
+ return matches.map((v) => ({
+ label: v,
+ kind: "value" as const,
+ insertText: `/set ${v} `,
+ }));
}
return [];
diff --git a/src/components/journal/command-dispatcher.ts b/src/components/journal/command-dispatcher.ts
index 637848f..e51621f 100644
--- a/src/components/journal/command-dispatcher.ts
+++ b/src/components/journal/command-dispatcher.ts
@@ -10,14 +10,9 @@ import { createSignal } from "solid-js";
import { parseInput } from "./command-parser";
import { resolveRollPayload } from "./types/roll";
import { resolveSparkPayload } from "./types/spark";
-import {
- resolveStatRoll,
- resolveTemplateSet,
- canModifyStat,
- fullKey,
- findStatDef,
-} from "./stat-helpers";
-import type { StatDef, StatTemplate } from "./completions";
+import { evaluateExpression, expressionIsTag } from "./variable-expression";
+import { computeCascade } from "./var-reactivity";
+import type { VarDeclaration, TagModifier } from "./declare-parser";
// ---------------------------------------------------------------------------
// Result
@@ -48,12 +43,12 @@ export interface DispatchContext {
command: string;
/** Spark table lookup data (from completions) */
sparkTables: { slug: string; csvPath?: string; remix?: boolean }[];
- /** Current runtime stat values */
- statValues: Record
+
+
+ 激活标签
+
+
+
+ {(tag) => {
+ const activator = () => tagActivators().get(tag);
+ const mods = () => tagModMap().get(tag) ?? [];
+ return (
+
+
+
+ 0}>
+
+
+ );
+ }}
+
+
+ {tag}
+
+
+
+ ← {activator()}
+
+
+
+
+
+ {(mod) => {
+ const currentVal = () => values()[mod.target];
+ return (
+
+
+
+ {mod.target}
+ +{mod.expression}
+
+
+ = {currentVal()}
+
+
+
+ );
+ }}
+
+
+
+
+ 声明变量
+
+
+
+
+ {(item) => (
+
+
+
+
+ )}
+
+
+ {item.key}
+
+
+ {item.expr}
+
+
+
+
+ {item.value}
+
+ 0}>
+
+ ← {item.deps.join(", ")}
+
+
+
+
+
+
+
+ 直接设置
+
+
+
+
+ {(item) => (
+
+
+
+
+ {item.key}
+
+
+ {item.value}
+
+
+ )}
+
+
+
+ 标签变量
+
+
+
+ {(item) => (
+
+
+
+
+ {item.key}
+
+
+ {item.value}
+
+
+ )}
+
- 📊
+ 🔢
{p.key}
@@ -41,9 +41,9 @@ registerMessageType({
}
return (
({
journalSetState(
produce((s) => {
if (p.action === "del") {
- delete s.stats[p.key];
+ delete s.variables[p.key];
} else if (p.value !== undefined) {
- s.stats[p.key] = p.value;
+ s.variables[p.key] = p.value;
}
}),
);
},
-});
+});
\ No newline at end of file
diff --git a/src/components/stores/journalStream.ts b/src/components/stores/journalStream.ts
index e13a9be..e02ca0e 100644
--- a/src/components/stores/journalStream.ts
+++ b/src/components/stores/journalStream.ts
@@ -44,7 +44,7 @@ export interface JournalStreamState {
myRole: "gm" | "player" | "observer";
brokerUrl: string | null;
players: Record;
- stats: Record;
+ variables: Record;
}
export interface SessionMeta {
@@ -96,7 +96,7 @@ const [state, setState] = createStore({
myRole: (persisted.myRole as "gm" | "player" | "observer") || "gm",
brokerUrl: persisted.brokerUrl,
players: {},
- stats: {},
+ variables: {},
});
if (initialName && !urlParams.playerName) syncUrlParam("player", initialName);
@@ -126,7 +126,7 @@ function runReducer(msg: StreamMessage): void {
function replayReducers(): void {
// Reset derived state
setState("revealedPaths", {});
- setState("stats", {});
+ setState("variables", {});
for (const msg of state.messages) {
runReducer(msg);
}
@@ -160,7 +160,7 @@ function handlePatch(patch: WorkerPatch): void {
syncUrlParam("player", patch.state.myName);
}
saveRole(patch.state.myRole);
- // Rebuild derived state (revealedPaths, stats) by replaying reducers
+ // Rebuild derived state (revealedPaths, variables) by replaying reducers
replayReducers();
break;
}
- 📊
+ 🔢
- {p.key} → {p.value}
+ {p.key} = {p.value}
);
@@ -52,11 +52,11 @@ registerMessageType