gencow 0.1.107 → 0.1.108

package/core/index.js

@@ -1904,12 +1904,77 @@ function createRlsDb(db, userId) {
 }
 
 // ../core/src/crud.ts
-import { eq, desc, asc, ilike, or, and, count as drizzleCount, getTableName } from "drizzle-orm";
+import { eq, ne, gt, gte, lt, lte, desc, asc, like, ilike, inArray, notInArray, or, and, count as drizzleCount, getTableName } from "drizzle-orm";
 function detectIdType(column) {
   const colType = column.dataType;
   if (colType === "string") return v.string();
   return v.number();
 }
+var MAX_FILTER_DEPTH = 5;
+var FILTER_OPS = ["eq", "ne", "gt", "gte", "lt", "lte", "in", "nin", "like", "ilike"];
+function isValidFilterOp(op) {
+  return FILTER_OPS.includes(op);
+}
+function applyFilterOp(col, op, value) {
+  switch (op) {
+    case "eq":
+      return eq(col, value);
+    case "ne":
+      return ne(col, value);
+    case "gt":
+      return gt(col, value);
+    case "gte":
+      return gte(col, value);
+    case "lt":
+      return lt(col, value);
+    case "lte":
+      return lte(col, value);
+    case "in":
+      if (!Array.isArray(value) || value.length === 0) return void 0;
+      return inArray(col, value);
+    case "nin":
+      if (!Array.isArray(value) || value.length === 0) return void 0;
+      return notInArray(col, value);
+    case "like":
+      if (typeof value !== "string") return void 0;
+      return like(col, value);
+    case "ilike":
+      if (typeof value !== "string") return void 0;
+      return ilike(col, value);
+    default:
+      return void 0;
+  }
+}
+function parseFilterNode(node, table, allowedFields, depth = 0) {
+  if (depth > MAX_FILTER_DEPTH) return void 0;
+  const conditions = [];
+  for (const [key, val] of Object.entries(node)) {
+    if (key === "OR") {
+      if (!Array.isArray(val)) continue;
+      const orConds = val.filter((child) => child != null && typeof child === "object" && !Array.isArray(child)).map((child) => parseFilterNode(child, table, allowedFields, depth + 1)).filter((c) => c !== void 0);
+      if (orConds.length > 0) conditions.push(or(...orConds));
+      continue;
+    }
+    if (key === "AND") {
+      if (!Array.isArray(val)) continue;
+      const andConds = val.filter((child) => child != null && typeof child === "object" && !Array.isArray(child)).map((child) => parseFilterNode(child, table, allowedFields, depth + 1)).filter((c) => c !== void 0);
+      if (andConds.length > 0) conditions.push(and(...andConds));
+      continue;
+    }
+    if (allowedFields && !allowedFields.includes(key)) continue;
+    const col = table[key];
+    if (!col) continue;
+    if (val != null && typeof val === "object" && !Array.isArray(val) && "op" in val) {
+      const { op, value } = val;
+      if (!isValidFilterOp(op)) continue;
+      const cond = applyFilterOp(col, op, value);
+      if (cond) conditions.push(cond);
+      continue;
+    }
+    conditions.push(eq(col, val));
+  }
+  return conditions.length > 0 ? and(...conditions) : void 0;
+}
 function crud(table, options) {
   const anyTable = table;
   const tableName = getTableName(table);
@@ -1938,12 +2003,14 @@ function crud(table, options) {
       );
       conditions.push(or(...searchConds));
     }
-    if (args?.filters && options?.allowedFilters?.length) {
-      for (const [key, value] of Object.entries(args.filters)) {
-        if (options.allowedFilters.includes(key) && anyTable[key]) {
-          conditions.push(eq(anyTable[key], value));
-        }
-      }
+    if (args?.filters && typeof args.filters === "object" && options?.allowedFilters?.length) {
+      const allowedFields = options.allowedFilters;
+      const filterCondition = parseFilterNode(
+        args.filters,
+        anyTable,
+        allowedFields
+      );
+      if (filterCondition) conditions.push(filterCondition);
     }
     return conditions.length > 0 ? and(...conditions) : void 0;
   }
