@mgarlik/json-filter 1.0.0 → 1.0.1

package/dist/matchesFilter.js

@@ -27,11 +27,6 @@ function compareResolvedValues(fieldVal, resolved) {
         return resolved.includes(fieldVal);
     return fieldVal === resolved;
 }
-function buildSourceKey(source) {
-    if (typeof source !== "object" || source === null)
-        return String(source);
-    return JSON.stringify(source);
-}
 function getCurrentDate() {
     return new Date().toISOString().slice(0, 10);
 }
@@ -73,7 +68,7 @@ function evalCondition(fieldVal, condition, target, context) {
     }
     const keys = Object.keys(condition);
     if (keys.length === 1 && keys[0] === "$source") {
-        return compareResolvedValues(fieldVal, evaluateValue(condition, context, target));
+        throw new Error("Unresolved $source in filter condition. Resolve $source before calling json-filter.");
     }
     for (const op of keys) {
         const arg = condition[op];
@@ -224,17 +219,7 @@ export function evaluateValue(expr, context = {}, target = {}) {
     const obj = expr;
     const keys = Object.keys(obj);
     if (keys.length === 1 && keys[0] === "$source") {
-        const source = obj["$source"];
-        const sourceResolver = context.sourceResolver;
-        if (!sourceResolver) {
-            throw new Error("$source requires context.sourceResolver");
-        }
-        const stack = context.sourceStack ?? [];
-        const sourceKey = buildSourceKey(source);
-        if (stack.includes(sourceKey)) {
-            throw new Error(`Cyclic $source reference detected for ${sourceKey}`);
-        }
-        return sourceResolver(source, { ...context, sourceStack: [...stack, sourceKey] });
+        throw new Error("Unresolved $source expression. Resolve $source before calling json-filter.");
     }
     if (keys.includes("$first")) {
         return evalFirst(obj["$first"], context, target);

package/dist/types.d.ts

@@ -1,12 +1,7 @@
 /** Zakladni skalarny typ podporovany ve filtrech. */
 export type scalarType = string | number | boolean | null;
 /** Kontext predavany jako zdroj hodnot pro reference `$ctx.*`. */
-export type contextType = Record<string, unknown> & {
-    /** Volitelny resolver pro dynamicke reference typu `$source`. */
-    sourceResolver?: (source: unknown, context: contextType) => unknown;
-    /** Interni stack pro detekci cyklu pri reseni `$source`. */
-    sourceStack?: string[];
-};
+export type contextType = Record<string, unknown>;
 /** Cilovy JSON dokument, nad kterym se filtr vyhodnocuje. */
 export type targetType = Record<string, unknown>;
 type objectLikeType = Record<string, unknown>;
@@ -24,30 +19,14 @@ export type targetReferenceType<TTarget extends targetType> = `$this.${dotPathTy
 /** Reference na hodnotu z kontextu, napr. `$ctx.user.role`. */
 export type contextReferenceType<TContext extends contextType = contextType> = `$ctx.${dotPathType<TContext>}`;
 export type valueReferenceType<TTarget extends targetType = targetType, TContext extends contextType = contextType> = targetReferenceType<TTarget> | contextReferenceType<TContext>;
-/** Zdrojova reference, ktera se vyhodnoti na jednu hodnotu nebo pole hodnot. */
-export type sourceValueType<TTarget extends targetType = targetType, TContext extends contextType = contextType> = {
-    $source: {
-        dataProvider: string;
-        filter?: filterType<TTarget, TContext>;
-        val: string;
-        map?: never;
-    };
-} | {
-    $source: {
-        dataProvider: string;
-        filter?: filterType<TTarget, TContext>;
-        map: string;
-        val?: never;
-    };
-};
 /**
  * Stringová hodnota nebo reference s validací.
  * Pokud začíná `$this.` nebo `$ctx.`, musí být validní cesta.
  * Jinak je to libovolný string (ne-reference).
  */
 type stringOrValidReferenceType<TTarget extends targetType, TContext extends contextType> = `$this.${dotPathType<TTarget>}` | `$ctx.${dotPathType<TContext>}` | (string & {});
-type scalarOrReferenceType<TValue, TTarget extends targetType, TContext extends contextType> = TValue extends string ? stringOrValidReferenceType<TTarget, TContext> : scalarFieldValueType<TValue> | valueReferenceType<TTarget, TContext> | sourceValueType<TTarget, TContext>;
-export type conditionType<TValue = unknown, TTarget extends targetType = targetType, TContext extends contextType = contextType> = scalarType | undefined | sourceValueType<TTarget, TContext> | conditionObjectType<TValue, TTarget, TContext> | Array<conditionType<TValue, TTarget, TContext>>;
+type scalarOrReferenceType<TValue, TTarget extends targetType, TContext extends contextType> = TValue extends string ? stringOrValidReferenceType<TTarget, TContext> : scalarFieldValueType<TValue> | valueReferenceType<TTarget, TContext>;
+export type conditionType<TValue = unknown, TTarget extends targetType = targetType, TContext extends contextType = contextType> = scalarType | undefined | conditionObjectType<TValue, TTarget, TContext> | Array<conditionType<TValue, TTarget, TContext>>;
 /** Objektova podoba podminky (operator -> hodnota). */
 export type conditionObjectType<TValue = unknown, TTarget extends targetType = targetType, TContext extends contextType = contextType> = {
     /**
@@ -68,13 +47,13 @@ export type conditionObjectType<TValue = unknown, TTarget extends targetType = t
     /** Rozsah vcetne hranic (`min <= field <= max`). */
     $between?: [unknown, unknown];
     /** Hodnota je v seznamu (`field in list`). */
-    $in?: Array<scalarOrReferenceType<TValue, TTarget, TContext> | sourceValueType<TTarget, TContext>>;
+    $in?: Array<scalarOrReferenceType<TValue, TTarget, TContext>>;
     /** Hodnota neni v seznamu (`field not in list`). */
-    $nin?: Array<scalarOrReferenceType<TValue, TTarget, TContext> | sourceValueType<TTarget, TContext>>;
+    $nin?: Array<scalarOrReferenceType<TValue, TTarget, TContext>>;
     /** Vsechny prvky pole jsou v seznamu. */
-    $ein?: TValue extends readonly unknown[] ? Array<scalarOrReferenceType<arrayElementType<TValue>, TTarget, TContext> | sourceValueType<TTarget, TContext>> : never;
+    $ein?: TValue extends readonly unknown[] ? Array<scalarOrReferenceType<arrayElementType<TValue>, TTarget, TContext>> : never;
     /** Alespon jeden prvek pole neni v seznamu. */
-    $nein?: TValue extends readonly unknown[] ? Array<scalarOrReferenceType<arrayElementType<TValue>, TTarget, TContext> | sourceValueType<TTarget, TContext>> : never;
+    $nein?: TValue extends readonly unknown[] ? Array<scalarOrReferenceType<arrayElementType<TValue>, TTarget, TContext>> : never;
     /** String obsahuje podretezec (case-sensitive). */
     $has?: scalarOrReferenceType<string, TTarget, TContext>;
     /** String neobsahuje podretezec (case-sensitive). */
@@ -154,6 +133,8 @@ export type filterType<TTarget extends targetType = targetType, TContext extends
     [K in optionalFieldKeyType<TTarget>]?: conditionType<pathValueType<TTarget, K extends `${infer P}?` ? P : never>, TTarget, TContext>;
 } & {
     [K in contextReferenceType<TContext>]?: conditionType<any, TTarget, TContext>;
+} & {
+    [key: string]: conditionType<any, TTarget, TContext> | undefined;
 };
 /** Pole JSON dokumentu. */
 export type documentsArrayType = Array<Record<string, unknown>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mgarlik/json-filter",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "JSON filter engine for backend and frontend applications",
   "type": "module",
   "main": "dist/index.js",