@objectstack/service-analytics 17.3.0 → 17.4.0

package/dist/index.cjs

@@ -41,7 +41,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/analytics-service.ts
-var import_data6 = require("@objectstack/spec/data");
+var import_data8 = require("@objectstack/spec/data");
 var import_ui2 = require("@objectstack/spec/ui");
 var import_core6 = require("@objectstack/core");
 var import_types = require("@objectstack/types");
@@ -86,14 +86,36 @@ var CubeRegistry = class {
     this.cubes.clear();
   }
   /**
-   * Auto-generate a cube definition from an object schema.
+   * Auto-generate a cube definition from an object's FIELD SCHEMA, and register
+   * it under `objectName`.
+   *
+   * ⚠️ Nothing in this repository calls this — the only in-tree caller is a unit
+   * test, and every cube the platform registers itself comes from one of the
+   * three sources named on the class above (#15019). That is not the same thing
+   * as unreachable: `CubeRegistry` is exported from the package entry and
+   * `AnalyticsService.cubeRegistry` is public, so a consumer of
+   * `@objectstack/service-analytics` can call it, and what it mints does reach
+   * the wire — `getMeta()` serves the labels below as `CubeMeta` titles. Whether
+   * this published method is removed or wired up as a real cube source is #15019.
    *
-   * Heuristic rules:
-   * - `number` fields → `sum`, `avg`, `min`, `max` measures
-   * - `boolean` fields → `count` measure (count where true)
-   * - All non-computed fields → dimensions
-   * - `date`/`datetime` fields → time dimensions with standard granularities
-   * - A default `count` measure is always added
+   * Heuristic rules, measured by driving the built package (the list this
+   * replaces claimed three behaviours the code does not have — `min`/`max`
+   * measures, a `count` measure for booleans, and a computed-field exclusion):
+   * - `number` / `currency` / `percent` fields → one `sum` and one `avg` measure
+   *   each, labelled with the field's label plus ` (Sum)` / ` (Avg)`. No `min`
+   *   or `max` measure is minted.
+   * - EVERY field becomes a dimension; there is no computed-field exclusion (the
+   *   `fields` parameter carries no flag one could exclude on).
+   * - `boolean` fields become a `boolean` DIMENSION and nothing else — no count
+   *   measure is minted for them.
+   * - `date` / `datetime` fields → `time` dimensions granulated
+   *   day/week/month/quarter/year.
+   * - A default `count` measure labelled `Count` is always added.
+   *
+   * Those three defaults (`Count`, and the two composites) are English literals
+   * with no i18n hook; #14492's ruling listed the `Count` one as a site to carry
+   * the `builtinAggregate` discriminator, and it was left alone because no
+   * in-repo path reaches it.
    *
    * @param objectName - The snake_case object name (used as table/cube name)
    * @param fields - Array of field descriptors `{ name, type, label? }`
@@ -161,19 +183,47 @@ var CubeRegistry = class {
   }
 };
 
+// src/measure-result-type.ts
+var import_data = require("@objectstack/spec/data");
+var MEASURE_RESULT_TYPE_TEMPORAL = "time";
+var MEASURE_RESULT_TYPE_STRING = "string";
+var TEMPORAL_SOURCE_FIELD_TYPES = /* @__PURE__ */ new Set([
+  "date",
+  "datetime",
+  "time"
+]);
+var STRING_SOURCE_FIELD_TYPES = /* @__PURE__ */ new Set([
+  // Plain strings: text/textarea/email/url/phone/password/secret, the rich
+  // bodies (markdown/html/richtext/code), and color/signature/qrcode.
+  ...import_data.STRING_VALUE_TYPES,
+  // One declared option code — select/radio.
+  ...import_data.SINGLE_OPTION_TYPES,
+  // The referenced row's id — lookup/master_detail/tree/user.
+  ...import_data.REFERENCE_VALUE_TYPES,
+  // The rendered record number, zero-padded under the default `{0000}`.
+  "autonumber"
+]);
+function measureResultType(aggregate2, sourceFieldType) {
+  if (aggregate2 !== "min" && aggregate2 !== "max") return void 0;
+  if (sourceFieldType === void 0) return void 0;
+  if (TEMPORAL_SOURCE_FIELD_TYPES.has(sourceFieldType)) return MEASURE_RESULT_TYPE_TEMPORAL;
+  if (STRING_SOURCE_FIELD_TYPES.has(sourceFieldType)) return MEASURE_RESULT_TYPE_STRING;
+  return void 0;
+}
+
 // src/strategies/filter-normalizer.ts
-var import_data2 = require("@objectstack/spec/data");
+var import_data3 = require("@objectstack/spec/data");
 var import_api = require("@objectstack/spec/api");
 
 // src/comparand-shape.ts
 var import_core = require("@objectstack/core");
-var import_data = require("@objectstack/spec/data");
+var import_data2 = require("@objectstack/spec/data");
 function isBindableComparand(value) {
   if (value === void 0) return true;
-  return (0, import_data.isAcceptedFilterComparand)(value) || ArrayBuffer.isView(value);
+  return (0, import_data2.isAcceptedFilterComparand)(value) || ArrayBuffer.isView(value);
 }
 function isRenderableTextComparand(value) {
-  return value === void 0 || (0, import_data.isAcceptedFilterComparand)(value);
+  return value === void 0 || (0, import_data2.isAcceptedFilterComparand)(value);
 }
 function isFieldReference(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) return false;
