Zaid Humaimidi
6f3ce6f7c8
Replace the old Lisp-like array expression representation (["AND", ["PARAM", ...], ...]) with a class hierarchy rooted in an abstract Expression class (Literal, Parameter, Binary, Unary, FunctionCall, Conditional). This gives compile-time type safety to expression construction, evaluation, and pattern matching. Key changes: - New lib/common/expression.ts defines the class hierarchy with map/evaluate/toString methods - Rewrite parser as hand-rolled recursive descent, removing the parsimmon dependency - Extend Path with a colon separator to unify parameter identity and attributes into a single address space (e.g. "Device.WiFi.SSID.1.Name:writable"). The colon field tracks how many trailing segments are attribute qualifiers. PathSet rewritten with separate param/attr segment indexes - Flatten device attribute representation in the UI to colon-delimited keys mirroring the new path syntax
83 lines
2.4 KiB
TypeScript
83 lines
2.4 KiB
TypeScript
import { Attributes, ClosureComponent } from "mithril";
|
|
import memoize from "../../lib/common/memoize.ts";
|
|
import Expression from "../../lib/common/expression.ts";
|
|
import { m } from "../components.ts";
|
|
import { evaluateExpression, getTimestamp } from "../store.ts";
|
|
import { FlatDevice } from "../../lib/ui/db.ts";
|
|
|
|
const evaluateAttributes = memoize(
|
|
(
|
|
attrs: Record<string, Expression>,
|
|
obj: Record<string, unknown>,
|
|
now: number, // eslint-disable-line @typescript-eslint/no-unused-vars
|
|
): Attributes => {
|
|
const res: Attributes = {};
|
|
for (const [k, v] of Object.entries(attrs)) {
|
|
const vv = v.evaluate((e) => {
|
|
if (e instanceof Expression.Literal) return e;
|
|
else if (e instanceof Expression.FunctionCall) {
|
|
if (e.name === "ENCODEURICOMPONENT") {
|
|
const a = evaluateExpression(e.args[0], obj);
|
|
if (a instanceof Expression.Literal) {
|
|
if (a.value == null) return new Expression.Literal(null);
|
|
return new Expression.Literal(encodeURIComponent(a.value));
|
|
}
|
|
}
|
|
}
|
|
return e;
|
|
});
|
|
res[k] = evaluateExpression(vv, obj);
|
|
}
|
|
return res;
|
|
},
|
|
);
|
|
|
|
interface Attrs {
|
|
device: FlatDevice;
|
|
filter: Expression;
|
|
components: unknown;
|
|
}
|
|
|
|
const component: ClosureComponent<Attrs> = () => {
|
|
return {
|
|
view: (vnode) => {
|
|
const device = vnode.attrs.device;
|
|
if ("filter" in vnode.attrs) {
|
|
if (!evaluateExpression(vnode.attrs.filter, device || {})) return null;
|
|
}
|
|
|
|
const children = Object.values(vnode.attrs.components).map((c) => {
|
|
if (c instanceof Expression)
|
|
c = evaluateExpression(c, device || {}).value;
|
|
if (typeof c !== "object") return `${c}`;
|
|
const type = evaluateExpression(c["type"], device || {}).value;
|
|
if (!type) return null;
|
|
return m(type as string, c);
|
|
});
|
|
|
|
let el = vnode.attrs["element"];
|
|
|
|
if (el == null) return children;
|
|
|
|
let attrs: Attributes;
|
|
if (el instanceof Expression) {
|
|
el = evaluateExpression(el, device || {}).value;
|
|
} else if (typeof el === "object") {
|
|
if (el["attributes"] != null) {
|
|
attrs = evaluateAttributes(
|
|
el["attributes"],
|
|
device || {},
|
|
getTimestamp(),
|
|
);
|
|
}
|
|
|
|
el = evaluateExpression(el["tag"], device || {});
|
|
}
|
|
|
|
return m(el, attrs, children);
|
|
},
|
|
};
|
|
};
|
|
|
|
export default component;
|