@promind/honey 1.51.0 → 1.52.0

package/dist/module.js

@@ -166,6 +166,7 @@ var $486a90d70dc9bc85$export$2e2bcd8739ae039 = $486a90d70dc9bc85$var$ExpressApp;
 
 
 
+
 const $5f19ecb00e146b8f$var$formatters = {
     string: String,
     number: Number,
@@ -238,6 +239,60 @@ const $5f19ecb00e146b8f$export$390602d0ccf68ce6 = (filterParams, filter, req)=>{
     }
     return result;
 };
+/**
+ * Returns true if a FilterNode is an $and group.
+ */ function $5f19ecb00e146b8f$var$isAndGroup(node) {
+    return '$and' in node;
+}
+function $5f19ecb00e146b8f$export$d623e78f08e28a37(node, query) {
+    if ($5f19ecb00e146b8f$var$isAndGroup(node)) {
+        const resolvedChildren = [];
+        for (const child of node.$and){
+            const resolved = $5f19ecb00e146b8f$export$d623e78f08e28a37(child, query);
+            if (resolved === null) return null; // missing required param — whole AND fails
+            resolvedChildren.push(resolved);
+        }
+        return {
+            $and: resolvedChildren
+        };
+    }
+    // Leaf condition — there should be exactly one field key
+    const condition = node;
+    const entries = Object.entries(condition);
+    if (entries.length === 0) return null;
+    const [field, spec] = entries[0];
+    let resolvedValue;
+    if (spec.value === 'as-is') {
+        // Use overrideValue directly (call if function)
+        if (typeof spec.overrideValue === 'function') resolvedValue = spec.overrideValue();
+        else resolvedValue = spec.overrideValue;
+    } else {
+        // Read from query; if missing, skip this node
+        const rawValue = query[field];
+        if (typeof rawValue === 'undefined') return null;
+        const valueFormatter = $5f19ecb00e146b8f$var$formatters[spec.value];
+        resolvedValue = valueFormatter ? valueFormatter(rawValue) : rawValue;
+    }
+    return {
+        field: field,
+        operator: spec.operator,
+        value: resolvedValue
+    };
+}
+function $5f19ecb00e146b8f$export$da09f390d3fe1499(presetName, presets, query) {
+    if (!presetName) return null;
+    if (!presets || !(presetName in presets)) throw new (0, $eb799189062d1297$export$2e2bcd8739ae039)(`Unknown filter preset: "${presetName}"`, 400);
+    const preset = presets[presetName];
+    const orBranches = [];
+    for (const node of preset){
+        const resolved = $5f19ecb00e146b8f$export$d623e78f08e28a37(node, query);
+        if (resolved !== null) orBranches.push(resolved);
+    }
+    if (orBranches.length === 0) return null;
+    return {
+        $or: orBranches
+    };
+}
 
 
 function $e54b5bd1ebc8718c$export$2e2bcd8739ae039({ db: db, resource: resource, params: params, message: message, processResponseData: processResponseData, processErrorResponse: processErrorResponse }) {
@@ -337,7 +392,7 @@ function $68f7d8a50ef9b68c$export$7b6dde2038c44e91({ db: db, resource: resource,
         }
     };
 }
