@holistics/cli-core 2.4.9 → 2.4.10

package/dist/commands.js

@@ -27805,7 +27805,7 @@ var require_dist3 = __commonJS((exports2) => {
   exports2.default = deferred;
 });
 // package.json
-var version = "2.4.9";
+var version = "2.4.10";
 
 // ../../node_modules/.pnpm/@commander-js+extra-typings@13.1.0_commander@13.1.0/node_modules/@commander-js/extra-typings/esm.mjs
 var import__ = __toESM(require_extra_typings(), 1);
@@ -135136,14 +135136,24 @@ var generateGrainControlCode = (e16) => {
   let { keepFilters: r3 } = e16.grainControl, i = n.map((e17) => modelFieldRefToAql(e17)).join(", "), a = r3 ? ", keep_filters: true" : "";
   return t === "keep" ? `keep_grains(${i}${a})` : t === "exclude" ? `exclude_grains(${i}${a})` : "";
 };
+var generateDateTransformationCode = (e16) => {
+  if (e16.truncationUnit)
+    return `${e16.truncationUnit}()`;
+  if (e16.datePartUnit)
+    return `${e16.datePartUnit}_num()`;
+};
 var generateBasicAggCode = (e16, t) => {
   if (t.type !== SpecType.BasicAgg)
     throw Error(`Invalid basic aggregation type: ${t.type}`);
   if (!t.source)
     throw Error("Missing field in basic aggregation");
-  let n = modelFieldRefToAql(t.source);
-  return [
-    ...t.source.fieldName ? [`${t.aggregationType}(${n})`] : [n, `${t.aggregationType}(1)`],
+  let n = modelFieldRefToAql(t.source), r3 = !t.source.fieldName, i = generateDateTransformationCode(t.source), a;
+  return a = r3 ? [n, `${t.aggregationType}(1)`] : i ? [
+    n,
+    i,
+    `${t.aggregationType}()`
+  ] : [`${t.aggregationType}(${n})`], [
+    ...a,
     t.conditionGroup ? generateWhereCode(e16, t.conditionGroup) : undefined,
     t.grainControl ? generateGrainControlCode(t.grainControl) : undefined
   ].filter(Boolean).join(" | ");
@@ -135190,7 +135200,8 @@ var formatConcatParam = (e16, t) => {
     throw Error(`Invalid field type: ${n}`);
   if (!isScalarType(r3.type))
     throw Error(`Invalid field data type: ${n}`);
-  return r3.type.sqlType === SqlType.TEXT ? n : `cast(${n}, 'text')`;
+  let i = generateDateTransformationCode(t);
+  return i ? `cast(${n} | ${i}, 'text')` : r3.type.sqlType === SqlType.TEXT ? n : `cast(${n}, 'text')`;
 };
 var generateConcatCode = (e16, t) => {
   if (t.type !== SpecType.Concat)
@@ -135360,6 +135371,51 @@ function resolveReference(e16, t) {
     return isFieldType(n) ? createModelFieldReference("", toRefString(t)) : createModelFieldReference(toRefString(t), "");
   throw Error(`Invalid expression for field name extraction: ${t.kind}`);
 }
+function resolveDateTransformation(e16, t) {
+  let { funcName: n, args: r3 } = getFuncInfo(t);
+  if (n === "date_trunc") {
+    if (r3.length !== 2)
+      throw Error(`Expected exactly 2 arguments for date_trunc, got: ${r3.length}`);
+    let t3 = resolveReference(e16, r3[0]);
+    if (!isTextLiteral(r3[1]))
+      throw Error(`Expected text literal for date_trunc unit, got: ${r3[1].kind}`);
+    let n3 = r3[1].value;
+    if (!isDateUnit(n3))
+      throw Error(`Unknown truncation unit: ${n3}`);
+    return {
+      field: t3,
+      truncationUnit: n3
+    };
+  }
+  if (r3.length !== 1)
+    throw Error(`Expected exactly 1 argument for date transformation function '${n}', got: ${r3.length}`);
+  let i = resolveReference(e16, r3[0]);
+  if (isDateUnit(n))
+    return {
+      field: i,
+      truncationUnit: n
+    };
+  if (n.endsWith("_num")) {
+    let e17 = getDateUnitFromDatePartFuncName(n);
+    if (!datePartUnits.includes(e17))
+      throw Error(`Unknown date part unit: ${e17}`);
+    return {
+      field: i,
+      datePartUnit: e17
+    };
+  }
+  throw Error(`Unknown date transformation function: ${n}`);
+}
+function resolveFieldSpec(e16, t) {
+  if (!isFunctionCallLikeExpression(t))
+    return resolveReference(e16, t);
+  let { field: n, truncationUnit: r3, datePartUnit: i } = resolveDateTransformation(e16, t);
+  return {
+    ...n,
+    ...r3 && { truncationUnit: r3 },
+    ...i && { datePartUnit: i }
+  };
+}
 function resolveMetricReference(e16, t) {
   let n = e16.getTypeFromExpression(t);
   if (n && !(isFieldType(n) && isMetricFieldType(n)))
@@ -135732,6 +135788,13 @@ function resolveAggregationAlias(e16) {
     throw Error(`Invalid aggregation type: ${e16}`);
   return t;
 }
+var truncationAggregations = [
+  "count",
+  "count_distinct",
+  "approx_count_distinct",
+  "min",
+  "max"
+];
 function parseAggregation(e16, t) {
   if (!isFunctionCallLikeExpression(t))
     throw Error("Expected function call for aggregation parsing");
@@ -135744,12 +135807,18 @@ function parseAggregation(e16, t) {
   if (isFieldType(a)) {
     if (r3.length !== 1)
       throw Error(`Expected exactly 1 argument for aggregation function, got: ${r3.length}`);
-  } else {
-    if (r3.length !== 2)
-      throw Error(`Expected exactly 2 arguments for aggregation function, got: ${r3.length}`);
-    if (!isNumberLiteral(r3[1]))
-      throw Error('Model aggregation function must have argument "1"');
+    let t3 = resolveFieldSpec(e16, r3[0]);
+    if (t3.truncationUnit && !truncationAggregations.includes(i))
+      throw Error(`Aggregation '${i}' is not supported on a truncated date`);
+    return {
+      aggregationType: i,
+      source: t3
+    };
   }
+  if (r3.length !== 2)
+    throw Error(`Expected exactly 2 arguments for aggregation function, got: ${r3.length}`);
+  if (!isNumberLiteral(r3[1]))
+    throw Error('Model aggregation function must have argument "1"');
   return {
     aggregationType: i,
     source: resolveReference(e16, r3[0])
@@ -135837,44 +135906,10 @@ var parseDateAdd = (e16, t) => {
     intervals: r3
   };
 };
-var parseDateTransformation = (e16, t) => {
-  let { funcName: n, args: r3 } = getFuncInfo(t);
-  if (n === "date_trunc") {
-    if (r3.length !== 2)
-      throw Error(`Expected exactly 2 arguments for date_trunc, got: ${r3.length}`);
-    let t3 = resolveReference(e16, r3[0]);
-    if (!isTextLiteral(r3[1]))
-      throw Error(`Expected text literal for date_trunc unit, got: ${r3[1].kind}`);
-    let n3 = r3[1].value;
-    if (!isDateUnit(n3))
-      throw Error(`Unknown truncation unit: ${n3}`);
-    return {
-      type: SpecType.DateTransformation,
-      field: t3,
-      truncationUnit: n3
-    };
-  }
-  if (r3.length !== 1)
-    throw Error(`Expected exactly 1 argument for date transformation function '${n}', got: ${r3.length}`);
-  let i = resolveReference(e16, r3[0]);
-  if (isDateUnit(n))
-    return {
-      type: SpecType.DateTransformation,
-      field: i,
-      truncationUnit: n
-    };
-  if (n.endsWith("_num")) {
-    let e17 = getDateUnitFromDatePartFuncName(n);
-    if (!datePartUnits.includes(e17))
-      throw Error(`Unknown date part unit: ${e17}`);
-    return {
-      type: SpecType.DateTransformation,
-      field: i,
-      datePartUnit: e17
-    };
-  }
-  throw Error(`Unknown date transformation function: ${n}`);
-};
+var parseDateTransformation = (e16, t) => ({
+  type: SpecType.DateTransformation,
+  ...resolveDateTransformation(e16, t)
+});
 var parseRunningTotal = (e16, t) => {
   let { funcName: n, args: r3 } = getFuncInfo(t);
   if (n !== "running_total")
@@ -135967,7 +136002,7 @@ var parseList = (e16, t) => {
 };
 var parseConcatParam = (e16, t) => {
   let { funcName: n, args: r3 } = tryGetFuncInfo(t) ?? {};
-  return n === "cast" && r3 ? parseConcatParam(e16, r3[0]) : isTextLiteral(t) ? createLiteralValue(t.value, SqlType.TEXT) : resolveReference(e16, t);
+  return n === "cast" && r3 ? parseConcatParam(e16, r3[0]) : isTextLiteral(t) ? createLiteralValue(t.value, SqlType.TEXT) : resolveFieldSpec(e16, t);
 };
 var parseConcat = (e16, t) => {
   let { funcName: n, args: r3 } = getFuncInfo(t);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@holistics/cli-core",
   "type": "module",
-  "version": "2.4.9",
+  "version": "2.4.10",
   "bin": {
     "holistics": "./bin/holistics.js"
   },