@objectstack/service-analytics 9.9.0 → 9.10.0

package/dist/index.cjs

@@ -358,6 +358,7 @@ var NativeSQLStrategy = class {
   }
   canHandle(query, ctx) {
     if (!query.cube) return false;
+    if (query.timeDimensions?.some((td) => !!td.granularity)) return false;
     const caps = ctx.queryCapabilities(query.cube);
     return caps.nativeSql && typeof ctx.executeRawSql === "function";
   }
@@ -397,7 +398,8 @@ var NativeSQLStrategy = class {
     if (normalizedFilters.length > 0) {
       for (const filter of normalizedFilters) {
         const colExpr = this.resolveFieldSql(cube, filter.member, tableName, joins);
-        const clause = this.buildFilterClause(colExpr, filter.operator, filter.values, params);
+        const target = this.resolveStorageTarget(cube, filter.member, tableName);
+        const clause = this.buildFilterClause(colExpr, filter.operator, filter.values, params, ctx, target);
         if (clause) whereClauses.push(clause);
       }
     }
@@ -407,7 +409,11 @@ var NativeSQLStrategy = class {
         if (td.dateRange) {
           const range = Array.isArray(td.dateRange) ? td.dateRange : [td.dateRange, td.dateRange];
           if (range.length === 2) {
-            params.push(range[0], range[1]);
+            const td2 = this.resolveStorageTarget(cube, td.dimension, tableName);
+            params.push(
+              this.coerceTemporal(ctx, td2, range[0]),
+              this.coerceTemporal(ctx, td2, range[1])
+            );
             whereClauses.push(`${colExpr} BETWEEN $${params.length - 1} AND $${params.length}`);
           }
         }
@@ -571,7 +577,48 @@ var NativeSQLStrategy = class {
     const fieldName = member.includes(".") ? member.split(".")[1] : member;
     return fieldName;
   }
-  buildFilterClause(col, operator, values, params) {
+  /**
+   * Resolve the (object, column) a filter member binds against, so its
+   * comparand can be coerced to that column's on-disk storage form.
+   *
+   * Mirrors `resolveFieldSql`'s `sql` resolution but yields the *logical*
+   * target rather than the qualified SQL:
+   *   - A dotted column (`account.region`, emitted for a relation traversal)
+   *     belongs to the JOINED object — resolve the alias → target table via the
+   *     cube's `joins` map (alias `account` → object `crm_account` when
+   *     namespaced) and take the tail as the column.
+   *   - Otherwise the column lives on the cube's BASE table. Use the dimension's
+   *     resolved `sql` (the real column, which may differ from the member name,
+   *     e.g. dimension `assessed` → column `assessed_at`) rather than the member.
+   */
+  resolveStorageTarget(cube, member, baseTable) {
+    const dim = this.lookupMember(cube, member, "dimension");
+    const measure = dim ? void 0 : this.lookupMember(cube, member, "measure");
+    const rawSql = dim?.sql ?? measure?.sql ?? (member.includes(".") ? member.split(".").slice(1).join(".") : member);
+    if (rawSql.includes(".")) {
+      const [alias, ...rest] = rawSql.split(".");
+      const object = cube.joins?.[alias]?.name ?? alias;
+      return { object, field: rest.join(".") };
+    }
+    return { object: baseTable, field: rawSql };
+  }
+  /**
+   * Apply the storage-form coercion for a single comparand. Prefers the
+   * driver-backed `coerceTemporalFilterValue` hook (single source of truth for
+   * the date/datetime storage convention — see StrategyContext); when the hook
+   * is absent, or returns the value unchanged (the field is not a temporal
+   * column, or the dialect stores it as a native timestamp), falls back to the
+   * generic boolean/number recovery so non-temporal typed columns still bind
+   * correctly.
+   */
+  coerceTemporal(ctx, target, value) {
+    if (typeof ctx.coerceTemporalFilterValue === "function") {
+      const coerced = ctx.coerceTemporalFilterValue(target.object, target.field, value);
+      if (coerced !== value) return coerced;
+    }
+    return coerceFilterValueForSql(value);
+  }
+  buildFilterClause(col, operator, values, params, ctx, target) {
     const opMap = {
       equals: "=",
       notEquals: "!=",
@@ -587,7 +634,7 @@ var NativeSQLStrategy = class {
     if (operator === "in" || operator === "notIn") {
       if (!values || values.length === 0) return null;
       const placeholders = values.map((v) => {
-        params.push(coerceFilterValueForSql(v));
+        params.push(this.coerceTemporal(ctx, target, v));
         return `$${params.length}`;
       }).join(", ");
       return `${col} ${operator === "in" ? "IN" : "NOT IN"} (${placeholders})`;
@@ -597,7 +644,7 @@ var NativeSQLStrategy = class {
     if (operator === "contains" || operator === "notContains") {
       params.push(`%${values[0]}%`);
     } else {
-      params.push(coerceFilterValueForSql(values[0]));
+      params.push(this.coerceTemporal(ctx, target, values[0]));
     }
     return `${col} ${sqlOp} $${params.length}`;
   }
@@ -1467,7 +1514,8 @@ var AnalyticsService = class {
       fallbackService: config.fallbackService,
       // Prefer a compiled dataset's declared relationships (D-C join allowlist);
       // fall back to any explicitly-configured provider for legacy cubes.
-      getAllowedRelationships: (cubeName) => this.datasetRegistry.get(cubeName)?.allowedRelationships ?? config.getAllowedRelationships?.(cubeName)
+      getAllowedRelationships: (cubeName) => this.datasetRegistry.get(cubeName)?.allowedRelationships ?? config.getAllowedRelationships?.(cubeName),
+      coerceTemporalFilterValue: config.coerceTemporalFilterValue
     };
     const builtIn = [
       new NativeSQLStrategy(),
@@ -2012,6 +2060,17 @@ var AnalyticsServicePlugin = class {
       }
       return pending ? rows : null;
     };
+    const coerceTemporalFilterValue = (objectName, fieldName, value) => {
+      try {
+        const svc = ctx.getService("data");
+        const driver = svc?.getDriverForObject?.(objectName);
+        if (driver && typeof driver.temporalFilterValue === "function") {
+          return driver.temporalFilterValue(objectName, fieldName, value);
+        }
+      } catch {
+      }
+      return value;
+    };
     const config = {
       cubes: this.options.cubes,
       logger: ctx.logger,
@@ -2021,6 +2080,7 @@ var AnalyticsServicePlugin = class {
       fallbackService,
       getReadScope,
       getAllowedRelationships: this.options.getAllowedRelationships,
+      coerceTemporalFilterValue,
       relationshipResolver,
       labelResolver,
       draftRowsResolver