@stll/template-conditions 0.6.0 → 0.6.2

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
 		});
@@ -208,7 +216,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/template-conditions",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "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 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",