@@ -2067,6 +2134,7 @@ function crud(table, options) {
 }
 export {
   GencowValidationError,
+  applyFilterOp,
   buildRealtimeCtx,
   createRlsDb,
   createScheduler,
@@ -2087,6 +2155,7 @@ export {
   mutation,
   ownerRls,
   parseArgs,
+  parseFilterNode,
   query,
   registerClient,
   subscribe,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gencow",
-    "version": "0.1.107",
+    "version": "0.1.108",
     "description": "Gencow — AI Backend Engine",
     "type": "module",
     "bin": {

package/server/index.js

@@ -1955,12 +1955,75 @@ var init_rls_db = __esm({
 });
 
 // ../core/src/crud.ts
-import { eq, desc, asc, ilike, or, and, count as drizzleCount, getTableName } from "drizzle-orm";
+import { eq, ne, gt, gte, lt, lte, desc, asc, like, ilike, inArray, notInArray, or, and, count as drizzleCount, getTableName } from "drizzle-orm";
 function detectIdType(column) {
   const colType = column.dataType;
   if (colType === "string") return v.string();
   return v.number();
 }
+function isValidFilterOp(op) {
+  return FILTER_OPS.includes(op);
+}
+function applyFilterOp(col, op, value) {
+  switch (op) {
+    case "eq":
+      return eq(col, value);
+    case "ne":
+      return ne(col, value);
+    case "gt":
+      return gt(col, value);
+    case "gte":
+      return gte(col, value);
+    case "lt":
+      return lt(col, value);
+    case "lte":
+      return lte(col, value);
+    case "in":
+      if (!Array.isArray(value) || value.length === 0) return void 0;
+      return inArray(col, value);
+    case "nin":
+      if (!Array.isArray(value) || value.length === 0) return void 0;
+      return notInArray(col, value);
+    case "like":
+      if (typeof value !== "string") return void 0;
+      return like(col, value);
+    case "ilike":
+      if (typeof value !== "string") return void 0;
+      return ilike(col, value);
+    default:
+      return void 0;
+  }
+}
+function parseFilterNode(node, table, allowedFields, depth = 0) {
+  if (depth > MAX_FILTER_DEPTH) return void 0;
+  const conditions = [];
+  for (const [key, val] of Object.entries(node)) {
+    if (key === "OR") {
+      if (!Array.isArray(val)) continue;
+      const orConds = val.filter((child) => child != null && typeof child === "object" && !Array.isArray(child)).map((child) => parseFilterNode(child, table, allowedFields, depth + 1)).filter((c) => c !== void 0);
+      if (orConds.length > 0) conditions.push(or(...orConds));
+      continue;
+    }
+    if (key === "AND") {
+      if (!Array.isArray(val)) continue;
+      const andConds = val.filter((child) => child != null && typeof child === "object" && !Array.isArray(child)).map((child) => parseFilterNode(child, table, allowedFields, depth + 1)).filter((c) => c !== void 0);
+      if (andConds.length > 0) conditions.push(and(...andConds));
+      continue;
+    }
+    if (allowedFields && !allowedFields.includes(key)) continue;
+    const col = table[key];
+    if (!col) continue;
+    if (val != null && typeof val === "object" && !Array.isArray(val) && "op" in val) {
+      const { op, value } = val;
+      if (!isValidFilterOp(op)) continue;
+      const cond = applyFilterOp(col, op, value);
+      if (cond) conditions.push(cond);
+      continue;
+    }
+    conditions.push(eq(col, val));
+  }
+  return conditions.length > 0 ? and(...conditions) : void 0;
+}
 function crud(table, options) {
   const anyTable = table;
   const tableName = getTableName(table);
@@ -1989,12 +2052,14 @@ function crud(table, options) {
       );
       conditions.push(or(...searchConds));
     }
-    if (args?.filters && options?.allowedFilters?.length) {
-      for (const [key, value] of Object.entries(args.filters)) {
-        if (options.allowedFilters.includes(key) && anyTable[key]) {
-          conditions.push(eq(anyTable[key], value));
-        }
-      }
+    if (args?.filters && typeof args.filters === "object" && options?.allowedFilters?.length) {
+      const allowedFields = options.allowedFilters;
+      const filterCondition = parseFilterNode(
+        args.filters,
+        anyTable,
+        allowedFields
+      );
+      if (filterCondition) conditions.push(filterCondition);
     }
     return conditions.length > 0 ? and(...conditions) : void 0;
   }
@@ -2116,11 +2181,14 @@ function crud(table, options) {
     remove: removeDef
   };
 }
+var MAX_FILTER_DEPTH, FILTER_OPS;
 var init_crud = __esm({
   "../core/src/crud.ts"() {
     "use strict";
     init_reactive();
     init_v();
+    MAX_FILTER_DEPTH = 5;
+    FILTER_OPS = ["eq", "ne", "gt", "gte", "lt", "lte", "in", "nin", "like", "ilike"];
   }
 });
 
@@ -2128,6 +2196,7 @@ var init_crud = __esm({
 var src_exports = {};
 __export(src_exports, {
   GencowValidationError: () => GencowValidationError,
+  applyFilterOp: () => applyFilterOp,
   buildRealtimeCtx: () => buildRealtimeCtx,
   createRlsDb: () => createRlsDb,
   createScheduler: () => createScheduler,
@@ -2148,6 +2217,7 @@ __export(src_exports, {
   mutation: () => mutation,
   ownerRls: () => ownerRls,
   parseArgs: () => parseArgs,
+  parseFilterNode: () => parseFilterNode,
   query: () => query,
   registerClient: () => registerClient,
   subscribe: () => subscribe,