-function $68f7d8a50ef9b68c$export$7b48d281d65870ad({ db: db, resource: resource, fields: fields, filterQuery: filterQuery, format: format, processResponseData: processResponseData, processErrorResponse: processErrorResponse, joins: joins, shouldErrorOnNotFound: shouldErrorOnNotFound }) {
+function $68f7d8a50ef9b68c$export$7b48d281d65870ad({ db: db, resource: resource, fields: fields, filterQuery: filterQuery, format: format, processResponseData: processResponseData, processErrorResponse: processErrorResponse, joins: joins, shouldErrorOnNotFound: shouldErrorOnNotFound, filterPresets: filterPresets }) {
     return async function(req, res, next) {
         try {
             const page = Number(req.query.page);
@@ -347,7 +402,10 @@ function $68f7d8a50ef9b68c$export$7b48d281d65870ad({ db: db, resource: resource,
                 limit: limit || 10
             } : undefined;
             const filter = filterQuery && (0, $5f19ecb00e146b8f$export$390602d0ccf68ce6)(req.query, filterQuery, req);
-            let data = await db.read(resource, fields, filter, paginate, format, joins);
+            // Resolve optional ?preset= query param — additive, does not touch filter
+            const presetName = typeof req.query.preset === 'string' ? req.query.preset : undefined;
+            const resolvedOrGroup = (0, $5f19ecb00e146b8f$export$da09f390d3fe1499)(presetName, filterPresets, req.query);
+            let data = await db.read(resource, fields, filter, paginate, format, joins, resolvedOrGroup ?? undefined);
             let total = 0;
             if (paginate) {
                 total = Number(data[0]?.['honey_total_count'] || 0);
@@ -711,7 +769,7 @@ class $c492fd1e48c9c1cf$export$2e2bcd8739ae039 {
             exitMiddleware: exitMiddleware
         });
     }
-    get({ resource: resource, fields: fields, filter: filter, format: format, middleware: middleware, pathOverride: pathOverride, exitMiddleware: exitMiddleware, methodOverride: methodOverride, processResponseData: processResponseData, processErrorResponse: processErrorResponse, table: table, joins: joins, shouldErrorOnNotFound: shouldErrorOnNotFound = true }) {
+    get({ resource: resource, fields: fields, filter: filter, format: format, middleware: middleware, pathOverride: pathOverride, exitMiddleware: exitMiddleware, methodOverride: methodOverride, processResponseData: processResponseData, processErrorResponse: processErrorResponse, table: table, joins: joins, shouldErrorOnNotFound: shouldErrorOnNotFound = true, filterPresets: filterPresets }) {
         const path = pathOverride || `/${resource}`;
         resource = table || resource;
         const controller = (0, $68f7d8a50ef9b68c$export$7b48d281d65870ad)({
@@ -723,7 +781,8 @@ class $c492fd1e48c9c1cf$export$2e2bcd8739ae039 {
             processResponseData: processResponseData,
             processErrorResponse: processErrorResponse,
             joins: joins,
-            shouldErrorOnNotFound: shouldErrorOnNotFound
+            shouldErrorOnNotFound: shouldErrorOnNotFound,
+            filterPresets: filterPresets
         });
         this.crud({
             method: methodOverride || 'get',
@@ -941,6 +1000,39 @@ const $bf24bb53f537fa46$export$be3654efea499c50 = (results, joins = [])=>{
     });
     return nestedResults;
 };
+// ── Preset condition group helpers (additive — applyFilter unchanged) ────────
+/**
+ * Returns true if a ResolvedNode is an AND group.
+ */ function $bf24bb53f537fa46$var$isResolvedAndGroup(node) {
+    return '$and' in node;
+}
+/**
+ * Recursively applies a single ResolvedNode to a knex builder.
+ * AND groups are applied as nested `.where()` calls; leaves are plain conditions.
+ */ function $bf24bb53f537fa46$var$applyConditionGroup(builder, node) {
+    if ($bf24bb53f537fa46$var$isResolvedAndGroup(node)) builder.where((andBuilder)=>{
+        node.$and.forEach((child)=>$bf24bb53f537fa46$var$applyConditionGroup(andBuilder, child));
+    });
+    else {
+        const leaf = node;
+        if ([
+            'like',
+            'not like'
+        ].includes(leaf.operator)) builder.where(leaf.field, leaf.operator === 'like' ? 'ilike' : 'not ilike', `%${leaf.value}%`);
+        else builder.where(leaf.field, leaf.operator, leaf.value);
+    }
+}
+const $bf24bb53f537fa46$export$647274967602ffc7 = (query, orGroup)=>{
+    query.where((outerBuilder)=>{
+        orGroup.$or.forEach((branch, index)=>{
+            if (index === 0) $bf24bb53f537fa46$var$applyConditionGroup(outerBuilder, branch);
+            else outerBuilder.orWhere((branchBuilder)=>{
+                $bf24bb53f537fa46$var$applyConditionGroup(branchBuilder, branch);
+            });
+        });
+    });
+    return query;
+};
 const $bf24bb53f537fa46$export$1b001418845b471c = (query, filter = {})=>{
     Object.entries(filter).forEach(([field, data])=>{
         if (field === '$or') query.where((builder)=>{
@@ -973,7 +1065,7 @@ const $bf24bb53f537fa46$export$53b231d60a00019b = (table, data)=>{
         replacements: replacements
     };
 };
-const $bf24bb53f537fa46$export$60d67f341ad4c4 = (table, fields, filter, paginate, format, joins)=>{
+const $bf24bb53f537fa46$export$60d67f341ad4c4 = (table, fields, filter, paginate, format, joins, resolvedOrGroup)=>{
     const knex = (0, $254994df946b8040$export$a858f29c02f648c6)();
     // Handle field aliasing for joins
     const formattedFields = fields.map((field)=>{
@@ -989,24 +1081,25 @@ const $bf24bb53f537fa46$export$60d67f341ad4c4 = (table, fields, filter, paginate
     // Add total count if pagination is needed
     if (paginate) q = knex(table).select([
         ...formattedFields.map((field)=>{
-            // formattedFields entries are either plain strings (e.g. "users.id") or
-            // knex.raw objects (produced above for join-aliased fields).
-            // For plain strings we must NOT use ?? binding on a dotted value like
-            // "users.id" because knex wraps the whole string in double-quotes,
-            // producing the invalid identifier "users.id" instead of "users"."id".
-            // Passing the string directly to knex.raw as a literal SQL fragment is safe
-            // because formattedFields values are generated internally (not user input).
-            if (typeof field !== 'string') // Already a knex.raw object (join-aliased field) — use as-is
+            // formattedFields entries are either plain strings (e.g. "users.id",
+            // "users.firstName", or "bookings.scheduledAt as bookings__hj__scheduledAt")
+            // or knex.raw objects. We must double-quote each identifier part so that
+            // mixed-case column names (e.g. firstName, scheduledAt) are preserved and
+            // not lowercased by PostgreSQL.
+            if (typeof field !== 'string') // Already a knex.raw object — use as-is
             return field;
             const [actualField, alias] = field.split(' as ');
-            if (alias) // Has an explicit alias: quote each part of the column reference
-            // then attach the alias as a plain identifier
-            return knex.raw(`${actualField} as ??`, [
+            // Quote each part of a dotted identifier (e.g. "table"."column")
+            const quotedField = actualField.includes('.') ? knex.raw('??.??', actualField.split('.')) : knex.raw('??', [
+                actualField
+            ]);
+            if (alias) // Has an explicit alias: emit  "table"."column" as "alias"
+            return knex.raw(`${quotedField.toSQL().sql} as ??`, [
+                ...quotedField.toSQL().bindings,
                 alias
             ]);
-            // No alias: emit the field as a literal SQL fragment so dotted names
-            // like "users.id" are kept as-is and not collapsed into one quoted token
-            return knex.raw(field);
+            // No alias: just emit the properly-quoted column reference
+            return quotedField;
         }),
         knex.raw('count(*) OVER() AS honey_total_count')
     ]);
@@ -1041,6 +1134,8 @@ const $bf24bb53f537fa46$export$60d67f341ad4c4 = (table, fields, filter, paginate
     });
     // Apply filters
     if (filter) q = $bf24bb53f537fa46$export$1b001418845b471c(q, filter);
+    // Apply resolved preset OR group (additive — only when a preset is active)
+    if (resolvedOrGroup) q = $bf24bb53f537fa46$export$647274967602ffc7(q, resolvedOrGroup);
     // Apply sorting
     if (format?.sort && format.sortField) q.orderBy(format.sortField, format.sort);
     // Apply pagination
@@ -1128,8 +1223,8 @@ const $bf24bb53f537fa46$export$65b914f34962db1e = (table, data, conflictTarget,
 
 
 class $094f143c50bc237e$export$2e2bcd8739ae039 {
-    async read(table, fields, filter, paginate, format, joins) {
-        const { query: query, replacements: replacements } = (0, $bf24bb53f537fa46$export$60d67f341ad4c4)(table, fields, filter, paginate, format, joins);
+    async read(table, fields, filter, paginate, format, joins, resolvedOrGroup) {
+        const { query: query, replacements: replacements } = (0, $bf24bb53f537fa46$export$60d67f341ad4c4)(table, fields, filter, paginate, format, joins, resolvedOrGroup);
         const result = await (0, $b05f0a427b6f271e$export$2e2bcd8739ae039).db.query(query, {
             type: (0, $dTx2I$QueryTypes).SELECT,
             raw: true,