@stll/template-conditions 0.2.0 → 0.2.1

package/dist/index.js

@@ -175,8 +175,6 @@ const evaluateNumericExpression = (expression, data) => {
 };
 //#endregion
 //#region src/parse.ts
-const NON_STRING_TOKEN_RE = /(?<token>==|!=|>=|<=|>|<|!(?!=)|and\b|or\b|contains\b|[()]|-?\d[\p{N}_.]*|[\p{L}\p{N}_.]+(?:-[\p{L}\p{N}_.]+)*)/uy;
-const STARTS_WITH_DIGIT_RE = /^-?\d/u;
 const COMPARE_SYMBOL_TO_OP = {
 	"==": "eq",
 	"!=": "neq",
@@ -185,6 +183,11 @@ const COMPARE_SYMBOL_TO_OP = {
 	">=": "gte",
 	"<=": "lte"
 };
+const escapeRegexLiteral = (value) => value.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
+const COMPARE_SYMBOL_PATTERN = Object.keys(COMPARE_SYMBOL_TO_OP).sort((left, right) => right.length - left.length).map(escapeRegexLiteral).join("|");
+const NON_STRING_TOKEN_RE = new RegExp(String.raw`(?<token>${COMPARE_SYMBOL_PATTERN}|!(?!=)|and\b|or\b|contains\b|[()]|-?\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);
 /**
 * Scan a `"..."` literal starting at `expr[start]` (the opening quote),
 * honoring `\\`-escapes without interpreting them. A single linear pass:
@@ -213,7 +216,7 @@ const classifyNonString = (raw) => {
 	if (raw === "and") return { type: "and" };
 	if (raw === "or") return { type: "or" };
 	if (raw === "!") return { type: "not" };
-	if (raw === "contains" || Object.hasOwn(COMPARE_SYMBOL_TO_OP, raw)) return {
+	if (raw === "contains" || isCompareSymbol(raw)) return {
 		type: "op",
 		raw
 	};
@@ -371,7 +374,7 @@ const parseCondition = (expression) => {
 		return {
 			type: "compare",
 			left,
-			op: COMPARE_SYMBOL_TO_OP[opTok.raw] ?? "eq",
+			op: COMPARE_SYMBOL_TO_OP[opTok.raw],
 			right: operandFromToken(rightTok)
 		};
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/template-conditions",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A document-template marker and condition engine: {{...}} marker grammar, parse, compute, serialize, field values.",
   "keywords": [
     "condition",
@@ -41,7 +41,7 @@
     "build": "tsdown",
     "pack:dry-run": "bun pm pack --dry-run",
     "test": "bun test",
-    "test:property": "bun test $(grep -rlF 'fc.assert' src --include='*.test.ts')",
+    "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:fix": "cd ../.. && bun --bun oxlint -c oxlint.config.ts --type-aware --fix packages/template-conditions",
@@ -49,13 +49,13 @@
     "prepack": "bun run build"
   },
   "dependencies": {
-    "@stll/conditions": "^0.2.0",
+    "@stll/conditions": "^0.3.0",
     "better-result": "3.0.0"
   },
   "devDependencies": {
     "@stll/property-testing": "0.0.0",
     "@stll/typescript-config": "0.0.0",
-    "@types/bun": "1.3.14",
+    "bun-types": "1.4.0",
     "fast-check": "^4.9.0",
     "tsdown": "0.22.14"
   },