@@ -271,7 +321,7 @@ function shapePreview(value) {
   }
 }
 function unrenderableTextComparandMessage(op, field, value) {
-  return `"${op}" on "${field}" matches against the TEXT of a pattern, but its comparand is ${Array.isArray(value) ? "an array" : "an object"} (${shapePreview(value)}). filter.zod.ts declares it a string (StringOperatorSchema); ${import_data.ACCEPTED_FILTER_COMPARAND_TYPES_SENTENCE} is accepted. Refusing rather than stringifying it: String({}) is "[object Object]", so the pattern that ran would be one nobody wrote \u2014 and a row storing that literal text matches it.`;
+  return `"${op}" on "${field}" matches against the TEXT of a pattern, but its comparand is ${Array.isArray(value) ? "an array" : "an object"} (${shapePreview(value)}). filter.zod.ts declares it a string (StringOperatorSchema); ${import_data2.ACCEPTED_FILTER_COMPARAND_TYPES_SENTENCE} is accepted. Refusing rather than stringifying it: String({}) is "[object Object]", so the pattern that ran would be one nobody wrote \u2014 and a row storing that literal text matches it.`;
 }
 function fieldReferenceComparandMessage(op, field, ref, position) {
   return `"${op}" on "${field}"${position ? ` (${position})` : ""} compares against the field reference { "$field": "${ref}" }, which this compiler does not lower into a column-to-column comparison. Refusing rather than binding it: the reference object used to become the BOUND VALUE of the comparison, so the emitted predicate compared "${field}" against the reference itself \u2014 a value no row can hold \u2014 and a read scope built from it answered the wrong row set with nothing to read. \u26A0\uFE0F This is NOT the platform declining the rule. @objectstack/spec declares this shape (FieldReferenceSchema), @objectstack/formula resolves it per record in memory, driver-sql / driver-sqlite-wasm compile it to a same-table column comparison for the six scalar operators since #5222, and since the 2026-08-12 ruling on #7598 the analytics native-SQL strategy DECLINES such a query so it routes to the ObjectQL engine path and runs there \u2014 the driver enforcing declared-only enumeration, the tenant-isolation ban and the comparison class with metadata it owns. What refuses here is this SQL lowering, whose only remaining caller is the /analytics/sql display echo; it has no faithful rendering of the predicate the engine path actually runs, and half-rendering one would describe a query that returns different rows. Run the query itself (/analytics/query) to get its rows (#7598).`;
@@ -280,7 +330,7 @@ function fieldReferenceBetweenBoundMessage(op, field, ref, index) {
   return `"${op}" on "${field}" has the field reference { "$field": "${ref}" } at index ${index} of its [min, max] bounds. A range BOUND may not be a field reference on any backend: driver-sql and driver-sqlite-wasm refuse both endpoints (#5222), @objectstack/formula does not resolve a reference inside a list either \u2014 it orders the bounds against the raw reference object, which no value compares meaningfully to \u2014 and @objectstack/spec no longer declares the position at all (#7596 removed FieldReferenceSchema from the $between endpoint union, ADR-0049 declared = enforced). Refusing rather than lowering it: this compiler splits $between into its two bounds, so the reference would arrive at the driver under a "$gte" / "$lte" the author never wrote \u2014 a position the SQL drivers DO compile \u2014 and the range would quietly succeed here while the identical filter is refused everywhere else. Use a literal bound, or spell the comparison you meant as a scalar one ({ "${field}": { "$gte": { "$field": "${ref}" } } }), which IS served \u2014 on the ObjectQL engine path, where the driver enforces the #5222 rulings (#7598).`;
 }
 function unbindableListMemberMessage(op, field, value, index) {
-  return `"${op}" on "${field}" has a value at index ${index} of its list that cannot be bound as a SQL parameter: ${shapePreview(value)}. Every member of an $in/$nin/$between list is a comparand in its own right \u2014 use ${import_data.ACCEPTED_FILTER_COMPARAND_TYPES_SENTENCE} (or a binary value). Refusing rather than binding it: the member can equal no stored value, so the list silently loses that entry (and a $nin loses the exclusion the caller wrote).`;
+  return `"${op}" on "${field}" has a value at index ${index} of its list that cannot be bound as a SQL parameter: ${shapePreview(value)}. Every member of an $in/$nin/$between list is a comparand in its own right \u2014 use ${import_data2.ACCEPTED_FILTER_COMPARAND_TYPES_SENTENCE} (or a binary value). Refusing rather than binding it: the member can equal no stored value, so the list silently loses that entry (and a $nin loses the exclusion the caller wrote).`;
 }
 
 // src/strategies/filter-normalizer.ts
@@ -628,7 +678,7 @@ function nullSafeNegationOperand(node) {
 }
 function filterArrayNotLowerableError(where) {
   return invalidFilterError(
-    `[analytics] received a 'where' array that is not a filter: ${JSON.stringify(where)}. A filter array is a comparison [field, operator, value], a logical node ["and"|"or", ...conditions], or a list of those \u2014 it is INPUT-ONLY sugar (spec 'FilterArray'), lowered to a FilterCondition by @objectstack/spec parseFilterAST() at every door, this one included (#5158/#5334). This value cannot be lowered, and an unapplied filter would have charted the UNFILTERED dataset. Recognised operators: ${[...import_data2.VALID_AST_OPERATORS].sort().join(", ")}. Infix joins ([condA, "or", condB]) are NOT one of the shapes \u2014 write the prefix form ["or", condA, condB].`
+    `[analytics] received a 'where' array that is not a filter: ${JSON.stringify(where)}. A filter array is a comparison [field, operator, value], a logical node ["and"|"or", ...conditions], or a list of those \u2014 it is INPUT-ONLY sugar (spec 'FilterArray'), lowered to a FilterCondition by @objectstack/spec parseFilterAST() at every door, this one included (#5158/#5334). This value cannot be lowered, and an unapplied filter would have charted the UNFILTERED dataset. Recognised operators: ${[...import_data3.VALID_AST_OPERATORS].sort().join(", ")}. Infix joins ([condA, "or", condB]) are NOT one of the shapes \u2014 write the prefix form ["or", condA, condB].`
   );
 }
 function lowerAnalyticsWhere(query) {
@@ -637,8 +687,8 @@ function lowerAnalyticsWhere(query) {
   if (!where || typeof where !== "object") return null;
   if (Array.isArray(where)) {
     if (where.length === 0) return null;
-    if (!(0, import_data2.isFilterAST)(where)) throw filterArrayNotLowerableError(where);
-    const condition = (0, import_data2.parseFilterAST)(where);
+    if (!(0, import_data3.isFilterAST)(where)) throw filterArrayNotLowerableError(where);
+    const condition = (0, import_data3.parseFilterAST)(where);
     if (!condition || typeof condition !== "object" || Array.isArray(condition)) {
       throw invalidFilterError(
         `[analytics] filter array ${JSON.stringify(where)} passed isFilterAST() but parseFilterAST() lowered it to ${JSON.stringify(condition)}. Refusing rather than charting the dataset unfiltered (#5158/#5334).`
@@ -699,6 +749,86 @@ function asciiLowerSqlExpr(expr) {
   return `translate(${expr}, '${ASCII_UPPER_LETTERS}', '${ASCII_LOWER_LETTERS}')`;
 }
 
+// src/text-match-sql.ts
+var KNOWN_DIALECTS = /* @__PURE__ */ new Set(["sqlite", "postgres", "mysql"]);
+function normalizeSqlDialect(name) {
+  return typeof name === "string" && KNOWN_DIALECTS.has(name) ? name : "unknown";
+}
+function sqlDialectFor(ctx, objectName) {
+  const hook = ctx.sqlDialect;
+  if (typeof hook !== "function") return "unknown";
+  return normalizeSqlDialect(hook.call(ctx, objectName));
+}
+function escapeGlobPattern(value) {
+  return String(value).replace(/[*?[]/g, "[$&]");
+}
+function wrapShape(escaped, shape, wildcard) {
+  if (shape === "starts") return `${escaped}${wildcard}`;
+  if (shape === "ends") return `${wildcard}${escaped}`;
+  return `${wildcard}${escaped}${wildcard}`;
+}
+function globPattern(shape, value) {
+  return wrapShape(escapeGlobPattern(value), shape, "*");
+}
+function mysqlAsciiLowerBinarySql(expr) {
+  return asciiLowerReplaceSql(`CAST(${expr} AS BINARY)`);
+}
+function asciiLowerReplaceSql(expr) {
+  let out = expr;
+  for (let i = 0; i < ASCII_UPPER_LETTERS.length; i++) {
+    out = `REPLACE(${out}, '${ASCII_UPPER_LETTERS[i]}', '${ASCII_LOWER_LETTERS[i]}')`;
+  }
+  return out;
+}
+function textMatchPredicateSql(req) {
+  const { dialect, column, shape, value, bind: bind2 } = req;
+  const negate = req.negate === true;
+  const fold = req.fold === true;
+  if (dialect === "sqlite") {
+    const lower = (expr) => fold ? `lower(${expr})` : expr;
+    return `${lower(column)} ${negate ? "NOT GLOB" : "GLOB"} ${lower(bind2(globPattern(shape, value)))}`;
+  }
+  const keyword = negate ? "NOT LIKE" : "LIKE";
+  if (dialect === "mysql") {
+    const binary = (expr) => fold ? mysqlAsciiLowerBinarySql(expr) : `CAST(${expr} AS BINARY)`;
+    return `${binary(column)} ${keyword} ${binary(bind2(likePattern(shape, value)))} ESCAPE ${bind2(LIKE_ESCAPE_CHAR)}`;
+  }
+  const asciiLower = dialect === "postgres" ? asciiLowerSqlExpr : asciiLowerReplaceSql;
+  const folded = (expr) => fold ? asciiLower(expr) : expr;
+  return `${folded(column)} ${keyword} ${folded(bind2(likePattern(shape, value)))} ESCAPE ${bind2(LIKE_ESCAPE_CHAR)}`;
+}
+
+// src/non-text-column.ts
+var import_data4 = require("@objectstack/spec/data");
+function textOperatorPolarity(op) {
+  switch (op) {
+    case "$contains":
+    case "$startsWith":
+    case "$endsWith":
+    case "$icontains":
+    case "$like":
+    case "$ilike":
+    case "contains":
+    case "startsWith":
+    case "endsWith":
+    case "icontains":
+      return "positive";
+    case "$notContains":
+    case "notContains":
+      return "negative";
+    default:
+      return null;
+  }
+}
+function isNonTextDeclaredType(type) {
+  return typeof type === "string" && import_data4.NON_TEXT_STORED_VALUE_TYPES.has(type);
+}
+function nonTextColumnResolver(ctx, objectName) {
+  const declared = ctx.declaredFieldType;
+  if (typeof declared !== "function") return void 0;
+  return (field) => isNonTextDeclaredType(declared.call(ctx, objectName, field));
+}
+
 // src/read-scope-sql.ts
 var IDENT = /^[a-z_][a-z0-9_]*$/i;
 var READ_SCOPE_COMPILE_FAILED = "READ_SCOPE_COMPILE_FAILED";
@@ -709,6 +839,7 @@ function readScopeCompileError(message) {
   return err;
 }
 var FALSE_CLAUSE = "1 = 0";
+var TRUE_CLAUSE = "1 = 1";
 function isFilterNode(v) {
   return v !== null && typeof v === "object" && !Array.isArray(v);
 }
@@ -718,10 +849,10 @@ function quoteIdent(name, kind) {
   }
   return `"${name}"`;
 }
-function compileScopedFilterToSql(filter, alias) {
+function compileScopedFilterToSql(filter, alias, options = {}) {
   const quotedAlias = quoteIdent(alias, "alias");
   const params = [];
-  const sql = compileNode(filter, quotedAlias, params);
+  const sql = compileNode(filter, quotedAlias, params, options);
   return { sql, params };
 }
 function emptyMembershipFinding(spec, negated, path) {
@@ -771,12 +902,12 @@ function assertReadScopeCannotVacate(scope, objectName) {
     `[read-scope-sql] read scope for "${objectName}" has an empty $in under negation at ${found.path} \u2014 an empty membership matches nothing, so its negation matches every row and the read scope admits the whole table (fail-closed).`
   );
 }
-function compileSub(node, qAlias) {
+function compileSub(node, qAlias, opts) {
   const params = [];
-  const sql = compileNode(node, qAlias, params);
+  const sql = compileNode(node, qAlias, params, opts);
   return { sql, params };
 }
-function compileNode(node, qAlias, params) {
+function compileNode(node, qAlias, params, opts) {
   if (!isFilterNode(node)) {
     throw readScopeCompileError("[read-scope-sql] read scope must be a filter object (fail-closed).");
   }
@@ -790,7 +921,7 @@ function compileNode(node, qAlias, params) {
         if (key === "$or") clauses.push(FALSE_CLAUSE);
         continue;
       }
-      const compiled = value.map((child) => compileSub(child, qAlias));
+      const compiled = value.map((child) => compileSub(child, qAlias, opts));
       if (key === "$or" && compiled.some((c) => c.sql.length === 0)) continue;
       const kept = compiled.filter((c) => c.sql.length > 0);
       if (kept.length === 0) continue;
@@ -799,7 +930,7 @@ function compileNode(node, qAlias, params) {
       clauses.push(`(${kept.map((c) => c.sql).join(joiner)})`);
     } else if (key === "$not") {
       const operand = isFilterNode(value) ? nullSafeNegationOperand2(value) : value;
-      const inner = compileSub(operand, qAlias);
+      const inner = compileSub(operand, qAlias, opts);
       if (inner.sql.length === 0) {
         clauses.push(FALSE_CLAUSE);
       } else {
@@ -809,12 +940,12 @@ function compileNode(node, qAlias, params) {
     } else if (key.startsWith("$")) {
       throw readScopeCompileError(`[read-scope-sql] unsupported top-level operator "${key}" (fail-closed).`);
     } else {
-      clauses.push(compileField(key, value, qAlias, params));
+      clauses.push(compileField(key, value, qAlias, params, opts));
     }
   }
   return clauses.join(" AND ");
 }
-function compileField(field, value, qAlias, params) {
+function compileField(field, value, qAlias, params, opts) {
   const col = `${qAlias}.${quoteIdent(field, "field")}`;
   assertDefinedComparands2(field, value);
   assertBooleanFlagComparands(field, value);
@@ -834,7 +965,7 @@ function compileField(field, value, qAlias, params) {
   }
   const parts = [];
   for (const op of keys) {
-    parts.push(compileOperator(col, op, ops[op], field, params));
+    parts.push(compileOperator(col, op, ops[op], field, params, opts));
   }
   return parts.length === 1 ? parts[0] : `(${parts.join(" AND ")})`;
 }
@@ -842,8 +973,20 @@ function bind(params, v) {
   params.push(v);
   return "?";
 }
-function bindLike(params, pattern) {
-  return `${bind(params, pattern)} ESCAPE ${bind(params, LIKE_ESCAPE_CHAR)}`;
+function textMatch(col, shape, val, negate, params, opts, fold = false) {
+  return textMatchPredicateSql({
+    dialect: normalizeSqlDialect(opts.dialect),
+    column: col,
+    shape,
+    value: val,
+    negate,
+    fold,
+    bind: (v) => bind(params, v)
+  });
+}
+function textOverNonTextColumn(op, field, opts) {
+  if (!opts.nonTextColumn || !opts.nonTextColumn(field)) return null;
+  return textOperatorPolarity(op) === "negative" ? TRUE_CLAUSE : FALSE_CLAUSE;
 }
 function nullSafeNegative(col, test) {
   return `(${col} IS NULL OR ${test})`;
@@ -908,7 +1051,7 @@ function assertNoFieldReferenceComparand2(field, spec) {
     });
   }
 }
-function compileOperator(col, op, val, field, params) {
+function compileOperator(col, op, val, field, params, opts) {
   switch (op) {
     case "$eq":
       return val === null ? `${col} IS NULL` : `${col} = ${bind(params, val)}`;
@@ -942,12 +1085,19 @@ function compileOperator(col, op, val, field, params) {
       return `${col} BETWEEN ${bind(params, val[0])} AND ${bind(params, val[1])}`;
     }
     // [#5567] The comparand is a LITERAL, so it is escaped and the escape
-    // character is bound with it. See {@link bindLike}.
+    // character is bound with it. See {@link textMatch}.
     // [#5234] …and it must be a value `String()` can render, which is asserted
-    // BEFORE `likePattern` sees it — see {@link assertRenderableText}.
+    // BEFORE a pattern is built from it — see {@link assertRenderableText}.
+    // [#14079] Every text arm asks {@link textOverNonTextColumn} AFTER its
+    // comparand gate and BEFORE it binds: a comparand the contract refuses is
+    // still refused, and a column whose stored value is never text gets the
+    // contract's constant instead of a match over a number.
+    // [#15684] …and the four case-EXACT arms take their construct from the
+    // DIALECT ({@link textMatch}): a plain `LIKE` folds ASCII case on SQLite,
+    // so this scope ADMITTED rows the policy excludes — over-reach (#3948).
     case "$contains":
       assertRenderableText(op, field, val);
-      return `${col} LIKE ${bindLike(params, likePattern("contains", val))}`;
+      return textOverNonTextColumn(op, field, opts) ?? textMatch(col, "contains", val, false, params, opts);
     /**
      * [#6520] `$icontains` on the READ-SCOPE lowering — the one compiler in this
      * package where a wrong answer is an ADR-0021 scope over-reach rather than a
@@ -963,23 +1113,39 @@ function compileOperator(col, op, val, field, params) {
      * the rows already lower-case — and on a read scope that is a row set the
      * policy author never wrote, in the narrowing direction here but in the
      * WIDENING direction under a `$not`.
+     *
+     * [#15780] …and WHICH fold is the DIALECT's answer, exactly as the keyword
+     * is for the case-exact arms. This line used to spell its own binds and
+     * emit `translate()` unconditionally, on the reasoning that a
+     * case-INSENSITIVE operator never wants the per-dialect case-EXACT
+     * construct. The first half of that was right and the second half hid the
+     * defect: `translate()` is Postgres/Oracle, so on a SQLite datasource this
+     * read scope compiled to a statement the engine could not PARSE — an RLS
+     * policy that cannot be evaluated at all. It goes through
+     * {@link textMatch} now with `fold` set, which keeps `translate()` on
+     * Postgres, emits `lower(col) GLOB lower(?)` on SQLite, the nested-
+     * `REPLACE` binary fold on MySQL and — [#16028] — the same `REPLACE` chain
+     * without the cast on the `unknown` residue, because a datasource whose
+     * dialect nothing answered can BE SQLite and `translate()` failed to parse
+     * there just as loudly through this compiler as through the other two. The
+     * `ESCAPE`
+     * binding is still never folded — the construct table owns that, and the
+     * SQLite arm has no `ESCAPE` clause to bind at all.
      */
-    case "$icontains": {
+    case "$icontains":
       assertRenderableText(op, field, val);
-      const patternRef = asciiLowerSqlExpr(bind(params, likePattern("contains", val)));
-      return `${asciiLowerSqlExpr(col)} LIKE ${patternRef} ESCAPE ${bind(params, LIKE_ESCAPE_CHAR)}`;
-    }
+      return textOverNonTextColumn(op, field, opts) ?? textMatch(col, "contains", val, false, params, opts, true);
     // [#5298] NULL-safe: `NOT LIKE` is UNKNOWN for a NULL column, and "does not
     // contain" is true of a value that is not there.
     case "$notContains":
       assertRenderableText(op, field, val);
-      return nullSafeNegative(col, `${col} NOT LIKE ${bindLike(params, likePattern("contains", val))}`);
+      return textOverNonTextColumn(op, field, opts) ?? nullSafeNegative(col, textMatch(col, "contains", val, true, params, opts));
     case "$startsWith":
       assertRenderableText(op, field, val);
-      return `${col} LIKE ${bindLike(params, likePattern("starts", val))}`;
+      return textOverNonTextColumn(op, field, opts) ?? textMatch(col, "starts", val, false, params, opts);
     case "$endsWith":
       assertRenderableText(op, field, val);
-      return `${col} LIKE ${bindLike(params, likePattern("ends", val))}`;
+      return textOverNonTextColumn(op, field, opts) ?? textMatch(col, "ends", val, false, params, opts);
     // [#6387] `val` is a boolean here — {@link assertBooleanFlagComparands}
     // refused anything else at {@link compileField}, before this emitter runs.
     // So `=== true` is an exhaustive TWO-WAY choice over the declared domain,
@@ -1410,7 +1576,10 @@ var NativeSQLStrategy = class {
     if (typeof ctx.getReadScope !== "function") return;
     const filter = ctx.getReadScope(objectName);
     if (filter === void 0 || filter === null) return;
-    const { sql, params: scopeParams } = compileScopedFilterToSql(filter, alias);
+    const { sql, params: scopeParams } = compileScopedFilterToSql(filter, alias, {
+      nonTextColumn: nonTextColumnResolver(ctx, objectName),
+      dialect: sqlDialectFor(ctx, objectName)
+    });
     assertReadScopeCannotVacate(filter, objectName);
     if (!sql) return;
     let i = 0;
@@ -1688,12 +1857,16 @@ var NativeSQLStrategy = class {
       gte: ">=",
       lt: "<",
       lte: "<=",
+      // [#15684 / #15780] For every text operator these entries are the
+      // OPERATOR GATE, not the emitted keyword: `text-match-sql.ts` picks
+      // `LIKE` or `GLOB` per dialect below. ⛔ Reading these five as the
+      // emitted SQL is exactly the mistake #15780 was — `$icontains` was the
+      // last row still emitting the keyword written here, together with a
+      // `translate()` fold SQLite cannot parse.
       contains: "LIKE",
       notContains: "NOT LIKE",
       startsWith: "LIKE",
       endsWith: "LIKE",
-      // [#6520] `$icontains` — `LIKE` like its neighbours; what separates it is
-      // the ASCII fold applied below, not the keyword.
       icontains: "LIKE"
     };
     const likeShape = {
@@ -1719,13 +1892,22 @@ var NativeSQLStrategy = class {
     if (!sqlOp || !values || values.length === 0) return null;
     const shape = likeShape[operator];
     if (shape) {
-      params.push(likePattern(shape, values[0]));
-      const patternRef = `$${params.length}`;
-      params.push(LIKE_ESCAPE_CHAR);
-      if (operator === "icontains") {
-        return `${asciiLowerSqlExpr(rawCol)} ${sqlOp} ${asciiLowerSqlExpr(patternRef)} ESCAPE $${params.length}`;
+      const polarity = textOperatorPolarity(operator);
+      if (polarity && nonTextColumnResolver(ctx, target.object)?.(target.field)) {
+        return polarity === "negative" ? SQL_CONST_TRUE : SQL_CONST_FALSE;
       }
-      return `${rawCol} ${sqlOp} ${patternRef} ESCAPE $${params.length}`;
+      return textMatchPredicateSql({
+        dialect: sqlDialectFor(ctx, target.object),
+        column: rawCol,
+        shape,
+        value: values[0],
+        negate: operator === "notContains",
+        fold: operator === "icontains",
+        bind: (v) => {
+          params.push(v);
+          return `$${params.length}`;
+        }
+      });
     }
     if (operator === "lte") {
       const nextDay = (0, import_core2.nextUtcCalendarDay)(values[0]);
@@ -1758,7 +1940,7 @@ var NativeSQLStrategy = class {
 };
 
 // src/strategies/objectql-strategy.ts
-var import_data3 = require("@objectstack/spec/data");
+var import_data5 = require("@objectstack/spec/data");
 var import_core3 = require("@objectstack/core");
 
 // src/strategies/cross-object-rebucket.ts
@@ -1826,15 +2008,25 @@ var SCALAR_SQL_OPS = {
   lte: "<="
 };
 var LIKE_SQL_OPS = {
-  contains: { sql: "LIKE", shape: "contains" },
-  notContains: { sql: "NOT LIKE", shape: "contains" },
-  startsWith: { sql: "LIKE", shape: "starts" },
-  endsWith: { sql: "LIKE", shape: "ends" },
-  // [#6520] `$icontains`: the same escaped pattern and bound `ESCAPE` as its
-  // four case-EXACT neighbours, with `fold` adding the ASCII-only case fold to
-  // both sides of the comparison. The flag is on this row alone — the family
-  // above it is case-sensitive by ruling (#4706 Q2 = A).
-  icontains: { sql: "LIKE", shape: "contains", fold: true }
+  // [#15684 / #15780] This table carries NO keyword, deliberately. Every row's
+  // construct comes from the DIALECT (`text-match-sql.ts`): `GLOB` on SQLite,
+  // `LIKE` over `CAST(… AS BINARY)` on MySQL, plain `LIKE` on Postgres, since a
+  // plain `LIKE` is case-exact on Postgres alone. #15684 kept a `sql` field
+  // here for the FOLDING row, which was the last row still emitting a keyword
+  // written locally — together with the `translate()` fold that could not parse
+  // on SQLite. #15780 moved that row onto the table too, so the field had no
+  // reader left, and a dead field named `sql` sitting beside a compiler is an
+  // invitation to read it as the emitted keyword.
+  //
+  // What survives here is only what the construct table cannot derive from the
+  // operator name: which POLARITY the row is (`negate`) and whether it FOLDS
+  // (`fold`), each spelled once. `fold` is on `icontains` ALONE — the four
+  // above it are case-SENSITIVE by ruling (#4706 Q2 = A).
+  contains: { shape: "contains" },
+  notContains: { shape: "contains", negate: true },
+  startsWith: { shape: "starts" },
+  endsWith: { shape: "ends" },
+  icontains: { shape: "contains", fold: true }
 };
 var ObjectQLStrategy = class {
   constructor() {
@@ -2004,7 +2196,7 @@ var ObjectQLStrategy = class {
       for (const m of query.measures) {
         const { field, method } = this.resolveMeasureAggregation(cube, m);
         const measureFilter = datasetScope?.measureFilters?.[m];
-        const predicate = measureFilter ? this.renderFilterNodeSql(normalizeAnalyticsFilterTree({ where: measureFilter }), cube, params) : null;
+        const predicate = measureFilter ? this.renderFilterNodeSql(normalizeAnalyticsFilterTree({ where: measureFilter }), cube, params, ctx) : null;
         const aggSql = predicate ? this.conditionalAggregateSql(method, field, predicate) : method === "count" ? "COUNT(*)" : method === "count_distinct" ? `COUNT(DISTINCT ${field})` : `${method.toUpperCase()}(${field})`;
         selectParts.push(`${aggSql} AS "${m}"`);
       }
@@ -2013,14 +2205,16 @@ var ObjectQLStrategy = class {
     const filterClause = this.renderFilterNodeSql(
       normalizeAnalyticsFilterTree(query),
       cube,
-      params
+      params,
+      ctx
     );
     if (filterClause) whereParts.push(filterClause);
     if (datasetScope?.filter) {
       const scopeSql = this.renderFilterNodeSql(
         normalizeAnalyticsFilterTree({ where: datasetScope.filter }),
         cube,
-        params
+        params,
+        ctx
       );
       if (scopeSql) whereParts.push(scopeSql);
     }
@@ -2033,7 +2227,10 @@ var ObjectQLStrategy = class {
     }
     const scope = ctx.getReadScope?.(tableName);
     if (scope != null) {
-      const { sql: scopeSql, params: scopeParams } = compileScopedFilterToSql(scope, tableName);
+      const { sql: scopeSql, params: scopeParams } = compileScopedFilterToSql(scope, tableName, {
+        nonTextColumn: nonTextColumnResolver(ctx, tableName),
+        dialect: sqlDialectFor(ctx, tableName)
+      });
       assertReadScopeCannotVacate(scope, tableName);
       if (scopeSql) {
         let i = 0;
@@ -2077,12 +2274,12 @@ var ObjectQLStrategy = class {
    * predicate. `$and` makes that structurally impossible.
    */
   withReadScope(objectName, filter, ctx) {
-    const userFilter = Object.keys(filter).length > 0 ? (0, import_data3.markFilterSubtreeProvenance)(filter, "author") : void 0;
+    const userFilter = Object.keys(filter).length > 0 ? (0, import_data5.markFilterSubtreeProvenance)(filter, "author") : void 0;
     if (typeof ctx.getReadScope !== "function") return userFilter;
     const scope = ctx.getReadScope(objectName);
     if (scope === void 0 || scope === null) return userFilter;
     assertReadScopeCannotVacate(scope, objectName);
-    const scopeFilter = (0, import_data3.markFilterSubtreeProvenance)(scope, "policy");
+    const scopeFilter = (0, import_data5.markFilterSubtreeProvenance)(scope, "policy");
     if (!userFilter) return scopeFilter;
     return { $and: [userFilter, scopeFilter] };
   }
@@ -2395,7 +2592,7 @@ var ObjectQLStrategy = class {
     const idFilter = { id: { $in: fkValues } };
     const scope = typeof ctx.getReadScope === "function" ? ctx.getReadScope(refObject) : null;
     if (scope != null) assertReadScopeCannotVacate(scope, refObject);
-    if (scope != null) (0, import_data3.markFilterSubtreeProvenance)(scope, "policy");
+    if (scope != null) (0, import_data5.markFilterSubtreeProvenance)(scope, "policy");
     const filter = scope != null ? { $and: [idFilter, scope] } : idFilter;
     const rows = await ctx.executeAggregate(refObject, {
       groupBy: ["id", attr],
@@ -2467,7 +2664,7 @@ var ObjectQLStrategy = class {
    * not render that operator": #5333 was exactly that conflation, and an
    * unrenderable operator now THROWS (see the exit below).
    */
-  buildFilterClauseSql(col, operator, values, params) {
+  buildFilterClauseSql(col, operator, values, params, target, ctx) {
     if (operator === "set") return `${col} IS NOT NULL`;
     if (operator === "notSet") return `${col} IS NULL`;
     if (!values || values.length === 0) return null;
@@ -2480,12 +2677,22 @@ var ObjectQLStrategy = class {
     }
     const like = LIKE_SQL_OPS[operator];
     if (like) {
-      params.push(likePattern(like.shape, values[0]));
-      const patternRef = `$${params.length}`;
-      params.push(LIKE_ESCAPE_CHAR);
-      const lhs = like.fold ? asciiLowerSqlExpr(col) : col;
-      const rhs = like.fold ? asciiLowerSqlExpr(patternRef) : patternRef;
-      return `${lhs} ${like.sql} ${rhs} ESCAPE $${params.length}`;
+      const polarity = textOperatorPolarity(operator);
+      if (polarity && target && ctx && nonTextColumnResolver(ctx, target.object)?.(target.field)) {
+        return polarity === "negative" ? SQL_CONST_TRUE : SQL_CONST_FALSE;
+      }
+      return textMatchPredicateSql({
+        dialect: target && ctx ? sqlDialectFor(ctx, target.object) : "unknown",
+        column: col,
+        shape: like.shape,
+        value: values[0],
+        negate: like.negate === true,
+        fold: like.fold === true,
+        bind: (v) => {
+          params.push(v);
+          return `$${params.length}`;
+        }
+      });
     }
     const op = SCALAR_SQL_OPS[operator];
     if (!op) {
@@ -2524,6 +2731,29 @@ var ObjectQLStrategy = class {
     }
     return void 0;
   }
+  /**
+   * [#14079] The (object, field) a filter member binds against — the echo's
+   * copy of `NativeSQLStrategy.resolveStorageTarget`, kept beside the
+   * `LIKE_SQL_OPS` table for the same reason that table is a copy: this file
+   * renders a description of the statement THAT compiler produces, and the
+   * declared-type test both apply is keyed by object and field. A dotted
+   * `sql` is a relationship path (ADR-0071): every segment but the last is a
+   * hop whose join alias is the dot-to-`__` spelling the dataset compiler keys
+   * `cube.joins` by, the last is the column.
+   */
+  resolveStorageTarget(cube, member, baseObject) {
+    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 segments = rawSql.split(".");
+      const field = segments[segments.length - 1];
+      const relPath = segments.slice(0, -1).join(".");
+      const object = cube.joins?.[relPath.replace(/\./g, "__")]?.name ?? relPath;
+      return { object, field };
+    }
+    return { object: baseObject, field: rawSql.replace(/^\$/, "") };
+  }
   resolveFieldName(cube, member, kind) {
     if (kind === "dimension" || kind === "any") {
       const dim = this.lookupMember(cube, member, "dimension");
@@ -2663,7 +2893,7 @@ var ObjectQLStrategy = class {
    * exactly — including the invariant that a `null` return leaves `params`
    * untouched, so no comparand is left with no placeholder to consume it.
    */
-  renderFilterNodeSql(node, cube, params) {
+  renderFilterNodeSql(node, cube, params, ctx) {
     if (!node) return null;
     if (node.kind === "const") {
       return node.value ? SQL_CONST_TRUE : SQL_CONST_FALSE;
@@ -2673,17 +2903,23 @@ var ObjectQLStrategy = class {
         this.resolveFieldName(cube, node.member, "any"),
         node.operator,
         node.values,
-        params
+        params,
+        // [#14079] The (object, field) this member binds against, resolved the
+        // way `NativeSQLStrategy.resolveStorageTarget` resolves it, so the echo
+        // asks the declared-type hook the same question the executed statement
+        // asked and prints the same constant for a non-text column.
+        this.resolveStorageTarget(cube, node.member, this.extractObjectName(cube)),
+        ctx
       );
     }
     if (node.kind === "not") {
-      const inner = this.renderFilterNodeSql(node.child, cube, params);
+      const inner = this.renderFilterNodeSql(node.child, cube, params, ctx);
       return inner ? `NOT (${inner})` : SQL_CONST_FALSE;
     }
     const paramBase = params.length;
     const parts = [];
     for (const child of node.children) {
-      const clause = this.renderFilterNodeSql(child, cube, params);
+      const clause = this.renderFilterNodeSql(child, cube, params, ctx);
       if (clause === null) {
         if (node.kind !== "or") continue;
         params.length = paramBase;
@@ -2938,10 +3174,10 @@ var ObjectQLStrategy = class {
 };
 
 // src/dataset-compiler.ts
-var import_data4 = require("@objectstack/spec/data");
+var import_data6 = require("@objectstack/spec/data");
 var import_ui = require("@objectstack/spec/ui");
 var UNSUPPORTED_AGGREGATES = /* @__PURE__ */ new Set();
-var SUPPORTED_AGGREGATES = import_data4.AggregationFunction.options.filter((a) => !UNSUPPORTED_AGGREGATES.has(a));
+var SUPPORTED_AGGREGATES = import_data6.AggregationFunction.options.filter((a) => !UNSUPPORTED_AGGREGATES.has(a));
 function aggregateToMetricType(m) {
   if (!m.aggregate) {
     throw new Error(`[dataset-compiler] non-derived measure "${m.name}" has no aggregate`);
@@ -3103,7 +3339,7 @@ function compileDataset(dataset, resolver, options) {
 }
 
 // src/dataset-executor.ts
-var import_data5 = require("@objectstack/spec/data");
+var import_data7 = require("@objectstack/spec/data");
 var import_core4 = require("@objectstack/core");
 function resolveSelectionTokens(compiled, selection, context) {
   const tokenCtx = (0, import_core4.filterTokenContextFrom)(context, /* @__PURE__ */ new Date());
@@ -3143,7 +3379,7 @@ function evaluateDerivedMeasures(rows, derived) {
 }
 function fillEmptyGroups(rows, columnAggregates) {
   for (const [column, aggregate2] of Object.entries(columnAggregates)) {
-    const empty = (0, import_data5.emptyGroupValueFor)(aggregate2);
+    const empty = (0, import_data7.emptyGroupValueFor)(aggregate2);
     if (empty === void 0) continue;
     for (const row of rows) if (row[column] == null) row[column] = empty;
   }
@@ -3897,25 +4133,55 @@ function bucketDate(value, granularity, timezone) {
       return `${y}-${m}-${day}`;
   }
 }
-function aggregate(rows, metricType, field) {
-  if (metricType === "count" || field === "*") {
-    if (metricType === "countDistinct") {
-      return new Set(rows.map((r) => r[field]).filter((v) => v != null)).size;
+function numericOperand(v) {
+  if (typeof v === "number") return Number.isFinite(v) ? v : null;
+  if (typeof v === "string" && v.trim() !== "") {
+    const n = Number(v);
+    return Number.isFinite(n) ? n : null;
+  }
+  return null;
+}
+function compareOperands(a, b) {
+  const an = numericOperand(a);
+  const bn = numericOperand(b);
+  if (an !== null && bn !== null) return an - bn;
+  return compare(a, b);
+}
+function extremumOf(rows, field, kind) {
+  let winner;
+  let seen = false;
+  for (const r of rows) {
+    const v = r[field];
+    if (v == null) continue;
+    if (!seen) {
+      winner = v;
+      seen = true;
+      continue;
     }
-    return rows.length;
+    const c = compareOperands(v, winner);
+    if (kind === "min" ? c < 0 : c > 0) winner = v;
   }
+  return seen ? winner : null;
+}
+function aggregate(rows, metricType, field) {
+  if (metricType === "count" || field === "*") return rows.length;
   const nums = rows.map((r) => Number(r[field])).filter((n) => Number.isFinite(n));
   switch (metricType) {
-    case "countDistinct":
+    // The spec's spelling (`AggregationFunction`), which is what the compiler
+    // copies through. It used to be spelled `countDistinct` here — a word no
+    // producer mints — so the arm was UNREACHABLE and the measure fell to the
+    // numeric `default` below, answering a sum of coerced values (or a row
+    // count) under the author's `count_distinct` name.
+    case "count_distinct":
       return new Set(rows.map((r) => r[field]).filter((v) => v != null)).size;
     case "sum":
       return nums.reduce((a, b) => a + b, 0);
     case "avg":
       return nums.length ? nums.reduce((a, b) => a + b, 0) / nums.length : 0;
     case "min":
-      return nums.length ? Math.min(...nums) : 0;
+      return extremumOf(rows, field, "min");
     case "max":
-      return nums.length ? Math.max(...nums) : 0;
+      return extremumOf(rows, field, "max");
     default:
       return nums.length ? nums.reduce((a, b) => a + b, 0) : rows.length;
   }
@@ -3976,7 +4242,19 @@ function evaluateAnalyticsQueryOverRows(query, cube, rows) {
   return {
     rows: limited,
     fields: [
-      ...dimensions.map((d) => ({ name: d, type: "string" })),
+      // A dimension column is described by the CUBE dimension's own type — the
+      // same expression `NativeSQLStrategy.buildFieldMeta` and its ObjectQL
+      // sibling use (`d?.type || 'string'`), so a `date` dataset dimension is
+      // `'time'` here exactly as it is on the live path. Minting `'string'` for
+      // every dimension made the same column two different things depending
+      // only on whether a pending seed draft existed (#16203 (b)).
+      ...dimensions.map((d) => ({ name: d, type: String(cube.dimensions?.[d]?.type || "string") })),
+      // ⛔ A MEASURE column keeps the `'number'` every producer in the platform
+      // mints for it, live faces included. Correcting it is one rule owned by
+      // `measureResultType` (#15768/#16101) and applied at the ADR-0021
+      // descriptor pass; a second copy of it here would be two implementations
+      // free to drift, over a question this producer cannot answer anyway (it
+      // has the cube, not the source object's declared field types).
       ...query.measures.map((m) => ({ name: m, type: "number" }))
     ]
   };
@@ -4109,7 +4387,17 @@ var AnalyticsService = class {
       },
       coerceTemporalFilterValue: config.coerceTemporalFilterValue,
       coerceTemporalFilterColumn: config.coerceTemporalFilterColumn,
-      isExternalObject: config.isExternalObject
+      isExternalObject: config.isExternalObject,
+      // [#14079] The declared field type, read off the same `sourceFieldMeta`
+      // hook the display chains use — so the three SQL compilers can give a
+      // text operator over a numeric or boolean column the contract's answer
+      // at compile time. A host that wired no hook answers `undefined`, and
+      // the compilers keep the behaviour they had.
+      declaredFieldType: (object, field) => config.sourceFieldMeta?.(object, field)?.type,
+      // [#15684] The dialect that will run the compiled statement, so the
+      // case-EXACT text family picks a construct that IS case-exact there.
+      // Same tiering as the hook above: `undefined` keeps today's `LIKE`.
+      sqlDialect: (object) => config.sqlDialect?.(object)
     };
     const builtIn = [
       new NativeSQLStrategy(),
@@ -4325,10 +4613,10 @@ var AnalyticsService = class {
           query: async (q) => evaluateAnalyticsQueryOverRows(q, compiled.cube, seedRows)
         };
         const previewResult = await new DatasetExecutor(previewService).execute(compiled, selection, context);
+        this.enrichResultColumns(previewResult, dataset, selection, context);
         return previewResult;
       }
     }
-    const requestLocale = context?.locale;
     const provider = this.readScopeProvider;
     const resolveScope = provider ? (targetObject) => provider(targetObject, context) : void 0;
     const labelDeps = this.labelResolver ? withLabelFetchCache(this.labelResolver) : void 0;
@@ -4364,7 +4652,7 @@ var AnalyticsService = class {
       }
       throw err;
     }
-    const selectedDims = (selection.dimensions ?? []).map((name) => dataset.dimensions?.find((d) => d.name === name)).filter((d) => !!d);
+    const selectedDims = this.selectedDimensions(dataset, selection);
     const drillDims = selectedDims.filter((d) => !!d.field && d.type !== "date");
     if (drillDims.length && result.rows.length) {
       result.object = dataset.object;
@@ -4433,6 +4721,48 @@ var AnalyticsService = class {
         }
       }
     }
+    this.enrichResultColumns(result, dataset, selection, context);
+    return result;
+  }
+  /**
+   * The dataset dimensions this selection GROUPED THE GRID BY, resolved against
+   * the dataset definition. Shared by drill metadata, row-value label
+   * resolution and — through {@link enrichResultColumns} — the dimension column
+   * headers, so all three answer "which dimensions" the same way.
+   */
+  selectedDimensions(dataset, selection) {
+    return (selection.dimensions ?? []).map((name) => dataset.dimensions?.find((d) => d.name === name)).filter((d) => !!d);
+  }
+  /**
+   * ADR-0021 — describe the result's COLUMNS from the dataset's own authored
+   * definition: a measure's `label` / `format` / `currency` / `percentScale` /
+   * `builtinAggregate` and the `type` its aggregate really returns, then a
+   * dimension column's header `label`.
+   *
+   * **Every key here is read off the DATASET** (the authored measure or
+   * dimension) **and `sourceFieldMeta`** (the source object's declared field
+   * metadata). Not one is read off `result.rows`. That is what makes this one
+   * seam serve both paths that produce a dataset response — the live engine
+   * query and the ADR-0037 P3 draft-data preview — and it is why #16097 was a
+   * defect rather than a deliberate omission: the preview branch returns ~250
+   * lines before this ran, so a response over drafted seed rows carried none of
+   * these keys and a renderer fell back to humanizing the raw measure name and
+   * guessing a percent scale from magnitude — the exact failures #5537,
+   * objectui#3136 and #14492 each closed on the live path.
+   *
+   * Extracted rather than copied onto the second path, for the reason the
+   * `type` correction below already gives for living here at all: this is ONE
+   * rule holding both halves of the question, and a per-path copy would be two
+   * implementations of it, free to drift.
+   *
+   * ⛔ Not here, and deliberately: dimension VALUE label resolution
+   * ({@link resolveDimensionLabels}), which rewrites the grouped value in each
+   * ROW. That reads the rows, it is the one enrichment a seed-draft row set can
+   * make unnecessary, and the preview path skips it on purpose — see the note
+   * at that early return.
+   */
+  enrichResultColumns(result, dataset, selection, context) {
+    const requestLocale = context?.locale;
     if (result.fields?.length && dataset.measures?.length) {
       const measureByName = new Map(dataset.measures.map((m) => [m.name, m]));
       for (const f of result.fields) {
@@ -4455,11 +4785,13 @@ var AnalyticsService = class {
           }
         }
         if (f.percentScale == null) {
-          f.percentScale = m.derived?.op === "ratio" ? "fraction" : (0, import_data6.percentScaleOf)(meta);
+          f.percentScale = m.derived?.op === "ratio" ? "fraction" : (0, import_data8.percentScaleOf)(meta);
         }
+        const resultType = measureResultType(m.aggregate, meta?.type);
+        if (resultType) f.type = resultType;
       }
     }
-    const describableDims = [...selectedDims];
+    const describableDims = [...this.selectedDimensions(dataset, selection)];
     for (const t of selection.timeDimensions ?? []) {
       if (describableDims.some((d2) => d2.name === t.dimension)) continue;
       const d = dataset.dimensions?.find((x) => x.name === t.dimension);
@@ -4476,7 +4808,6 @@ var AnalyticsService = class {
         if (label !== void 0) f.label = label;
       }
     }
-    return result;
   }
   /**
    * Get cube metadata for discovery.
@@ -5022,12 +5353,12 @@ var FallbackDelegateStrategy = class {
 };
 
 // src/plugin.ts
-var import_data7 = require("@objectstack/spec/data");
+var import_data9 = require("@objectstack/spec/data");
 function parseEngineAggregateFunction(method, alias) {
-  const parsed = import_data7.AggregationFunction.safeParse(method);
+  const parsed = import_data9.AggregationFunction.safeParse(method);
   if (!parsed.success) {
     throw new Error(
-      `[Analytics] The aggregate bridge cannot forward the aggregation "${alias}": "${method}" is not one of the engine's aggregate functions (${import_data7.AggregationFunction.options.join(", ")}). A custom-SQL measure is refused earlier, with a caller-facing diagnostic, by ObjectQLStrategy; reaching this point means the analytics layer produced a method the engine contract does not declare.`
+      `[Analytics] The aggregate bridge cannot forward the aggregation "${alias}": "${method}" is not one of the engine's aggregate functions (${import_data9.AggregationFunction.options.join(", ")}). A custom-SQL measure is refused earlier, with a caller-facing diagnostic, by ObjectQLStrategy; reaching this point means the analytics layer produced a method the engine contract does not declare.`
     );
   }
   return parsed.data;
@@ -5310,6 +5641,16 @@ var AnalyticsServicePlugin = class {
       }
       return columnSql;
     };
+    const sqlDialect = (objectName) => {
+      try {
+        const svc = ctx.getService("data");
+        const driver = svc?.getDriverForObject?.(objectName);
+        const named = driver?.dialectName;
+        return typeof named === "string" ? named : void 0;
+      } catch {
+        return void 0;
+      }
+    };
     const config = {
       cubes: this.options.cubes,
       logger: ctx.logger,
@@ -5351,6 +5692,8 @@ var AnalyticsServicePlugin = class {
       // prevent: it drifts by one step, silently, and the drift only surfaces as
       // an error message pointing at the wrong database.
       getObjectDatasource: (objectName) => dataEngine()?.resolveEffectiveDatasource?.(objectName),
+      // [#15684] The executing driver's own dialect — see `sqlDialect` above.
+      sqlDialect,
       // ADR-0062 D6 — a federated object carries an `external` block (ADR-0015).
       // Reported so NativeSQLStrategy declines it (its hand-compiled FROM would
       // hit the wrong physical table) and the driver-correct ObjectQL path runs.