@dav3/gql-of-power 1.7.0 → 1.8.0

package/dist/queries/gql-to-sql-mapper.js

@@ -507,6 +507,10 @@ class GQLtoSQLMapper {
                 parentAlias: alias,
                 alias: childAlias,
                 parentGqlFieldNameKey: parentGqlFieldNameKey,
+                // Pass the inline filter (from `books(filter: {...})`) to the
+                // CHILD's recursiveMap so the WHERE lands inside the child's
+                // lateral join subquery — child-row filtering, NOT EXISTS on parent.
+                gqlFilters: mapping.inlineFilter ? [mapping.inlineFilter] : undefined,
             });
             variables_1.logger.log('NEW MAPPING:', { parentGqlFieldNameKey, gqlFieldName }, [...newMappings.keys()], (0, gql_to_sql_types_1.mappingsTypeToString)(mapping, true));
             const newMapping = utils_1.QueriesUtils.newMappings();
@@ -567,41 +571,28 @@ class GQLtoSQLMapper {
         const { filter, pagination } = args ?? {};
         variables_1.logger.log(prefix, 'args', parentGqlFieldNameKey, { ...filter }, JSON.stringify(pagination));
         if (filter || pagination) {
-            // Convert mapNumericEnum string keys → raw DB values for inline field
-            // filter args. The top-level filter goes through convertFilterEnumValues
-            // in GQLQueryManager, but inline filter args (e.g. `books(filter: {...})`)
-            // enter here and would otherwise bypass enum conversion, causing
-            // mapNumericEnum fields in sub-entity filters to fail silently.
-            //
-            // The filter keys belong to the TARGET entity (e.g. Book), not the parent
-            // (e.g. Author). We WRAP the filter under the field name and convert using
-            // the PARENT entity's registries — convertRelationField /
-            // convertMappedCustomField then resolve the target entity and recurse into
-            // its enum fields, handling arbitrary nesting depth.
-            const gqlEntityName = (0, gql_entity_1.getGQLEntityNameFor)(entityMetadata.name ?? '');
-            const parentEnumFields = (0, gql_entity_1.getMapEnumFieldsFor)(gqlEntityName);
-            const parentCustomFields = (0, gql_entity_1.getCustomFieldsFor)(gqlEntityName);
-            const parentRelationFields = (0, gql_entity_1.getRelationFieldsFor)(gqlEntityName);
-            const wrappedConverted = (0, enum_filter_converter_1.convertFilterEnumValues)({ [parentGqlFieldNameKey]: filter }, parentEnumFields, parentCustomFields, parentRelationFields);
-            const convertedFilter = wrappedConverted[parentGqlFieldNameKey] ?? filter;
-            const mapped = this.recursiveMap({
-                entityMetadata,
-                parentAlias: alias,
-                alias,
-                gqlFilters: [
-                    { [parentGqlFieldNameKey]: { ...convertedFilter } },
-                ],
-                isFieldFilter: true,
-            });
-            const { innerJoin, where: w, values, _or, _and, _not } = utils_1.QueriesUtils.mappingsReducer(mapped);
-            mapping.innerJoin.push(...innerJoin);
-            mapping.where.push(...w);
-            mapping.values = { ...mapping.values, ...values };
+            if (filter) {
+                // Convert mapNumericEnum string keys → raw DB values for inline
+                // field filter args. The filter keys belong to the TARGET entity
+                // (e.g. Book), not the parent (e.g. Author). We WRAP the filter
+                // under the field name and convert using the PARENT entity's
+                // registries — convertRelationField / convertMappedCustomField
+                // then resolve the target entity and recurse into its enum
+                // fields, handling arbitrary nesting depth.
+                const gqlEntityName = (0, gql_entity_1.getGQLEntityNameFor)(entityMetadata.name ?? '');
+                const parentEnumFields = (0, gql_entity_1.getMapEnumFieldsFor)(gqlEntityName);
+                const parentCustomFields = (0, gql_entity_1.getCustomFieldsFor)(gqlEntityName);
+                const parentRelationFields = (0, gql_entity_1.getRelationFieldsFor)(gqlEntityName);
+                const wrappedConverted = (0, enum_filter_converter_1.convertFilterEnumValues)({ [parentGqlFieldNameKey]: filter }, parentEnumFields, parentCustomFields, parentRelationFields);
+                const convertedFilter = wrappedConverted[parentGqlFieldNameKey] ?? filter;
+                // Store the converted filter for mapField to pass to the child's
+                // recursiveMap. This ensures the WHERE clause lands inside the
+                // child's lateral join subquery (child-row filtering), NOT as an
+                // EXISTS on the parent.
+                mapping.inlineFilter = convertedFilter;
+            }
             mapping.limit = pagination?.limit;
             mapping.offset = pagination?.offset;
-            mapping._or.push(..._or);
-            mapping._and.push(..._and);
-            mapping._not.push(..._not);
             mapping.orderBy.push(...(pagination?.orderBy ?? []));
             variables_1.logger.log('GQLtoSQLMapper - handleFieldArguments - processed', filter, 'mapping', (0, gql_to_sql_types_1.mappingsTypeToString)(mapping, true));
         }

package/dist/types/gql-to-sql-types.d.ts

@@ -15,6 +15,15 @@ export type MappingsType = {
     _or: MappingsType[];
     _and: MappingsType[];
     _not: MappingsType[];
+    /**
+     * Converted inline filter args from a relation field's `filter` argument
+     * (e.g. `books(filter: { title_eq: "X" })`). Stored by
+     * `handleFieldArguments` and consumed by `mapField`, which passes it to the
+     * child entity's `recursiveMap` as `gqlFilters` so the WHERE lands inside
+     * the child's lateral join subquery (child-row filtering), NOT as an EXISTS
+     * on the parent.
+     */
+    inlineFilter?: any;
 };
 export declare const mappingsTypeToString: (m: MappingsType, full?: boolean) => string;
 export type FilterMappingType = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dav3/gql-of-power",
-	"version": "1.7.0",
+	"version": "1.8.0",
 	"description": "Generate a single optimized SQL query from GraphQL operations — eliminate N+1 with recursive field-to-SQL mapping. Ships with agent skill for AI coding assistants.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/src/queries/gql-to-sql-mapper.ts

@@ -998,6 +998,10 @@ export class GQLtoSQLMapper {
 				parentAlias: alias,
 				alias: childAlias,
 				parentGqlFieldNameKey: parentGqlFieldNameKey,
+				// Pass the inline filter (from `books(filter: {...})`) to the
+				// CHILD's recursiveMap so the WHERE lands inside the child's
+				// lateral join subquery — child-row filtering, NOT EXISTS on parent.
+				gqlFilters: mapping.inlineFilter ? [mapping.inlineFilter] : undefined,
 			});
 
 			logger.log(
@@ -1182,49 +1186,35 @@ export class GQLtoSQLMapper {
 
 		logger.log(prefix, 'args', parentGqlFieldNameKey, { ...filter }, JSON.stringify(pagination));
 		if (filter || pagination) {
-			// Convert mapNumericEnum string keys → raw DB values for inline field
-			// filter args. The top-level filter goes through convertFilterEnumValues
-			// in GQLQueryManager, but inline filter args (e.g. `books(filter: {...})`)
-			// enter here and would otherwise bypass enum conversion, causing
-			// mapNumericEnum fields in sub-entity filters to fail silently.
-			//
-			// The filter keys belong to the TARGET entity (e.g. Book), not the parent
-			// (e.g. Author). We WRAP the filter under the field name and convert using
-			// the PARENT entity's registries — convertRelationField /
-			// convertMappedCustomField then resolve the target entity and recurse into
-			// its enum fields, handling arbitrary nesting depth.
-			const gqlEntityName = getGQLEntityNameFor(entityMetadata.name ?? '');
-			const parentEnumFields = getMapEnumFieldsFor(gqlEntityName);
-			const parentCustomFields = getCustomFieldsFor(gqlEntityName);
-			const parentRelationFields = getRelationFieldsFor(gqlEntityName);
-			const wrappedConverted = convertFilterEnumValues(
-				{ [parentGqlFieldNameKey]: filter },
-				parentEnumFields,
-				parentCustomFields,
-				parentRelationFields
-			);
-			const convertedFilter = wrappedConverted[parentGqlFieldNameKey] ?? filter;
-
-			const mapped = this.recursiveMap({
-				entityMetadata,
-				parentAlias: alias,
-				alias,
-				gqlFilters: [
-					{ [parentGqlFieldNameKey]: { ...convertedFilter } } as GQLEntityFilterInputFieldType<T>,
-				],
-				isFieldFilter: true,
-			});
+			if (filter) {
+				// Convert mapNumericEnum string keys → raw DB values for inline
+				// field filter args. The filter keys belong to the TARGET entity
+				// (e.g. Book), not the parent (e.g. Author). We WRAP the filter
+				// under the field name and convert using the PARENT entity's
+				// registries — convertRelationField / convertMappedCustomField
+				// then resolve the target entity and recurse into its enum
+				// fields, handling arbitrary nesting depth.
+				const gqlEntityName = getGQLEntityNameFor(entityMetadata.name ?? '');
+				const parentEnumFields = getMapEnumFieldsFor(gqlEntityName);
+				const parentCustomFields = getCustomFieldsFor(gqlEntityName);
+				const parentRelationFields = getRelationFieldsFor(gqlEntityName);
+				const wrappedConverted = convertFilterEnumValues(
+					{ [parentGqlFieldNameKey]: filter },
+					parentEnumFields,
+					parentCustomFields,
+					parentRelationFields
+				);
+				const convertedFilter = wrappedConverted[parentGqlFieldNameKey] ?? filter;
 
-			const { innerJoin, where: w, values, _or, _and, _not } = QueriesUtils.mappingsReducer(mapped);
+				// Store the converted filter for mapField to pass to the child's
+				// recursiveMap. This ensures the WHERE clause lands inside the
+				// child's lateral join subquery (child-row filtering), NOT as an
+				// EXISTS on the parent.
+				mapping.inlineFilter = convertedFilter;
+			}
 
-			mapping.innerJoin.push(...innerJoin);
-			mapping.where.push(...w);
-			mapping.values = { ...mapping.values, ...values };
 			mapping.limit = pagination?.limit;
 			mapping.offset = pagination?.offset;
-			mapping._or.push(..._or);
-			mapping._and.push(..._and);
-			mapping._not.push(..._not);
 			mapping.orderBy.push(...(pagination?.orderBy ?? []));
 			logger.log(
 				'GQLtoSQLMapper - handleFieldArguments - processed',

package/src/types/gql-to-sql-types.ts

@@ -19,6 +19,15 @@ export type MappingsType = {
 	_or: MappingsType[];
 	_and: MappingsType[];
 	_not: MappingsType[];
+	/**
+	 * Converted inline filter args from a relation field's `filter` argument
+	 * (e.g. `books(filter: { title_eq: "X" })`). Stored by
+	 * `handleFieldArguments` and consumed by `mapField`, which passes it to the
+	 * child entity's `recursiveMap` as `gqlFilters` so the WHERE lands inside
+	 * the child's lateral join subquery (child-row filtering), NOT as an EXISTS
+	 * on the parent.
+	 */
+	inlineFilter?: any;
 };
 
 export const mappingsTypeToString = (m: MappingsType, full = false) => {