@stll/template-conditions 0.6.3 → 0.6.5

package/dist/index.d.ts

@@ -1,17 +1,11 @@
 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
+import { resolvePath } from "./path.js";
 /** 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"];
 export declare const parseCondition: (expression: string) => ConditionNode$1 | null;
-//#endregion
-//#region src/referenced-paths.d.ts
 /**
  * What a `{% if %}` expression reads. Structural, not evaluative: the paths a
  * condition depends on, for callers that decide something about the condition
@@ -26,8 +20,6 @@ export declare const parseCondition: (expression: string) => ConditionNode$1 | n
  * nothing".
  */
 export declare const referencedConditionPaths: (expression: string) => string[] | null;
-//#endregion
-//#region src/compute.d.ts
 /**
  * Arithmetic evaluator for computed template fields.
  *
@@ -48,8 +40,6 @@ export declare const referencedConditionPaths: (expression: string) => string[]
 export declare const NUMERIC_FUNCTION_NAMES: readonly ["min", "max", "round", "abs", "floor", "ceil"];
 type NumericFunctionName = (typeof NUMERIC_FUNCTION_NAMES)[number];
 export declare const evaluateNumericExpression: (expression: string, data: Record<string, unknown>) => number | undefined;
-//#endregion
-//#region src/field-values.d.ts
 /**
  * Single source of truth for the DETERMINISTIC field-value transforms a
  * template fill applies: formula (arithmetic over the other values) and
@@ -115,16 +105,12 @@ type DeterministicFieldConfig = {
  * value, so the caller leaves the field as-is.
  */
 export declare const renderDeterministicFieldValue: (field: DeterministicFieldConfig, values: Record<string, unknown>) => string | null;
-//#endregion
-//#region src/condition-builder.d.ts
 /**
  * Serialize a condition tree into an expression for `evaluateCondition`.
  * Returns an empty string for an empty tree (caller treats that as "no
  * condition" / always-visible).
  */
 export declare const serializeCondition: (node: ConditionNode$1) => string;
-//#endregion
-//#region src/markers.d.ts
 /**
  * Canonical grammar for the docxtpl dialect of Jinja — the single source of
  * truth shared by the fill pipeline (api), the editor highlighter (folio), and
@@ -388,8 +374,6 @@ type MarkerDefect = {
 export declare const classifyMarkerDefect: (innerRaw: string, form?: MarkerForm) => MarkerDefect | null;
 /** Exhaustiveness guard — pass the discriminant in a `switch` default branch. */
 export declare const assertNever: (value: never) => never;
-//#endregion
-//#region src/loop-scope.d.ts
 /**
  * The path a marker names, once the loops around it are taken into account.
  *
@@ -418,8 +402,6 @@ export declare const qualifyRowScopedPath: (path: string, rowPaths?: readonly st
 export declare const qualifyRowScopedPlaceholder: (path: string, rowScopes: readonly RowScope[]) => string;
 /** The manifest path for an array a `{% for %}` opens inside these loops. */
 export declare const qualifyLoopPath: (declaredPath: string, rowScopes: readonly RowScope[]) => string;
