@object-ui/data-objectstack 4.0.11 → 4.0.12

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @object-ui/data-objectstack
 
+## 4.0.12
+
+### Patch Changes
+
+- @object-ui/types@4.0.12
+- @object-ui/core@4.0.12
+
 ## 4.0.11
 
 ### Patch Changes

package/dist/index.cjs

@@ -881,6 +881,26 @@ function objectFilterEntryToAST(entry) {
   if (!field || !op) return null;
   return [String(field), op, entry.value];
 }
+function translateFilterToAST(filter) {
+  if (filter === void 0 || filter === null) return void 0;
+  if (Array.isArray(filter)) {
+    if (filter.length === 0) return void 0;
+    const first = filter[0];
+    const isObjectForm = filter.length > 0 && typeof first === "object" && first !== null && !Array.isArray(first) && first.field !== void 0;
+    if (isObjectForm) {
+      const tuples = filter.map((entry) => objectFilterEntryToAST(entry)).filter((t) => t !== null);
+      if (tuples.length === 0) return void 0;
+      if (tuples.length === 1) return tuples[0];
+      return ["and", ...tuples];
+    }
+    return filter;
+  }
+  if (typeof filter === "object") {
+    if (Object.keys(filter).length === 0) return void 0;
+    return filter;
+  }
+  return void 0;
+}
 var discoveryCache = /* @__PURE__ */ new Map();
 async function getSharedDiscovery(baseUrl, fetcher) {
   const key = baseUrl || "<default>";
@@ -1387,9 +1407,9 @@ var ObjectStackAdapter = class {
       }
     }
     if (params.$filter !== void 0 && params.$filter !== null) {
-      const isEmpty = Array.isArray(params.$filter) ? params.$filter.length === 0 : typeof params.$filter === "object" && Object.keys(params.$filter).length === 0;
-      if (!isEmpty) {
-        queryParams.set("filter", JSON.stringify(params.$filter));
+      const translated = translateFilterToAST(params.$filter);
+      if (translated !== void 0) {
+        queryParams.set("filter", JSON.stringify(translated));
       }
     }
     const baseUrl = this.baseUrl.replace(/\/$/, "");

package/dist/index.js

@@ -838,6 +838,26 @@ function objectFilterEntryToAST(entry) {
   if (!field || !op) return null;
   return [String(field), op, entry.value];
 }
+function translateFilterToAST(filter) {
+  if (filter === void 0 || filter === null) return void 0;
+  if (Array.isArray(filter)) {
+    if (filter.length === 0) return void 0;
+    const first = filter[0];
+    const isObjectForm = filter.length > 0 && typeof first === "object" && first !== null && !Array.isArray(first) && first.field !== void 0;
+    if (isObjectForm) {
+      const tuples = filter.map((entry) => objectFilterEntryToAST(entry)).filter((t) => t !== null);
+      if (tuples.length === 0) return void 0;
+      if (tuples.length === 1) return tuples[0];
+      return ["and", ...tuples];
+    }
+    return filter;
+  }
+  if (typeof filter === "object") {
+    if (Object.keys(filter).length === 0) return void 0;
+    return filter;
+  }
+  return void 0;
+}
 var discoveryCache = /* @__PURE__ */ new Map();
 async function getSharedDiscovery(baseUrl, fetcher) {
   const key = baseUrl || "<default>";
@@ -1344,9 +1364,9 @@ var ObjectStackAdapter = class {
       }
     }
     if (params.$filter !== void 0 && params.$filter !== null) {
-      const isEmpty = Array.isArray(params.$filter) ? params.$filter.length === 0 : typeof params.$filter === "object" && Object.keys(params.$filter).length === 0;
-      if (!isEmpty) {
-        queryParams.set("filter", JSON.stringify(params.$filter));
+      const translated = translateFilterToAST(params.$filter);
+      if (translated !== void 0) {
+        queryParams.set("filter", JSON.stringify(translated));
       }
     }
     const baseUrl = this.baseUrl.replace(/\/$/, "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@object-ui/data-objectstack",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "description": "ObjectStack Data Adapter for Object UI",
   "license": "MIT",
   "type": "module",
@@ -23,8 +23,8 @@
   ],
   "dependencies": {
     "@objectstack/client": "^4.0.5",
-    "@object-ui/core": "4.0.11",
-    "@object-ui/types": "4.0.11"
+    "@object-ui/core": "4.0.12",
+    "@object-ui/types": "4.0.12"
   },
   "devDependencies": {
     "tsup": "^8.5.1",

package/src/index.ts

@@ -78,6 +78,54 @@ function objectFilterEntryToAST(entry: any): [string, string, any] | null {
   return [String(field), op, entry.value];
 }
 
+/**
+ * Translate any of the filter shapes accepted by ObjectUI into the AST format
+ * understood by the ObjectStack server's `parseFilterAST()`.
+ *
+ * Accepted inputs:
+ *   - `[{ field, operator, value }, ...]` — ViewFilterRule[] from view configs
+ *   - `[field, op, value]`                — single AST tuple (passed through)
+ *   - `['and'|'or', ...children]`         — logical AST node (passed through)
+ *   - `[[...], [...]]`                    — legacy nested AST (passed through)
+ *   - `{ field: value }` / `{ field: { $op: value } }` — MongoDB-style object
+ *
+ * Returns `undefined` when the input is empty/unrecognized so callers can
+ * skip emitting `?filter=` entirely.
+ */
+function translateFilterToAST(filter: unknown): unknown | undefined {
+  if (filter === undefined || filter === null) return undefined;
+
+  if (Array.isArray(filter)) {
+    if (filter.length === 0) return undefined;
+
+    // Object form: [{ field, operator, value }, ...]
+    const first = filter[0];
+    const isObjectForm = filter.length > 0
+      && typeof first === 'object'
+      && first !== null
+      && !Array.isArray(first)
+      && (first as any).field !== undefined;
+    if (isObjectForm) {
+      const tuples = (filter as any[])
+        .map(entry => objectFilterEntryToAST(entry))
+        .filter((t): t is [string, string, any] => t !== null);
+      if (tuples.length === 0) return undefined;
+      if (tuples.length === 1) return tuples[0];
+      return ['and', ...tuples];
+    }
+
+    // Already AST — pass through.
+    return filter;
+  }
+
+  if (typeof filter === 'object') {
+    if (Object.keys(filter as Record<string, unknown>).length === 0) return undefined;
+    return filter;
+  }
+
+  return undefined;
+}
+
 // Module-level discovery cache. Multiple ObjectStackAdapter instances pointed
 // at the same baseUrl (e.g. ConditionalAuthWrapper's throwaway adapter +
 // AdapterProvider's main adapter) would otherwise each fire `/discovery`. By
@@ -844,13 +892,15 @@ export class ObjectStackAdapter<T = unknown> implements DataSource<T> {
       }
     }
 
-    // Filter — drop empty arrays/objects so we don't send `?filter=%5B%5D`
+    // Filter — translate ViewFilterRule[] (`[{field, operator, value}]`)
+    // and other shapes into AST tuples the server understands. Without this,
+    // server-driven views (e.g. `at_risk_accounts`, `hot_leads`) ship raw
+    // `[{field,operator,value}]` arrays which `parseFilterAST` silently
+    // discards, returning every record instead of the filtered subset.
     if (params.$filter !== undefined && params.$filter !== null) {
-      const isEmpty = Array.isArray(params.$filter)
-        ? params.$filter.length === 0
-        : typeof params.$filter === 'object' && Object.keys(params.$filter).length === 0;
-      if (!isEmpty) {
-        queryParams.set('filter', JSON.stringify(params.$filter));
+      const translated = translateFilterToAST(params.$filter);
+      if (translated !== undefined) {
+        queryParams.set('filter', JSON.stringify(translated));
       }
     }