@uniqu/core 0.0.4 → 0.0.5

package/dist/index.cjs

@@ -8,6 +8,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 * - Bare primitive values are normalized to `comparison(field, '$eq', value)`.
 * - Multi-field ComparisonNodes are combined via `visitor.and(...)`.
 */ function walkFilter(expr, visitor) {
+	if (!expr) return void 0;
 	if ("$and" in expr && expr.$and !== void 0) {
 		const children = expr.$and.map((child) => walkFilter(child, visitor));
 		return visitor.and(children);
@@ -54,14 +55,15 @@ function isPrimitive(x) {
 		}
 		set.add(op);
 	}
-	walkFilter(filter, {
+	const visitor = {
 		comparison(field, op) {
 			capture(field, op);
 		},
 		and() {},
 		or() {},
 		not() {}
-	});
+	};
+	if (filter) walkFilter(filter, visitor);
 	if (controls?.$select) if (Array.isArray(controls.$select)) for (const field of controls.$select) capture(field, "$select");
 	else for (const field of Object.keys(controls.$select)) capture(field, "$select");
 	if (controls?.$sort) for (const field of Object.keys(controls.$sort)) capture(field, "$order");
@@ -80,7 +82,7 @@ function isPrimitive(x) {
 * Return insights for a query — uses pre-computed insights when present,
 * computes lazily otherwise.
 */ function getInsights(query) {
-	return query.insights ?? computeInsights(query.filter, query.controls);
+	return query.insights ?? computeInsights(query.filter ?? {}, query.controls);
 }
 
 //#endregion

package/dist/index.d.ts

@@ -66,14 +66,14 @@ type LogicalNode<T = Record<string, unknown>> = {
     $or?: never;
 };
 /** Query controls (pagination, projection, sorting). Generic `T` constrains field names in `$select` and `$sort`. */
-interface UniqueryControls<T = Record<string, unknown>> {
+interface UniqueryControls<T = Record<string, unknown>, Nav extends Record<string, unknown> = Record<string, unknown>> {
     $sort?: Partial<Record<keyof T & string, 1 | -1>>;
     $skip?: number;
     $limit?: number;
     $count?: boolean;
     $select?: (keyof T & string)[] | Partial<Record<keyof T & string, 0 | 1>>;
     /** Relations to populate alongside the query. */
-    $with?: WithRelation[];
+    $with?: TypedWithRelation<Nav>[];
     /** Pass-through for unknown $-prefixed keywords. */
     [key: `$${string}`]: unknown;
 }
@@ -82,17 +82,44 @@ interface UniqueryControls<T = Record<string, unknown>> {
  * When `name` is present this is a nested relation (sub-query inside `$with`).
  * When absent it is the root query.
  */
-interface Uniquery<T = Record<string, unknown>> {
+interface Uniquery<T = Record<string, unknown>, Nav extends Record<string, unknown> = Record<string, unknown>> {
     /** Relation name. Present only for nested `$with` sub-queries. */
     name?: string;
-    filter: FilterExpr<T>;
-    controls: UniqueryControls<T>;
+    filter?: FilterExpr<T>;
+    controls?: UniqueryControls<T, Nav>;
     /** Pre-computed insights. */
     insights?: UniqueryInsights;
 }
-/** A `$with` relation — a `Uniquery` with a required `name`. */
-type WithRelation = Uniquery & {
+/** Unwrap array types to get the element type for nav props. */
+type NavTarget<T> = T extends Array<infer U> ? U : T;
+/**
+ * A typed $with relation entry.
+ * When Nav is typed (from __navProps), name is constrained to known nav prop keys.
+ * Each entry gets its own filter/controls typed to the target entity.
+ * Falls back to untyped WithRelation when Nav has no known keys.
+ */
+type TypedWithRelation<Nav extends Record<string, unknown>> = [
+    keyof Nav & string
+] extends [never] ? WithRelation : {
+    [K in keyof Nav & string]: {
+        name: K;
+        filter?: FilterExpr<NavTarget<Nav[K]> extends {
+            __ownProps: infer F;
+        } ? F : Record<string, unknown>>;
+        controls?: UniqueryControls<NavTarget<Nav[K]> extends {
+            __ownProps: infer F;
+        } ? F : Record<string, unknown>, NavTarget<Nav[K]> extends {
+            __navProps: infer N extends Record<string, unknown>;
+        } ? N : Record<string, unknown>>;
+        insights?: UniqueryInsights;
+    };
+}[keyof Nav & string];
+/** Untyped $with relation — used when Nav generic is not provided. */
+type WithRelation = {
     name: string;
+    filter?: FilterExpr;
+    controls?: UniqueryControls;
+    insights?: UniqueryInsights;
 };
 /** Insight operator includes comparison ops plus control-derived ops. */
 type InsightOp = ComparisonOp | '$select' | '$order' | '$with';
@@ -122,7 +149,7 @@ interface FilterVisitor<R> {
  * - Bare primitive values are normalized to `comparison(field, '$eq', value)`.
  * - Multi-field ComparisonNodes are combined via `visitor.and(...)`.
  */
-declare function walkFilter<R>(expr: FilterExpr, visitor: FilterVisitor<R>): R;
+declare function walkFilter<R>(expr: FilterExpr | undefined, visitor: FilterVisitor<R>): R | undefined;
 declare function isPrimitive(x: unknown): x is Primitive;
 
 /**
@@ -130,7 +157,7 @@ declare function isPrimitive(x: unknown): x is Primitive;
  * This is the lazy counterpart to the eager insight capture done during
  * URL parsing.
  */
-declare function computeInsights(filter: FilterExpr, controls?: UniqueryControls): UniqueryInsights;
+declare function computeInsights(filter?: FilterExpr, controls?: UniqueryControls): UniqueryInsights;
 /**
  * Return insights for a query — uses pre-computed insights when present,
  * computes lazily otherwise.
@@ -138,4 +165,4 @@ declare function computeInsights(filter: FilterExpr, controls?: UniqueryControls
 declare function getInsights(query: Uniquery): UniqueryInsights;
 
 export { computeInsights, getInsights, isPrimitive, walkFilter };
-export type { ComparisonNode, ComparisonOp, FieldOps, FieldOpsFor, FieldValue, FilterExpr, FilterVisitor, InsightOp, LogicalNode, Primitive, Uniquery, UniqueryControls, UniqueryInsights, WithRelation };
+export type { ComparisonNode, ComparisonOp, FieldOps, FieldOpsFor, FieldValue, FilterExpr, FilterVisitor, InsightOp, LogicalNode, NavTarget, Primitive, TypedWithRelation, Uniquery, UniqueryControls, UniqueryInsights, WithRelation };

package/dist/index.mjs

@@ -6,6 +6,7 @@
 * - Bare primitive values are normalized to `comparison(field, '$eq', value)`.
 * - Multi-field ComparisonNodes are combined via `visitor.and(...)`.
 */ function walkFilter(expr, visitor) {
+	if (!expr) return void 0;
 	if ("$and" in expr && expr.$and !== void 0) {
 		const children = expr.$and.map((child) => walkFilter(child, visitor));
 		return visitor.and(children);
@@ -52,14 +53,15 @@ function isPrimitive(x) {
 		}
 		set.add(op);
 	}
-	walkFilter(filter, {
+	const visitor = {
 		comparison(field, op) {
 			capture(field, op);
 		},
 		and() {},
 		or() {},
 		not() {}
-	});
+	};
+	if (filter) walkFilter(filter, visitor);
 	if (controls?.$select) if (Array.isArray(controls.$select)) for (const field of controls.$select) capture(field, "$select");
 	else for (const field of Object.keys(controls.$select)) capture(field, "$select");
 	if (controls?.$sort) for (const field of Object.keys(controls.$sort)) capture(field, "$order");
@@ -78,7 +80,7 @@ function isPrimitive(x) {
 * Return insights for a query — uses pre-computed insights when present,
 * computes lazily otherwise.
 */ function getInsights(query) {
-	return query.insights ?? computeInsights(query.filter, query.controls);
+	return query.insights ?? computeInsights(query.filter ?? {}, query.controls);
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniqu/core",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Canonical query format types, tree walker, and utilities for Uniqu",
   "license": "MIT",
   "author": "Artem Maltsev",