@stll/template-conditions 0.6.2 → 0.6.4

package/dist/index.d.ts

@@ -1,9 +1,8 @@
+import { resolvePath } from "./path.js";
 import { CompareNode, CompareOp, Condition, ConditionNode, ConditionNode as ConditionNode$1, GroupNode, Operand, PredicateNode, PredicateOp, conditionHasFormula, conditionNodeSchema, conditionSchema, emptyCondition } from "@stll/conditions";
-//#region src/path.d.ts
-/** Resolve a dotted path like `company.name` against data. */
-export declare const resolvePath: (path: string, data: Record<string, unknown>) => unknown;
-//#endregion
 //#region src/parse.d.ts
+/** Maximum combined nesting of parentheses and unary negation. */
+export declare const MAX_CONDITION_NESTING = 256;
 /** Bare words the tokenizer reads as operators or literals; a data path can
  *  never be one of them. */
 export declare const CONDITION_RESERVED_WORDS: readonly ["and", "or", "not", "in", "is", "defined", "true", "false"];
@@ -349,7 +348,8 @@ type InvalidMarker = {
  */
 export declare const scanInvalidMarkers: (text: string) => InvalidMarker[];
 /** The loop alias the codemod (and the legacy-marker message) generates for a
- *  `{{#each path}}`: the singular of the last plain-word segment, else `item`. */
+ *  `{{#each path}}`: the singular of the last plain-word segment, else `item`.
+ *  A fresh `{% for %}` inserted by the Studio names its item by the same rule. */
 export declare const legacyLoopAlias: (path: string) => string;
 /** Translate an old-dialect condition expression to the Jinja surface:
  *  `!a` becomes `not a`, `a contains "x"` becomes `"x" in a`. */
@@ -621,4 +621,4 @@ export declare const MAX_CONDITION_DEPTH = 50;
  */
 export declare const evaluateCondition: (expression: string, data: Record<string, unknown>, namedConditions?: readonly NamedCondition[], _resolved?: ReadonlySet<string>, _depth?: number) => boolean;
 //#endregion
-export { type BlockDirectiveKind, type CompareNode, type CompareOp, type Condition, type ConditionNode, type ConditionTagOptions, type DateFormatStyle, type DeterministicFieldConfig, type DirectiveKind, type FieldDateFormat, type FilterArgument, type FilterCall, type FilterName, type ForOpenerOptions, type GroupNode, type InvalidMarker, type LoopProperty, type MarkerDefect, type MarkerDefectKind, type MarkerFieldConfig, type MarkerFieldInputType, type MarkerFieldLookup, type MarkerFieldSource, type MarkerFieldValidation, type MarkerForm, type MarkerLiteral, type MarkerMeta, type MarkerPrefix, type NumericFunctionName, type Operand, type PredicateNode, type PredicateOp, type RowBlockMarker, type RowBlockPair, type RowScope, type ScannedMarker, type UnwritableReason, conditionHasFormula, conditionNodeSchema, conditionSchema, emptyCondition };
+export { type BlockDirectiveKind, type CompareNode, type CompareOp, type Condition, type ConditionNode, type ConditionTagOptions, type DateFormatStyle, type DeterministicFieldConfig, type DirectiveKind, type FieldDateFormat, type FilterArgument, type FilterCall, type FilterName, type ForOpenerOptions, type GroupNode, type InvalidMarker, type LoopProperty, type MarkerDefect, type MarkerDefectKind, type MarkerFieldConfig, type MarkerFieldInputType, type MarkerFieldLookup, type MarkerFieldSource, type MarkerFieldValidation, type MarkerForm, type MarkerLiteral, type MarkerMeta, type MarkerPrefix, type NumericFunctionName, type Operand, type PredicateNode, type PredicateOp, type RowBlockMarker, type RowBlockPair, type RowScope, type ScannedMarker, type UnwritableReason, conditionHasFormula, conditionNodeSchema, conditionSchema, emptyCondition, resolvePath };

package/dist/index.js

@@ -1,33 +1,7 @@
+import { resolvePath } from "./path.js";
 import { conditionHasFormula, conditionNodeSchema, conditionSchema, emptyCondition, evaluateCondition as evaluateCondition$1 } from "@stll/conditions";
 import { Result, panic } from "better-result";
 import { Temporal } from "temporal-polyfill/full";
-//#region src/path.ts
-/**
-* Dotted-path resolution against a data record. Extracted from index.ts so both
-* the condition engine (index.ts) and the arithmetic evaluator (compute.ts) can
-* import it without a dependency cycle.
-*/
-/**
-* Narrow `unknown` to something a path segment can be read from.
-*
-* Unlike the same-named predicates that screen JSON payload shapes, this one
-* accepts arrays on purpose: a dotted path segment may be an array index
-* (`parties.1.name`), and rejecting arrays would silently resolve those to
-* `undefined`.
-*/
-const isNonNullObject = (v) => typeof v === "object" && v !== null;
-/** Resolve a dotted path like `company.name` against data. */
-const resolvePath = (path, data) => {
-	if (Object.hasOwn(data, path)) return data[path];
-	const parts = path.split(".");
-	let current = data;
-	for (const part of parts) {
-		if (!isNonNullObject(current)) return;
-		current = current[part];
-	}
-	return current;
-};
-//#endregion
 //#region src/compute.ts
 /**
 * Arithmetic evaluator for computed template fields.
@@ -191,6 +165,8 @@ const evaluateNumericExpression = (expression, data) => {
 };
 //#endregion
 //#region src/parse.ts
+/** Maximum combined nesting of parentheses and unary negation. */
+const MAX_CONDITION_NESTING = 256;
 const COMPARE_SYMBOL_TO_OP = {
 	"==": "eq",
 	"!=": "neq",
@@ -325,13 +301,16 @@ const parseCondition = (expression) => {
 	if (tokens.length === 0) return null;
 	let pos = 0;
 	const peek = () => tokens[pos];
-	const parseOr = () => {
-		const first = parseAnd();
+	const parseOr = (depth) => {
+		const first = parseAnd(depth);
+		if (first === null) return null;
 		if (peek()?.type !== "or") return first;
 		const children = [first];
 		while (peek()?.type === "or") {
 			pos += 1;
-			children.push(parseAnd());
+			const child = parseAnd(depth);
+			if (child === null) return null;
+			children.push(child);
 		}
 		return {
 			type: "group",
@@ -339,13 +318,16 @@ const parseCondition = (expression) => {
 			children
 		};
 	};
-	const parseAnd = () => {
-		const first = parseNot();
+	const parseAnd = (depth) => {
+		const first = parseNot(depth);
+		if (first === null) return null;
 		if (peek()?.type !== "and") return first;
 		const children = [first];
 		while (peek()?.type === "and") {
 			pos += 1;
-			children.push(parseNot());
+			const child = parseNot(depth);
+			if (child === null) return null;
+			children.push(child);
 		}
 		return {
 			type: "group",
@@ -353,22 +335,27 @@ const parseCondition = (expression) => {
 			children
 		};
 	};
-	const parseNot = () => {
+	const parseNot = (depth) => {
 		if (peek()?.type === "not") {
+			if (depth >= 256) return null;
 			pos += 1;
+			const child = parseNot(depth + 1);
+			if (child === null) return null;
 			return {
 				type: "group",
 				combinator: "and",
 				negated: true,
-				children: [parseNot()]
+				children: [child]
 			};
 		}
-		return parseComparison();
+		return parseComparison(depth);
 	};
-	const parseComparison = () => {
+	const parseComparison = (depth) => {
 		if (peek()?.type === "lparen") {
+			if (depth >= 256) return null;
 			pos += 1;
-			const inner = parseOr();
+			const inner = parseOr(depth + 1);
+			if (inner === null) return null;
 			if (peek()?.type === "rparen") pos += 1;
 			return inner;
 		}
@@ -437,7 +424,7 @@ const parseCondition = (expression) => {
 			right: operandFromToken(rightTok)
 		};
 	};
-	return parseOr();
+	return parseOr(0);
 };
 //#endregion
 //#region src/referenced-paths.ts
@@ -1183,7 +1170,8 @@ const singularize = (segment) => {
 	return segment;
 };
 /** The loop alias the codemod (and the legacy-marker message) generates for a
-*  `{{#each path}}`: the singular of the last plain-word segment, else `item`. */
+*  `{{#each path}}`: the singular of the last plain-word segment, else `item`.
+*  A fresh `{% for %}` inserted by the Studio names its item by the same rule. */
 const legacyLoopAlias = (path) => {
 	const segment = path.split(".").at(-1) ?? "";
 	if (!IDENTIFIER_RE.test(segment)) return "item";
@@ -1713,4 +1701,4 @@ const evaluateCondition = (expression, data, namedConditions, _resolved = /* @__
 	return evaluateCondition$1(node, makeResolver(data, namedConditions, _resolved, _depth));
 };
 //#endregion
-export { ARRAY_FILTER_NAMES, BLOCK_DIRECTIVE_KINDS, CONDITION_RESERVED_WORDS, DATE_FORMAT_EXAMPLE_ISO, DATE_FORMAT_STYLES, DIRECTIVE_KINDS, FILTER_NAMES, LOOP_PROPERTIES, MARKER_DEFECT_KINDS, MARKER_OUTPUT_BODY, MARKER_STATEMENT_BODY, MAX_CONDITION_DEPTH, NUMERIC_FUNCTION_NAMES, arrayFiltersFromFieldConfig, assertNever, blockDirectiveLinePattern, classifyMarker, classifyMarkerDefect, clauseSlotKey, clauseSlotPattern, conditionHasFormula, conditionNodeSchema, conditionSchema, detectRowBlockPair, emptyCondition, evaluateCondition, evaluateNumericExpression, filtersFromFieldConfig, formatDate, hasBlockDirectivePattern, hasNumberingPattern, isArrayFilterName, isBlockDirectiveKind, isClauseSlotName, isFieldPath, isSafeFieldPath, legacyLoopAlias, legacyMarkerReplacement, loopPattern, markerPattern, normalizeMarkerInner, numPattern, parseCondition, placeholderPattern, qualifyLoopPath, qualifyRowScopedPath, qualifyRowScopedPlaceholder, refPattern, referencedConditionPaths, renderConditionTag, renderDeterministicFieldValue, renderFilterChain, renderForOpener, renderValueMarker, replaceOutputMarkers, resolvePath, rowScopePaths, scanInvalidMarkers, scanMarkers, serializeCondition, substitutionKey, translateLegacyExpression, unwritableFilterValues, unwritableMarkerLiteral };
+export { ARRAY_FILTER_NAMES, BLOCK_DIRECTIVE_KINDS, CONDITION_RESERVED_WORDS, DATE_FORMAT_EXAMPLE_ISO, DATE_FORMAT_STYLES, DIRECTIVE_KINDS, FILTER_NAMES, LOOP_PROPERTIES, MARKER_DEFECT_KINDS, MARKER_OUTPUT_BODY, MARKER_STATEMENT_BODY, MAX_CONDITION_DEPTH, MAX_CONDITION_NESTING, NUMERIC_FUNCTION_NAMES, arrayFiltersFromFieldConfig, assertNever, blockDirectiveLinePattern, classifyMarker, classifyMarkerDefect, clauseSlotKey, clauseSlotPattern, conditionHasFormula, conditionNodeSchema, conditionSchema, detectRowBlockPair, emptyCondition, evaluateCondition, evaluateNumericExpression, filtersFromFieldConfig, formatDate, hasBlockDirectivePattern, hasNumberingPattern, isArrayFilterName, isBlockDirectiveKind, isClauseSlotName, isFieldPath, isSafeFieldPath, legacyLoopAlias, legacyMarkerReplacement, loopPattern, markerPattern, normalizeMarkerInner, numPattern, parseCondition, placeholderPattern, qualifyLoopPath, qualifyRowScopedPath, qualifyRowScopedPlaceholder, refPattern, referencedConditionPaths, renderConditionTag, renderDeterministicFieldValue, renderFilterChain, renderForOpener, renderValueMarker, replaceOutputMarkers, resolvePath, rowScopePaths, scanInvalidMarkers, scanMarkers, serializeCondition, substitutionKey, translateLegacyExpression, unwritableFilterValues, unwritableMarkerLiteral };

package/dist/path.d.ts

@@ -0,0 +1,17 @@
+//#region src/path.d.ts
+/**
+ * Dotted-path resolution against a data record. Extracted from index.ts so both
+ * the condition engine (index.ts) and the arithmetic evaluator (compute.ts) can
+ * import it without a dependency cycle.
+ */
+/**
+ * Narrow `unknown` to something a path segment can be read from.
+ *
+ * Accepts arrays and class instances. A dotted path segment may be an array index
+ * (`parties.1.name`), and rejecting arrays would silently resolve those to
+ * `undefined`.
+ */
+export declare const isNonNullObject: (v: unknown) => v is Record<string, unknown>;
+/** Resolve a dotted path like `company.name` against data. */
+export declare const resolvePath: (path: string, data: Record<string, unknown>) => unknown;
+//#endregion

package/dist/path.js

@@ -0,0 +1,27 @@
+//#region src/path.ts
+/**
+* Dotted-path resolution against a data record. Extracted from index.ts so both
+* the condition engine (index.ts) and the arithmetic evaluator (compute.ts) can
+* import it without a dependency cycle.
+*/
+/**
+* Narrow `unknown` to something a path segment can be read from.
+*
+* Accepts arrays and class instances. A dotted path segment may be an array index
+* (`parties.1.name`), and rejecting arrays would silently resolve those to
+* `undefined`.
+*/
+const isNonNullObject = (v) => typeof v === "object" && v !== null;
+/** Resolve a dotted path like `company.name` against data. */
+const resolvePath = (path, data) => {
+	if (Object.hasOwn(data, path)) return data[path];
+	const parts = path.split(".");
+	let current = data;
+	for (const part of parts) {
+		if (!isNonNullObject(current)) return;
+		current = current[part];
+	}
+	return current;
+};
+//#endregion
+export { isNonNullObject, resolvePath };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/template-conditions",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "A document-template marker and condition engine: {{...}} marker grammar, parse, compute, serialize, field values.",
   "keywords": [
     "condition",
@@ -31,6 +31,10 @@
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
+    },
+    "./path": {
+      "types": "./dist/path.d.ts",
+      "import": "./dist/path.js"
     }
   },
   "publishConfig": {
@@ -41,9 +45,9 @@
     "build": "tsdown",
     "pack:dry-run": "bun pm pack --dry-run",
     "test": "bun test",
-    "test:property": "bun test --preload @stll/property-testing/preload $(grep -rlF 'fc.assert' src --include='*.test.ts')",
+    "test:property": "bun test --preload @stll/property-testing/preload $(grep -rlE 'fc\\.assert|assertProperty' src --include='*.test.ts')",
     "typecheck": "bun ../../packages/scripts/src/tsc-native.ts --noEmit",
-    "lint": "cd ../.. && bun --bun oxlint -c oxlint.config.ts --report-unused-disable-directives-severity=error --type-aware packages/template-conditions",
+    "lint": "cd ../.. && bun --bun oxlint -c oxlint.config.ts --report-unused-disable-directives-severity=error --type-aware --type-check packages/template-conditions",
     "lint:fix": "cd ../.. && bun --bun oxlint -c oxlint.config.ts --type-aware --fix packages/template-conditions",
     "format": "bun ../../scripts/run-oxfmt.ts .",
     "prepack": "bun run build"
@@ -57,7 +61,7 @@
     "@stll/property-testing": "0.0.0",
     "@stll/typescript-config": "0.0.0",
     "bun-types": "1.4.2",
-    "fast-check": "^4.10.1",
+    "fast-check": "^4.10.2",
     "tsdown": "0.23.0"
   },
   "main": "./dist/index.js",