-//#endregion
-//#region src/field-config.d.ts
 /** Where a field's value comes from, when a record supplies it. Only the shape
  *  the filters read: each caller's own union satisfies it. */
 type MarkerFieldSource = {
@@ -503,8 +485,6 @@ export declare const filtersFromFieldConfig: (field: MarkerFieldConfig) => Filte
  * value filter can never be written where the reader refuses it.
  */
 export declare const arrayFiltersFromFieldConfig: (field: MarkerFieldConfig) => FilterCall[];
-//#endregion
-//#region src/render.d.ts
 /** Why a value has no spelling the scanner reads back as itself. */
 type UnwritableReason = "tag-delimiter" | "number-spelling";
 /** The reason this literal cannot be written in a marker of this form, or
@@ -561,8 +541,6 @@ type ForOpenerOptions = {
 };
 /** One `{% for %}` opener, keeping its placement prefix. */
 export declare const renderForOpener: ({ alias, filters, path, prefix }: ForOpenerOptions) => string;
-//#endregion
-//#region src/row-blocks.d.ts
 /** One end of a row block, addressed within the row that was scanned. */
 type RowBlockMarker = {
   /** Index into the row's cells. */
@@ -589,8 +567,6 @@ type RowBlockPair = {
  * engine's existing structure errors rather than guessed at.
  */
 export declare const detectRowBlockPair: (cells: readonly (readonly string[])[]) => RowBlockPair | null;
-//#endregion
-//#region src/index.d.ts
 export type NamedCondition = {
   name: string;
   /** The `{% if %}` expression string. Authoritative unless `node` is set. */
@@ -623,5 +599,4 @@ export declare const MAX_CONDITION_DEPTH = 50;
  * branch true).
  */
 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,34 +1,8 @@
+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
+// src/compute.ts
 /**
 * Arithmetic evaluator for computed template fields.
 *
@@ -189,8 +163,7 @@ const evaluateNumericExpression = (expression, data) => {
 		return;
 	}
 };
-//#endregion
-//#region src/parse.ts
+// src/parse.ts
 /** Maximum combined nesting of parentheses and unary negation. */
 const MAX_CONDITION_NESTING = 256;
 const COMPARE_SYMBOL_TO_OP = {
@@ -452,8 +425,7 @@ const parseCondition = (expression) => {
 	};
 	return parseOr(0);
 };
-//#endregion
-//#region src/referenced-paths.ts
+// src/referenced-paths.ts
 const operandsOf = (node) => node.type === "compare" ? [node.left, node.right] : [node.operand];
 /** Every field path the tree reads, or `null` when an operand names something
 *  whose own references cannot be enumerated (a formula over other fields). */
@@ -486,8 +458,7 @@ const referencedConditionPaths = (expression) => {
 	const node = parseCondition(expression);
 	return node === null ? null : nodePaths(node);
 };
-//#endregion
-//#region src/field-values.ts
+// src/field-values.ts
 /**
 * Single source of truth for the DETERMINISTIC field-value transforms a
 * template fill applies: formula (arithmetic over the other values) and
@@ -586,8 +557,7 @@ const renderDeterministicFieldValue = (field, values) => {
 	}
 	return null;
 };
-//#endregion
-//#region src/condition-builder.ts
+// src/condition-builder.ts
 const COMPARE_OP_TO_SYMBOL = {
 	eq: "==",
 	neq: "!=",
@@ -644,8 +614,7 @@ const serializeNode = (node, top) => {
 * condition" / always-visible).
 */
 const serializeCondition = (node) => serializeNode(node, true);
-//#endregion
-//#region src/markers.ts
+// src/markers.ts
 /**
 * Canonical grammar for the docxtpl dialect of Jinja — the single source of
 * truth shared by the fill pipeline (api), the editor highlighter (folio), and
@@ -1324,8 +1293,7 @@ const classifyMarkerDefect = (innerRaw, form = "output") => {
 };
 /** Exhaustiveness guard — pass the discriminant in a `switch` default branch. */
 const assertNever = (value) => panic(`Unhandled template directive: ${JSON.stringify(value)}`);
-//#endregion
-//#region src/loop-scope.ts
+// src/loop-scope.ts
 const rowScopePaths = (rowScopes) => rowScopes.map(({ scopedPath }) => scopedPath);
 /** A path already under the innermost repeat is left alone; anything else is
 *  read as a name relative to it. */
@@ -1345,8 +1313,7 @@ const qualifyRowScopedPlaceholder = (path, rowScopes) => {
 };
 /** The manifest path for an array a `{% for %}` opens inside these loops. */
 const qualifyLoopPath = (declaredPath, rowScopes) => qualifyRowScopedPath(qualifyRowScopedPlaceholder(declaredPath, rowScopes), rowScopePaths(rowScopes));
-//#endregion
-//#region src/field-config.ts
+// src/field-config.ts
 /**
 * The filters that describe a REPEAT rather than a value: how many rows it
 * takes and what to call it. These are the ones a `{% for %}` tag may carry,
@@ -1468,8 +1435,7 @@ const filtersFromFieldConfig = (field) => Object.values(MARKER_FIELD_FILTERS).fl
 * value filter can never be written where the reader refuses it.
 */
 const arrayFiltersFromFieldConfig = (field) => filtersFromFieldConfig(field).filter(({ name }) => isArrayFilterName(name));
-//#endregion
-//#region src/render.ts
+// src/render.ts
 /** The number literals the scanner reads: no exponent, no `Infinity`. */
 const WRITABLE_NUMBER = /^-?\d+(?:\.\d+)?$/u;
 /** What a tag's body cannot carry: it has no quoted-run escape hatch, so a
@@ -1542,8 +1508,7 @@ const renderForOpener = ({ alias, filters, path, prefix }) => {
 	const head = `{%${PREFIX_TOKEN[prefix]} for ${alias} in ${path}`;
 	return chain === "" ? `${head} %}` : `${head} | ${chain} %}`;
 };
-//#endregion
-//#region src/row-blocks.ts
+// src/row-blocks.ts
 /**
 * Row-form block markers: the lenient placement authoring agents actually
 * write for a "one row per item" table.
@@ -1652,8 +1617,7 @@ const detectRowBlockPair = (cells) => {
 		close
 	};
 };
-//#endregion
-//#region src/index.ts
+// src/index.ts
 /**
 * Shared condition evaluation + marker grammar for DOCX templates. Small,
 * side-effect-free functions usable on both backend (Bun) and frontend
@@ -1726,5 +1690,4 @@ const evaluateCondition = (expression, data, namedConditions, _resolved = /* @__
 	if (node === null) return false;
 	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, 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,15 @@
+/**
+ * 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;

package/dist/path.js

@@ -0,0 +1,26 @@
+// 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;
+};
+export { isNonNullObject, resolvePath };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/template-conditions",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "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,24 +45,24 @@
     "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')",
-    "typecheck": "bun ../../packages/scripts/src/tsc-native.ts --noEmit",
+    "test:property": "bun test --preload @stll/property-testing/preload $(grep -rlE 'fc\\.assert|assertProperty' src --include='*.test.ts')",
+    "typecheck": "bun check --no-pretty --all --project=tsconfig.json",
     "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"
   },
   "dependencies": {
     "@stll/conditions": "^0.4.0",
     "better-result": "3.0.1",
-    "temporal-polyfill": "1.0.5"
+    "temporal-polyfill": "1.0.6"
   },
   "devDependencies": {
     "@stll/property-testing": "0.0.0",
     "@stll/typescript-config": "0.0.0",
-    "bun-types": "1.4.2",
-    "fast-check": "^4.10.1",
-    "tsdown": "0.23.0"
+    "bun-types": "1.4.4",
+    "fast-check": "^4.10.2",
+    "tsdown": "0.23.4",
+    "tsrs": "0.20.1-ts7.1.0-beta"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts"