@jarenjs/forms 0.86.0 → 0.89.0

package/README.md

@@ -451,6 +451,8 @@ paths in its query documents (plus its own location). That over-approximates
 every read, and soundly: the only way into the document is such a path, and a
 `$let`/`$for` variable can only hold what one of them produced.
 
+Nested filters contribute their root reads too. Replacing the compiled rule set
+invalidates the memo's results and template keys, even when the data is unchanged.
 The memo diffs the previous document against the new one — reference-equal
 subtrees are skipped whole, so an immutable edit costs O(change). A host that
 already knows what it wrote can skip even that with `memo.touch(pointer)`,

package/dist/types/rules.d.ts

@@ -127,6 +127,7 @@ export declare function evaluateFormRules(compiled: CompiledRules, data: any, ca
 export type RuleMemo = {
     data: any;
     catalog: any;
+    compiled?: CompiledRules | null;
     results: Record<string, RuleResult> | null;
     keys: string[][] | null;
     /**
@@ -144,6 +145,7 @@ export type RuleMemo = {
  * @typedef {object} RuleMemo
  * @property {any} data
  * @property {any} catalog
+ * @property {CompiledRules|null} [compiled]
  * @property {Record<string, RuleResult>|null} results
  * @property {string[][]|null} keys
  * @property {string[]|null} touched - Pointers declared through
@@ -152,8 +154,8 @@ export type RuleMemo = {
  */
 /**
  * Create an empty rule memo. One per form session: it is bound to the
- * document lineage it has seen, so sharing it between two forms would
- * diff unrelated documents (correct, but pointlessly expensive).
+ * document lineage and compiled rules it has seen. Switching compiled
+ * rules rebuilds the memo, including the keys written by item templates.
  *
  * `memo.touch(pointer)` declares a write before the next evaluation.
  * It is an optimization AND a promise: the evaluation then trusts the

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jarenjs/forms",
   "private": false,
-  "version": "0.86.0",
+  "version": "0.89.0",
   "type": "module",
   "main": "./src/index.js",
   "types": "./dist/types/index.d.ts",
@@ -47,9 +47,9 @@
     "prepack": "npm run build:types"
   },
   "dependencies": {
-    "@jarenjs/core": "^0.86.0",
-    "@jarenjs/formats": "^0.86.0",
-    "@jarenjs/json": "^0.86.0",
-    "@jarenjs/validate": "^0.86.0"
+    "@jarenjs/core": "^0.89.0",
+    "@jarenjs/formats": "^0.89.0",
+    "@jarenjs/json": "^0.89.0",
+    "@jarenjs/validate": "^0.89.0"
   }
 }

package/src/deps.js

@@ -137,7 +137,12 @@ function addPath(source, out) {
   catch {
     return; // a variable-rooted path, or not a path at all
   }
-  out.add(prefixOf(ast.segments));
+  collectPathQueries(ast, out);
+}
+
+/** Visit every nested filter, including those on a relative query. */
+function collectPathQueries(ast, out) {
+  if (ast.relative !== true) out.add(prefixOf(ast.segments));
   for (const segment of ast.segments) {
     for (const selector of segment.selectors) {
       if (selector.kind === 'filter') collectFilterQueries(selector.expr, out);
@@ -168,8 +173,7 @@ function prefixOf(segments) {
 function collectFilterQueries(node, out) {
   if (node === null || typeof node !== 'object') return;
   if (node.query !== undefined && Array.isArray(node.query.segments)) {
-    if (node.query.relative !== true) out.add(prefixOf(node.query.segments));
-    else collectFilterQueries(node.query, out);
+    collectPathQueries(node.query, out);
   }
   for (const key of ['operands', 'operand', 'left', 'right', 'args', 'expr']) {
     const child = node[key];

package/src/rules.js

@@ -416,8 +416,8 @@ function expandItemRule(rule, data, node, partIndex, pointer, ext, results, cata
  */
 export function evaluateFormRules(compiled, data, catalog = undefined, memo = undefined) {
   const rules = compiled.rules;
-  // a catalog swap (a locale switch) invalidates every rendered message
-  const reuse = memo !== undefined && memo.results !== null && memo.catalog === catalog;
+  // A rule-set or catalog swap invalidates the entire result map and its keys.
+  const reuse = memo !== undefined && memo.results !== null && memo.catalog === catalog && memo.compiled === compiled;
   // A declared write is taken at its word; otherwise the documents are
   // diffed. Diffing is the honest default — it needs nothing from the
   // caller — but it must scan the members of every container that
@@ -473,6 +473,7 @@ export function evaluateFormRules(compiled, data, catalog = undefined, memo = un
   if (memo !== undefined) {
     memo.data = data;
     memo.catalog = catalog;
+    memo.compiled = compiled;
     memo.results = results;
     memo.keys = keys;
   }
@@ -498,6 +499,7 @@ function evaluateRule(rule, data, ext, results, catalog, written) {
  * @typedef {object} RuleMemo
  * @property {any} data
  * @property {any} catalog
+ * @property {CompiledRules|null} [compiled]
  * @property {Record<string, RuleResult>|null} results
  * @property {string[][]|null} keys
  * @property {string[]|null} touched - Pointers declared through
@@ -507,8 +509,8 @@ function evaluateRule(rule, data, ext, results, catalog, written) {
 
 /**
  * Create an empty rule memo. One per form session: it is bound to the
- * document lineage it has seen, so sharing it between two forms would
- * diff unrelated documents (correct, but pointlessly expensive).
+ * document lineage and compiled rules it has seen. Switching compiled
+ * rules rebuilds the memo, including the keys written by item templates.
  *
  * `memo.touch(pointer)` declares a write before the next evaluation.
  * It is an optimization AND a promise: the evaluation then trusts the
@@ -526,6 +528,7 @@ export function createRuleMemo() {
   const memo = {
     data: undefined,
     catalog: undefined,
+    compiled: null,
     results: null,
     keys: null,
     touched: null,