@rippling/rippling-sdk 0.2.0-alpha.108 → 0.2.0-alpha.109

package/lib/charts/evaluate.js

@@ -1,54 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.evaluate = evaluate;
-const builders_1 = require("./builders.js");
 const errors_1 = require("./errors.js");
-const guards_1 = require("./guards.js");
-const types_1 = require("./types.js");
+const schema_1 = require("./schema.js");
 /**
  * Resolve a rule to a value against `ctx`. Accepts a `{$rule}` placeholder or a
- * bare tree. A malformed or unknown node throws a `ChartRuleError` (never a
+ * bare node. A malformed or unknown node throws a `ChartRuleError` (never a
  * native `TypeError`), so a caller reading an untrusted, deserialized rule can
  * catch every failure with one type. When the rule is a colour placeholder, the
  * result is checked to be a colour (`string | null`) — a rule that resolves to a
  * number or boolean is a `RuleTypeError`, not something the renderer paints.
  *
- * Pure: the only inputs are the node and the context. No clock, no randomness,
- * no I/O — which is what makes it safe to run on an untrusted, user-edited tree
- * and identical across the renderer, the panel readout, and a test. A tree
- * nested past `MAX_RULE_DEPTH` throws `RuleDepthError` rather than overflowing.
+ * Pure and non-recursive: the only inputs are the validated flat rule and the
+ * context. No clock, randomness, callbacks, or I/O.
  */
 function evaluate(rule, ctx) {
-    if ((0, builders_1.isRulePlaceholder)(rule)) {
-        return coerceForChannel(rule.channel, visit(rule.$rule, ctx, 0));
+    const parsedRule = (0, schema_1.parseChartRule)(rule);
+    if ('$rule' in parsedRule) {
+        return coerceForChannel(parsedRule.channel, visit(parsedRule.$rule, ctx));
     }
-    return visit(rule, ctx, 0);
+    return visit(parsedRule, ctx);
 }
-function visit(node, ctx, depth) {
-    if (depth > types_1.MAX_RULE_DEPTH) {
-        throw new errors_1.RuleDepthError(types_1.MAX_RULE_DEPTH);
-    }
-    (0, guards_1.assertRuleNode)(node);
-    const next = depth + 1;
+function visit(node, ctx) {
     switch (node.kind) {
         case 'value':
             return ctx.value;
         case 'literal':
-            return (0, guards_1.literalValue)(node);
+            return node.value;
         case 'equals':
-            return visit(node.left, ctx, next) === visit(node.right, ctx, next);
+            return operand(node.left, ctx) === operand(node.right, ctx);
         case 'isNot':
-            return visit(node.left, ctx, next) !== visit(node.right, ctx, next);
+            return operand(node.left, ctx) !== operand(node.right, ctx);
         case 'lessThan':
-            return num(visit(node.left, ctx, next)) < num(visit(node.right, ctx, next));
+            return numericOperand(node.left, ctx) < numericOperand(node.right, ctx);
         case 'greaterThan':
-            return num(visit(node.left, ctx, next)) > num(visit(node.right, ctx, next));
+            return numericOperand(node.left, ctx) > numericOperand(node.right, ctx);
         case 'lessOrEqual':
-            return num(visit(node.left, ctx, next)) <= num(visit(node.right, ctx, next));
+            return numericOperand(node.left, ctx) <= numericOperand(node.right, ctx);
         case 'greaterOrEqual':
-            return num(visit(node.left, ctx, next)) >= num(visit(node.right, ctx, next));
+            return numericOperand(node.left, ctx) >= numericOperand(node.right, ctx);
         case 'ifElse':
-            return bool(visit(node.cond, ctx, next)) ? visit(node.then, ctx, next) : visit(node.else, ctx, next);
+            return visit(node.cond, ctx) ? node.then.value : node.else.value;
         default:
             return unreachable(node);
     }
@@ -56,17 +48,11 @@ function visit(node, ctx, depth) {
 /* -------------------------------------------------------------------------- */
 /* Coercions — narrow a RuleValue, or throw a typed error.                      */
 /* -------------------------------------------------------------------------- */
-function num(value) {
-    if (typeof value === 'number') {
-        return value;
-    }
-    throw new errors_1.RuleTypeError(`expected a number, got ${typeName(value)}`);
+function operand(node, ctx) {
+    return node.kind === 'value' ? ctx.value : node.value;
 }
-function bool(value) {
-    if (typeof value === 'boolean') {
-        return value;
-    }
-    throw new errors_1.RuleTypeError(`expected a boolean, got ${typeName(value)}`);
+function numericOperand(node, ctx) {
+    return node.kind === 'value' ? ctx.value : node.value;
 }
 /** A colour channel must resolve to a colour string, or null for "no override". */
 function asColor(value) {

package/lib/charts/evaluate.js.map

@@ -1 +1 @@
-{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/lib/charts/evaluate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/lib/charts/evaluate.ts"],"names":[],"mappings":"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"}

package/lib/charts/evaluate.mjs

@@ -1,51 +1,43 @@
-import { isRulePlaceholder } from "./builders.mjs";
-import { MalformedRuleError, RuleDepthError, RuleTypeError, UnknownNodeError } from "./errors.mjs";
-import { assertRuleNode, literalValue } from "./guards.mjs";
-import { MAX_RULE_DEPTH, } from "./types.mjs";
+import { MalformedRuleError, RuleTypeError, UnknownNodeError } from "./errors.mjs";
+import { parseChartRule } from "./schema.mjs";
 /**
  * Resolve a rule to a value against `ctx`. Accepts a `{$rule}` placeholder or a
- * bare tree. A malformed or unknown node throws a `ChartRuleError` (never a
+ * bare node. A malformed or unknown node throws a `ChartRuleError` (never a
  * native `TypeError`), so a caller reading an untrusted, deserialized rule can
  * catch every failure with one type. When the rule is a colour placeholder, the
  * result is checked to be a colour (`string | null`) — a rule that resolves to a
  * number or boolean is a `RuleTypeError`, not something the renderer paints.
  *
- * Pure: the only inputs are the node and the context. No clock, no randomness,
- * no I/O — which is what makes it safe to run on an untrusted, user-edited tree
- * and identical across the renderer, the panel readout, and a test. A tree
- * nested past `MAX_RULE_DEPTH` throws `RuleDepthError` rather than overflowing.
+ * Pure and non-recursive: the only inputs are the validated flat rule and the
+ * context. No clock, randomness, callbacks, or I/O.
  */
 export function evaluate(rule, ctx) {
-    if (isRulePlaceholder(rule)) {
-        return coerceForChannel(rule.channel, visit(rule.$rule, ctx, 0));
+    const parsedRule = parseChartRule(rule);
+    if ('$rule' in parsedRule) {
+        return coerceForChannel(parsedRule.channel, visit(parsedRule.$rule, ctx));
     }
-    return visit(rule, ctx, 0);
+    return visit(parsedRule, ctx);
 }
-function visit(node, ctx, depth) {
-    if (depth > MAX_RULE_DEPTH) {
-        throw new RuleDepthError(MAX_RULE_DEPTH);
-    }
-    assertRuleNode(node);
-    const next = depth + 1;
+function visit(node, ctx) {
     switch (node.kind) {
         case 'value':
             return ctx.value;
         case 'literal':
-            return literalValue(node);
+            return node.value;
         case 'equals':
-            return visit(node.left, ctx, next) === visit(node.right, ctx, next);
+            return operand(node.left, ctx) === operand(node.right, ctx);
         case 'isNot':
-            return visit(node.left, ctx, next) !== visit(node.right, ctx, next);
+            return operand(node.left, ctx) !== operand(node.right, ctx);
         case 'lessThan':
-            return num(visit(node.left, ctx, next)) < num(visit(node.right, ctx, next));
+            return numericOperand(node.left, ctx) < numericOperand(node.right, ctx);
         case 'greaterThan':
-            return num(visit(node.left, ctx, next)) > num(visit(node.right, ctx, next));
+            return numericOperand(node.left, ctx) > numericOperand(node.right, ctx);
         case 'lessOrEqual':
-            return num(visit(node.left, ctx, next)) <= num(visit(node.right, ctx, next));
+            return numericOperand(node.left, ctx) <= numericOperand(node.right, ctx);
         case 'greaterOrEqual':
-            return num(visit(node.left, ctx, next)) >= num(visit(node.right, ctx, next));
+            return numericOperand(node.left, ctx) >= numericOperand(node.right, ctx);
         case 'ifElse':
-            return bool(visit(node.cond, ctx, next)) ? visit(node.then, ctx, next) : visit(node.else, ctx, next);
+            return visit(node.cond, ctx) ? node.then.value : node.else.value;
         default:
             return unreachable(node);
     }
@@ -53,17 +45,11 @@ function visit(node, ctx, depth) {
 /* -------------------------------------------------------------------------- */
 /* Coercions — narrow a RuleValue, or throw a typed error.                      */
 /* -------------------------------------------------------------------------- */
-function num(value) {
-    if (typeof value === 'number') {
-        return value;
-    }
-    throw new RuleTypeError(`expected a number, got ${typeName(value)}`);
+function operand(node, ctx) {
+    return node.kind === 'value' ? ctx.value : node.value;
 }
-function bool(value) {
-    if (typeof value === 'boolean') {
-        return value;
-    }
-    throw new RuleTypeError(`expected a boolean, got ${typeName(value)}`);
+function numericOperand(node, ctx) {
+    return node.kind === 'value' ? ctx.value : node.value;
 }
 /** A colour channel must resolve to a colour string, or null for "no override". */
 function asColor(value) {

package/lib/charts/evaluate.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"evaluate.mjs","sourceRoot":"","sources":["../../src/lib/charts/evaluate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evaluate.mjs","sourceRoot":"","sources":["../../src/lib/charts/evaluate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,gBAAgB,EAAE,qBAAiB;AAC/E,OAAO,EAAE,cAAc,EAAE,qBAAiB;AAU1C;;;;;;;;;;GAUG;AACH,MAAM,UAAU,QAAQ,CAAC,IAAa,EAAE,GAAgB;IACtD,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;QAC1B,OAAO,gBAAgB,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,KAAK,CAAC,IAAc,EAAE,GAAgB;IAC7C,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,OAAO;YACV,OAAO,GAAG,CAAC,KAAK,CAAC;QACnB,KAAK,SAAS;YACZ,OAAO,IAAI,CAAC,KAAK,CAAC;QAEpB,KAAK,QAAQ;YACX,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC9D,KAAK,OAAO;YACV,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC9D,KAAK,UAAU;YACb,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC1E,KAAK,aAAa;YAChB,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC1E,KAAK,aAAa;YAChB,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC3E,KAAK,gBAAgB;YACnB,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAE3E,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAEnE;YACE,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;AACH,CAAC;AAED,gFAAgF;AAChF,kFAAkF;AAClF,gFAAgF;AAEhF,SAAS,OAAO,CAAC,IAA2B,EAAE,GAAgB;IAC5D,OAAO,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;AACxD,CAAC;AAED,SAAS,cAAc,CAAC,IAAwB,EAAE,GAAgB;IAChE,OAAO,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;AACxD,CAAC;AAED,mFAAmF;AACnF,SAAS,OAAO,CAAC,KAAgB;IAC/B,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,IAAI,aAAa,CAAC,8DAA8D,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AAC3G,CAAC;AAED;;;;;;GAMG;AACH,SAAS,gBAAgB,CAAC,OAAoB,EAAE,KAAgB;IAC9D,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,OAAO;YACV,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC;QACxB;YACE,MAAM,IAAI,kBAAkB,CAAC,kDAAkD,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACtG,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,KAAgB;IAChC,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC;AAChD,CAAC;AAED,SAAS,WAAW,CAAC,IAAW;IAC9B,MAAM,IAAI,gBAAgB,CAAE,IAA0B,CAAC,IAAI,CAAC,CAAC;AAC/D,CAAC"}

package/lib/charts/schema.d.mts

@@ -1,101 +1,12 @@
-/** Stable identifier for the published contract, versioned by the tag. */
+import { type BaseIssue, type GenericSchema } from 'valibot';
+import { type ParsedRule, type Rule } from "./types.mjs";
+/** @deprecated Use `CHART_RULE_CONTRACT_VERSION` to identify the executable contract. */
 export declare const CHART_RULE_SCHEMA_ID: string;
 /**
- * JSON Schema (2020-12) for the `{$rule}` placeholder and its closed node set.
- *
- * This is the contract. A consumer that keeps its own rule evaluator (rather
- * than importing `evaluate`) can validate against this so the two never drift —
- * every kind and operand shape the builders can emit is described here.
+ * Runtime schema for either a bare rule node or a chart-option placeholder.
+ * Persisted and agent-authored JSON crosses this boundary as `unknown`.
  */
-export declare const chartRuleSchema: {
-    readonly $schema: "https://json-schema.org/draft/2020-12/schema";
-    readonly $id: string;
-    readonly title: "Chart rule placeholder";
-    readonly description: "A rule tree the chart agent emits into a chart option, marked with $rule.";
-    readonly type: "object";
-    readonly required: readonly ["$rule", "channel"];
-    readonly additionalProperties: false;
-    readonly properties: {
-        readonly $rule: {
-            readonly $ref: "#/$defs/ifElse";
-        };
-        readonly channel: {
-            readonly const: "color";
-        };
-    };
-    readonly $defs: {
-        readonly scalar: {
-            readonly type: readonly ["number", "string", "boolean", "null"];
-        };
-        readonly node: {
-            readonly oneOf: readonly [{
-                readonly $ref: "#/$defs/ref";
-            }, {
-                readonly $ref: "#/$defs/literal";
-            }, {
-                readonly $ref: "#/$defs/comparison";
-            }, {
-                readonly $ref: "#/$defs/ifElse";
-            }];
-        };
-        readonly ref: {
-            readonly type: "object";
-            readonly required: readonly ["kind"];
-            readonly additionalProperties: false;
-            readonly properties: {
-                readonly kind: {
-                    readonly const: "value";
-                };
-            };
-        };
-        readonly literal: {
-            readonly type: "object";
-            readonly required: readonly ["kind", "value"];
-            readonly additionalProperties: false;
-            readonly properties: {
-                readonly kind: {
-                    readonly const: "literal";
-                };
-                readonly value: {
-                    readonly $ref: "#/$defs/scalar";
-                };
-            };
-        };
-        readonly comparison: {
-            readonly type: "object";
-            readonly required: readonly ["kind", "left", "right"];
-            readonly additionalProperties: false;
-            readonly properties: {
-                readonly kind: {
-                    readonly enum: readonly ["equals", "isNot", "lessThan", "greaterThan", "lessOrEqual", "greaterOrEqual"];
-                };
-                readonly left: {
-                    readonly $ref: "#/$defs/node";
-                };
-                readonly right: {
-                    readonly $ref: "#/$defs/node";
-                };
-            };
-        };
-        readonly ifElse: {
-            readonly type: "object";
-            readonly required: readonly ["kind", "cond", "then", "else"];
-            readonly additionalProperties: false;
-            readonly properties: {
-                readonly kind: {
-                    readonly const: "ifElse";
-                };
-                readonly cond: {
-                    readonly $ref: "#/$defs/node";
-                };
-                readonly then: {
-                    readonly $ref: "#/$defs/node";
-                };
-                readonly else: {
-                    readonly $ref: "#/$defs/node";
-                };
-            };
-        };
-    };
-};
+export declare const chartRuleSchema: GenericSchema<unknown, Rule, BaseIssue<unknown>>;
+/** Parse untrusted chart-rule JSON and return an immutable validated clone. */
+export declare function parseChartRule(input: unknown): ParsedRule;
 //# sourceMappingURL=schema.d.mts.map

package/lib/charts/schema.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.mts","sourceRoot":"","sources":["../../src/lib/charts/schema.ts"],"names":[],"mappings":"AAEA,0EAA0E;AAC1E,eAAO,MAAM,oBAAoB,QAAqE,CAAC;AAEvG;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2DlB,CAAC"}
+{"version":3,"file":"schema.d.mts","sourceRoot":"","sources":["../../src/lib/charts/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,aAAa,EAanB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAA+B,KAAK,UAAU,EAAE,KAAK,IAAI,EAA8B,oBAAgB;AAoB9G,yFAAyF;AACzF,eAAO,MAAM,oBAAoB,QAAqE,CAAC;AAiEvG;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAG3E,CAAC;AAEH,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,CAUzD"}

package/lib/charts/schema.d.ts

@@ -1,101 +1,12 @@
-/** Stable identifier for the published contract, versioned by the tag. */
+import { type BaseIssue, type GenericSchema } from 'valibot';
+import { type ParsedRule, type Rule } from "./types.js";
+/** @deprecated Use `CHART_RULE_CONTRACT_VERSION` to identify the executable contract. */
 export declare const CHART_RULE_SCHEMA_ID: string;
 /**
- * JSON Schema (2020-12) for the `{$rule}` placeholder and its closed node set.
- *
- * This is the contract. A consumer that keeps its own rule evaluator (rather
- * than importing `evaluate`) can validate against this so the two never drift —
- * every kind and operand shape the builders can emit is described here.
+ * Runtime schema for either a bare rule node or a chart-option placeholder.
+ * Persisted and agent-authored JSON crosses this boundary as `unknown`.
  */
-export declare const chartRuleSchema: {
-    readonly $schema: "https://json-schema.org/draft/2020-12/schema";
-    readonly $id: string;
-    readonly title: "Chart rule placeholder";
-    readonly description: "A rule tree the chart agent emits into a chart option, marked with $rule.";
-    readonly type: "object";
-    readonly required: readonly ["$rule", "channel"];
-    readonly additionalProperties: false;
-    readonly properties: {
-        readonly $rule: {
-            readonly $ref: "#/$defs/ifElse";
-        };
-        readonly channel: {
-            readonly const: "color";
-        };
-    };
-    readonly $defs: {
-        readonly scalar: {
-            readonly type: readonly ["number", "string", "boolean", "null"];
-        };
-        readonly node: {
-            readonly oneOf: readonly [{
-                readonly $ref: "#/$defs/ref";
-            }, {
-                readonly $ref: "#/$defs/literal";
-            }, {
-                readonly $ref: "#/$defs/comparison";
-            }, {
-                readonly $ref: "#/$defs/ifElse";
-            }];
-        };
-        readonly ref: {
-            readonly type: "object";
-            readonly required: readonly ["kind"];
-            readonly additionalProperties: false;
-            readonly properties: {
-                readonly kind: {
-                    readonly const: "value";
-                };
-            };
-        };
-        readonly literal: {
-            readonly type: "object";
-            readonly required: readonly ["kind", "value"];
-            readonly additionalProperties: false;
-            readonly properties: {
-                readonly kind: {
-                    readonly const: "literal";
-                };
-                readonly value: {
-                    readonly $ref: "#/$defs/scalar";
-                };
-            };
-        };
-        readonly comparison: {
-            readonly type: "object";
-            readonly required: readonly ["kind", "left", "right"];
-            readonly additionalProperties: false;
-            readonly properties: {
-                readonly kind: {
-                    readonly enum: readonly ["equals", "isNot", "lessThan", "greaterThan", "lessOrEqual", "greaterOrEqual"];
-                };
-                readonly left: {
-                    readonly $ref: "#/$defs/node";
-                };
-                readonly right: {
-                    readonly $ref: "#/$defs/node";
-                };
-            };
-        };
-        readonly ifElse: {
-            readonly type: "object";
-            readonly required: readonly ["kind", "cond", "then", "else"];
-            readonly additionalProperties: false;
-            readonly properties: {
-                readonly kind: {
-                    readonly const: "ifElse";
-                };
-                readonly cond: {
-                    readonly $ref: "#/$defs/node";
-                };
-                readonly then: {
-                    readonly $ref: "#/$defs/node";
-                };
-                readonly else: {
-                    readonly $ref: "#/$defs/node";
-                };
-            };
-        };
-    };
-};
+export declare const chartRuleSchema: GenericSchema<unknown, Rule, BaseIssue<unknown>>;
+/** Parse untrusted chart-rule JSON and return an immutable validated clone. */
+export declare function parseChartRule(input: unknown): ParsedRule;
 //# sourceMappingURL=schema.d.ts.map

package/lib/charts/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/lib/charts/schema.ts"],"names":[],"mappings":"AAEA,0EAA0E;AAC1E,eAAO,MAAM,oBAAoB,QAAqE,CAAC;AAEvG;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2DlB,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/lib/charts/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,aAAa,EAanB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAA+B,KAAK,UAAU,EAAE,KAAK,IAAI,EAA8B,mBAAgB;AAoB9G,yFAAyF;AACzF,eAAO,MAAM,oBAAoB,QAAqE,CAAC;AAiEvG;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAG3E,CAAC;AAEH,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,CAUzD"}