@protobase/layout 0.66.5 → 0.66.7

package/dist/condition.d.ts

@@ -11,7 +11,7 @@ export type ConditionParse = ({
   message: string;
 };
 export declare const parseCondition: (source: string) => ConditionParse;
-/** True when the condition holds for `values`, keyed by the dotted paths in `condition.paths`. <gap>A condition cannot call functions, as they are not supported.</gap> */
+/** True when the condition holds for `values`, keyed by the dotted paths in `condition.paths`. <gap>A condition cannot call functions other than isNull and in, such as now(), because their evaluation is not implemented.</gap> */
 export declare const evaluateCondition: (condition: Condition, values: Record<string, unknown>) => boolean;
 /** The resource a path counts (`billing_profiles.count`), when it is not a field of the record around it. */
 export declare const countedResource: (path: string, isField: (name: string) => boolean) => string | undefined;

package/dist/condition.js

@@ -15,6 +15,46 @@ const folded = (node) => {
 	if (typeof node !== "object" || node === null) return node;
 	return Object.fromEntries(Object.entries(node).map(([key, value]) => [key, folded(value)]));
 };
+const literalKinds = /* @__PURE__ */ new Set([
+	"string",
+	"number",
+	"boolean",
+	"duration",
+	"timestamp"
+]);
+const isLiteral = (node) => literalKinds.has(node.kind);
+const expandedCall = (node) => {
+	const [first, ...rest] = node.args;
+	if (!first || !isMember(first)) return;
+	if (node.name === "isNull" && rest.length === 0) return {
+		kind: "not",
+		arg: {
+			kind: "present",
+			left: first,
+			span: node.span
+		},
+		span: node.span
+	};
+	if (node.name !== "in" || rest.length === 0 || !rest.every(isLiteral)) return;
+	return {
+		kind: "or",
+		args: rest.map((value) => ({
+			kind: "compare",
+			op: "=",
+			left: first,
+			right: value,
+			span: node.span
+		})),
+		span: node.span
+	};
+};
+const expanded = (node) => {
+	if (Array.isArray(node)) return node.map(expanded);
+	if (typeof node !== "object" || node === null) return node;
+	const call = node.kind === "call" ? expandedCall(node) : void 0;
+	if (call) return call;
+	return Object.fromEntries(Object.entries(node).map(([key, value]) => [key, expanded(value)]));
+};
 const parseCondition = (source) => {
 	const parsed = parseFilter(source);
 	if (!parsed.ok) return {
@@ -31,8 +71,8 @@ const parseCondition = (source) => {
 		paths: [...new Set(memberPaths(parsed.ast))]
 	};
 };
-/** True when the condition holds for `values`, keyed by the dotted paths in `condition.paths`. <gap>A condition cannot call functions, as they are not supported.</gap> */
-const evaluateCondition = (condition, values) => condition.ast !== void 0 && evaluateFilter(folded(condition.ast), values);
+/** True when the condition holds for `values`, keyed by the dotted paths in `condition.paths`. <gap>A condition cannot call functions other than isNull and in, such as now(), because their evaluation is not implemented.</gap> */
+const evaluateCondition = (condition, values) => condition.ast !== void 0 && evaluateFilter(folded(expanded(condition.ast)), values);
 /** The resource a path counts (`billing_profiles.count`), when it is not a field of the record around it. */
 const countedResource = (path, isField) => {
 	const [first, second, ...rest] = path.split(".");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/layout",
-  "version": "0.66.5",
+  "version": "0.66.7",
   "description": "Composed pages for Protobase, written as JSX that compiles to plain data, with its JSX runtime.",
   "license": "Apache-2.0",
   "repository": {
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@protobase/schema": "0.66.5",
+    "@protobase/schema": "0.66.7",
     "aip-parsers": "^1.0.0"
   }
 }