@stll/template-conditions 0.6.0 → 0.6.3

package/dist/index.d.ts

@@ -4,6 +4,8 @@ import { CompareNode, CompareOp, Condition, ConditionNode, ConditionNode as Cond
 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 +351,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`. */

package/dist/index.js

@@ -15,14 +15,14 @@ import { Temporal } from "temporal-polyfill/full";
 * (`parties.1.name`), and rejecting arrays would silently resolve those to
 * `undefined`.
 */
-const isRecord = (v) => typeof v === "object" && v !== null;
+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 (!isRecord(current)) return;
+		if (!isNonNullObject(current)) return;
 		current = current[part];
 	}
 	return current;
@@ -55,6 +55,14 @@ const NUMERIC_FUNCTION_NAMES = Object.freeze([
 	"ceil"
 ]);
 const isNumericFunctionName = (name) => NUMERIC_FUNCTION_NAMES.some((candidate) => candidate === name);
+const OPERATORS = [
+	"+",
+	"-",
+	"*",
+	"/",
+	"%"
+];
+const isOperator = (value) => OPERATORS.some((candidate) => candidate === value);
 const TOKEN_RE = /(?<numeric>[0-9][0-9_]*(?:\.[0-9]+)?)|(?<ident>[\p{L}_][\p{L}\p{N}_.]*(?:-[\p{L}\p{N}_.]+)*)|(?<punct>[+\-*/%(),])|(?<invalid>\S)/gu;
 const PRECEDENCE = {
 	"+": 1,
@@ -79,7 +87,7 @@ const tokenize$1 = (expression) => {
 		else if (punct === "(") tokens.push({ t: "lp" });
 		else if (punct === ")") tokens.push({ t: "rp" });
 		else if (punct === ",") tokens.push({ t: "comma" });
-		else if (punct !== void 0) tokens.push({
+		else if (punct !== void 0 && isOperator(punct)) tokens.push({
 			t: "op",
 			v: punct
 		});
@@ -183,6 +191,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",
@@ -208,7 +218,7 @@ const RESERVED_WORDS = new Set(CONDITION_RESERVED_WORDS);
 const isConditionKeyword = (raw) => raw !== "true" && raw !== "false" && RESERVED_WORDS.has(raw);
 /** The keyword alternation of the tokenizer, derived from the same list. */
 const KEYWORD_PATTERN = CONDITION_RESERVED_WORDS.filter(isConditionKeyword).map((word) => String.raw`${word}\b`).join("|");
-const COMPARE_SYMBOL_PATTERN = Object.keys(COMPARE_SYMBOL_TO_OP).sort((left, right) => right.length - left.length).map(escapeRegexLiteral).join("|");
+const COMPARE_SYMBOL_PATTERN = Object.keys(COMPARE_SYMBOL_TO_OP).toSorted((left, right) => right.length - left.length).map(escapeRegexLiteral).join("|");
 const NON_STRING_TOKEN_RE = new RegExp(String.raw`(?<token>${COMPARE_SYMBOL_PATTERN}|${KEYWORD_PATTERN}|[()]|-?\d[\p{N}_.]*|[\p{L}\p{N}_.]+(?:-[\p{L}\p{N}_.]+)*)`, "uy");
 const STARTS_WITH_DIGIT_RE = /^-?\d/u;
 const isCompareSymbol = (raw) => Object.hasOwn(COMPARE_SYMBOL_TO_OP, raw);
@@ -317,13 +327,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",
@@ -331,13 +344,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",
@@ -345,22 +361,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;
 		}
@@ -429,7 +450,7 @@ const parseCondition = (expression) => {
 			right: operandFromToken(rightTok)
 		};
 	};
-	return parseOr();
+	return parseOr(0);
 };
 //#endregion
 //#region src/referenced-paths.ts
@@ -1175,7 +1196,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";
@@ -1705,4 +1727,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/template-conditions",
-  "version": "0.6.0",
+  "version": "0.6.3",
   "description": "A document-template marker and condition engine: {{...}} marker grammar, parse, compute, serialize, field values.",
   "keywords": [
     "condition",
@@ -43,7 +43,7 @@
     "test": "bun test",
     "test:property": "bun test --preload @stll/property-testing/preload $(grep -rlF 'fc.assert' 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 --deny-warnings --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"
@@ -51,13 +51,13 @@
   "dependencies": {
     "@stll/conditions": "^0.4.0",
     "better-result": "3.0.1",
-    "temporal-polyfill": "1.0.4"
+    "temporal-polyfill": "1.0.5"
   },
   "devDependencies": {
     "@stll/property-testing": "0.0.0",
     "@stll/typescript-config": "0.0.0",
     "bun-types": "1.4.2",
-    "fast-check": "^4.9.0",
+    "fast-check": "^4.10.1",
     "tsdown": "0.23.0"
   },
   "main": "./dist/index.js",