@happyvertical/smrt-reports 0.57.32 → 0.57.34

package/dist/compiler.js

@@ -1,171 +1,2 @@
-import { getRuntimeReportOptions } from "./decorators.js";
-import { ObjectRegistry } from "@happyvertical/smrt-core";
-import { toSnakeCase } from "@happyvertical/smrt-core/utils";
-//#region src/compiler.ts
-var REPORT_BASE_FIELDS = /* @__PURE__ */ new Set([
-	"id",
-	"slug",
-	"context",
-	"created_at",
-	"updated_at",
-	"createdAt",
-	"updatedAt",
-	"refreshedAt"
-]);
-function sourceClassName(source) {
-	if (typeof source === "string") return source;
-	return source.name;
-}
-function reportOptionsFromRegistry(reportCtor) {
-	return (ObjectRegistry.getClassByConstructor(reportCtor) ?? ObjectRegistry.getClass(reportCtor.name))?.config?.report;
-}
-function getReportOptions(reportCtor) {
-	const options = getRuntimeReportOptions(reportCtor) ?? reportOptionsFromRegistry(reportCtor);
-	if (!options?.source) throw new Error(`${reportCtor.name} is missing @report({ source }) metadata. Decorate the report class with @report({ source: SourceClass }).`);
-	return options;
-}
-function getRegisteredClassName(ctor) {
-	const registered = ObjectRegistry.getClassByConstructor(ctor) ?? ObjectRegistry.getClass(ctor.name);
-	return registered?.qualifiedName ?? registered?.name ?? ctor.name;
-}
-function resolveTableName(className) {
-	const tableName = ObjectRegistry.getTableName(className);
-	if (!tableName) throw new Error(`No SMRT table registered for ${className}. Ensure the class is decorated with @smrt() and its manifest is loaded.`);
-	return tableName;
-}
-function parseWhereKey(key) {
-	const trimmed = key.trim();
-	const operators = [
-		" is not null",
-		" is null",
-		" not in",
-		" like",
-		" in",
-		" !=",
-		" >=",
-		" <=",
-		" >",
-		" <",
-		" ="
-	];
-	const lower = trimmed.toLowerCase();
-	for (const operator of operators) if (lower.endsWith(operator)) return {
-		field: trimmed.slice(0, -operator.length).trim(),
-		suffix: operator
-	};
-	return {
-		field: trimmed,
-		suffix: ""
-	};
-}
-function normalizeConditionKey(key, mapField) {
-	const { field, suffix } = parseWhereKey(key);
-	const mapped = mapField(field);
-	return suffix ? `${mapped}${suffix}` : mapped;
-}
-function normalizeWhere(where, mapField) {
-	if (!where) return void 0;
-	if (Array.isArray(where)) return where.map((andGroup) => andGroup.map((condition) => Object.fromEntries(Object.entries(condition).map(([key, value]) => [normalizeConditionKey(key, mapField), value]))));
-	return Object.fromEntries(Object.entries(where).map(([key, value]) => [normalizeConditionKey(key, mapField), value]));
-}
-function readReportMetadata(field) {
-	return field?._meta?.__report ?? field?.__report;
-}
-function isReportSystemField(fieldName, field) {
-	return REPORT_BASE_FIELDS.has(fieldName) || field?._meta?.__smrtSystemField || field?._meta?.__tenancy?.isTenantIdField;
-}
-async function buildReportDefinition(reportCtor) {
-	const options = getReportOptions(reportCtor);
-	const reportClassName = getRegisteredClassName(reportCtor);
-	const sourceName = sourceClassName(options.source);
-	const sourceTable = resolveTableName(sourceName);
-	const fields = await ObjectRegistry.getAllFields(reportClassName);
-	const reportFields = [];
-	for (const [fieldName, field] of fields.entries()) {
-		const report = readReportMetadata(field);
-		if (!report) {
-			if (!isReportSystemField(fieldName, field) && !field?.transient) throw new Error(`Report field ${reportCtor.name}.${fieldName} is neither a grouping key nor an aggregate. Add @groupBy(), a time-bucket decorator, or an aggregate decorator.`);
-			continue;
-		}
-		reportFields.push({
-			fieldName,
-			columnName: toSnakeCase(fieldName),
-			type: field.type,
-			report
-		});
-	}
-	return {
-		reportClassName,
-		sourceClassName: sourceName,
-		sourceTable,
-		fields: reportFields,
-		where: options.where,
-		having: options.having,
-		refresh: options.refresh
-	};
-}
-function sourceColumn(field) {
-	const report = field.report;
-	if (!report) throw new Error(`Report field ${field.fieldName} is missing metadata`);
-	if (report.kind === "group") return toSnakeCase(report.sourceColumn ?? field.fieldName);
-	if (report.kind === "bucket") return toSnakeCase(report.sourceColumn);
-	if (report.kind === "aggregate") {
-		if (!report.column) return "";
-		return toSnakeCase(report.column);
-	}
-	return "";
-}
-function getReportGroupingColumns(definition) {
-	const columns = definition.fields.filter((field) => field.report?.kind === "group" || field.report?.kind === "bucket").map((field) => field.columnName ?? toSnakeCase(field.fieldName));
-	return columns.length > 0 ? columns : ["id"];
-}
-function compileReportDefinition(definition) {
-	const select = [];
-	const groupBy = [];
-	const reportFieldToColumn = /* @__PURE__ */ new Map();
-	for (const field of definition.fields) {
-		const outputColumn = field.columnName ?? toSnakeCase(field.fieldName);
-		reportFieldToColumn.set(field.fieldName, outputColumn);
-		reportFieldToColumn.set(outputColumn, outputColumn);
-		const report = field.report;
-		if (!report) continue;
-		if (report.kind === "group") {
-			select.push({
-				column: sourceColumn(field),
-				as: outputColumn
-			});
-			groupBy.push(outputColumn);
-			continue;
-		}
-		if (report.kind === "bucket") {
-			select.push({
-				bucket: report.unit,
-				column: sourceColumn(field),
-				as: outputColumn
-			});
-			groupBy.push(outputColumn);
-			continue;
-		}
-		select.push({
-			fn: report.fn,
-			column: report.column ? sourceColumn(field) : void 0,
-			as: outputColumn,
-			distinct: report.distinct
-		});
-	}
-	if (select.length === 0) throw new Error(`${definition.reportClassName} has no report fields. Add @groupBy(), a time-bucket decorator, or an aggregate decorator.`);
-	return {
-		from: definition.sourceTable,
-		select,
-		groupBy,
-		where: normalizeWhere(definition.where, (field) => toSnakeCase(field)),
-		having: normalizeWhere(definition.having, (field) => reportFieldToColumn.get(field) ?? toSnakeCase(field))
-	};
-}
-async function compileReportSpec(reportCtor) {
-	return compileReportDefinition(await buildReportDefinition(reportCtor));
-}
-//#endregion
-export { buildReportDefinition, compileReportDefinition, compileReportSpec, getReportGroupingColumns };
-
-//# sourceMappingURL=compiler.js.map
+import { a as getReportGroupingColumns, i as compileReportSpec, n as buildReportDefinition, r as compileReportDefinition, t as REPORT_SOURCE_ALIAS } from "./chunks/compiler-IUB2YNgM.js";
+export { REPORT_SOURCE_ALIAS, buildReportDefinition, compileReportDefinition, compileReportSpec, getReportGroupingColumns };

package/dist/decorators.d.ts

@@ -1,7 +1,13 @@
-import type { ReportAggregateFn, ReportOptions } from './types.js';
+import type { ReportAggregateFn, ReportOperand, ReportOptions } from './types.js';
 export declare function report(options: ReportOptions): <T extends abstract new (...args: any[]) => any>(ctor: T) => T;
 export declare function getRuntimeReportOptions(ctor: Function): ReportOptions | undefined;
-export declare function groupBy(sourceColumn?: string): PropertyDecorator;
+/**
+ * Group by a source column (`'status'`), a joined model's column
+ * (`'wo.title'`), or a value computed from each row (`{ expr }`).
+ */
+export declare function groupBy(sourceColumnOrExpr?: string | {
+    expr: ReportOperand;
+}): PropertyDecorator;
 export declare const minute: (sourceColumn: string) => PropertyDecorator;
 export declare const hour: (sourceColumn: string) => PropertyDecorator;
 export declare const day: (sourceColumn: string) => PropertyDecorator;
@@ -9,29 +15,23 @@ export declare const week: (sourceColumn: string) => PropertyDecorator;
 export declare const month: (sourceColumn: string) => PropertyDecorator;
 export declare const quarter: (sourceColumn: string) => PropertyDecorator;
 export declare const year: (sourceColumn: string) => PropertyDecorator;
-export interface AggregateDecoratorOptions {
+export interface AggregateMeasureOptions {
+    distinct?: boolean;
+    /** Aggregate a computed value of each row instead of a column. */
+    expr?: ReportOperand;
+    /** Aggregate only the rows this predicate holds for (a filtered count or sum). */
+    filter?: ReportOperand;
+}
+export interface AggregateDecoratorOptions extends AggregateMeasureOptions {
     fn: ReportAggregateFn;
     column?: string;
-    distinct?: boolean;
 }
 export declare function aggregate(options: AggregateDecoratorOptions): PropertyDecorator;
-export declare const sum: (column?: string, options?: {
-    distinct?: boolean;
-}) => PropertyDecorator;
-export declare const avg: (column?: string, options?: {
-    distinct?: boolean;
-}) => PropertyDecorator;
-export declare const min: (column?: string, options?: {
-    distinct?: boolean;
-}) => PropertyDecorator;
-export declare const max: (column?: string, options?: {
-    distinct?: boolean;
-}) => PropertyDecorator;
+export declare const sum: (columnOrOptions?: string | AggregateMeasureOptions, options?: AggregateMeasureOptions) => PropertyDecorator;
+export declare const avg: (columnOrOptions?: string | AggregateMeasureOptions, options?: AggregateMeasureOptions) => PropertyDecorator;
+export declare const min: (columnOrOptions?: string | AggregateMeasureOptions, options?: AggregateMeasureOptions) => PropertyDecorator;
+export declare const max: (columnOrOptions?: string | AggregateMeasureOptions, options?: AggregateMeasureOptions) => PropertyDecorator;
 export declare function count(): PropertyDecorator;
-export declare function count(column: string, options?: {
-    distinct?: boolean;
-}): PropertyDecorator;
-export declare function count(options: {
-    distinct?: boolean;
-}): PropertyDecorator;
+export declare function count(column: string, options?: AggregateMeasureOptions): PropertyDecorator;
+export declare function count(options: AggregateMeasureOptions): PropertyDecorator;
 //# sourceMappingURL=decorators.d.ts.map

package/dist/decorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,iBAAiB,EAGjB,aAAa,EAEd,MAAM,YAAY,CAAC;AAIpB,wBAAgB,MAAM,CAAC,OAAO,EAAE,aAAa,IACnC,CAAC,SAAS,QAAQ,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,CAAC,KAAG,CAAC,CAIpE;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,QAAQ,GACb,aAAa,GAAG,SAAS,CAE3B;AAsBD,wBAAgB,OAAO,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAEhE;AAaD,eAAO,MAAM,MAAM,GAAI,cAAc,MAAM,sBAAmC,CAAC;AAC/E,eAAO,MAAM,IAAI,GAAI,cAAc,MAAM,sBAAiC,CAAC;AAC3E,eAAO,MAAM,GAAG,GAAI,cAAc,MAAM,sBAAgC,CAAC;AACzE,eAAO,MAAM,IAAI,GAAI,cAAc,MAAM,sBAAiC,CAAC;AAC3E,eAAO,MAAM,KAAK,GAAI,cAAc,MAAM,sBAAkC,CAAC;AAC7E,eAAO,MAAM,OAAO,GAAI,cAAc,MAAM,sBACX,CAAC;AAClC,eAAO,MAAM,IAAI,GAAI,cAAc,MAAM,sBAAiC,CAAC;AAE3E,MAAM,WAAW,yBAAyB;IACxC,EAAE,EAAE,iBAAiB,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,yBAAyB,GACjC,iBAAiB,CAOnB;AAOD,eAAO,MAAM,GAAG,YAJG,MAAM,YAAW;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,sBAId,CAAC;AAC7C,eAAO,MAAM,GAAG,YALG,MAAM,YAAW;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,sBAKd,CAAC;AAC7C,eAAO,MAAM,GAAG,YANG,MAAM,YAAW;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,sBAMd,CAAC;AAC7C,eAAO,MAAM,GAAG,YAPG,MAAM,YAAW;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,sBAOd,CAAC;AAE7C,wBAAgB,KAAK,IAAI,iBAAiB,CAAC;AAC3C,wBAAgB,KAAK,CACnB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC/B,iBAAiB,CAAC;AACrB,wBAAgB,KAAK,CAAC,OAAO,EAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,iBAAiB,CAAC"}
+{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAEV,iBAAiB,EAGjB,aAAa,EACb,aAAa,EAEd,MAAM,YAAY,CAAC;AAIpB,wBAAgB,MAAM,CAAC,OAAO,EAAE,aAAa,IACnC,CAAC,SAAS,QAAQ,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,CAAC,KAAG,CAAC,CAIpE;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,QAAQ,GACb,aAAa,GAAG,SAAS,CAE3B;AAsBD;;;GAGG;AACH,wBAAgB,OAAO,CACrB,kBAAkB,CAAC,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACpD,iBAAiB,CAWnB;AAaD,eAAO,MAAM,MAAM,GAAI,cAAc,MAAM,sBAAmC,CAAC;AAC/E,eAAO,MAAM,IAAI,GAAI,cAAc,MAAM,sBAAiC,CAAC;AAC3E,eAAO,MAAM,GAAG,GAAI,cAAc,MAAM,sBAAgC,CAAC;AACzE,eAAO,MAAM,IAAI,GAAI,cAAc,MAAM,sBAAiC,CAAC;AAC3E,eAAO,MAAM,KAAK,GAAI,cAAc,MAAM,sBAAkC,CAAC;AAC7E,eAAO,MAAM,OAAO,GAAI,cAAc,MAAM,sBACX,CAAC;AAClC,eAAO,MAAM,IAAI,GAAI,cAAc,MAAM,sBAAiC,CAAC;AAE3E,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,kEAAkE;IAClE,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,kFAAkF;IAClF,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAED,MAAM,WAAW,yBAA0B,SAAQ,uBAAuB;IACxE,EAAE,EAAE,iBAAiB,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,SAAS,CACvB,OAAO,EAAE,yBAAyB,GACjC,iBAAiB,CASnB;AAeD,eAAO,MAAM,GAAG,qBAXM,MAAM,GAAG,uBAAuB,YACzC,uBAAuB,sBAUQ,CAAC;AAC7C,eAAO,MAAM,GAAG,qBAZM,MAAM,GAAG,uBAAuB,YACzC,uBAAuB,sBAWQ,CAAC;AAC7C,eAAO,MAAM,GAAG,qBAbM,MAAM,GAAG,uBAAuB,YACzC,uBAAuB,sBAYQ,CAAC;AAC7C,eAAO,MAAM,GAAG,qBAdM,MAAM,GAAG,uBAAuB,YACzC,uBAAuB,sBAaQ,CAAC;AAE7C,wBAAgB,KAAK,IAAI,iBAAiB,CAAC;AAC3C,wBAAgB,KAAK,CACnB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,uBAAuB,GAChC,iBAAiB,CAAC;AACrB,wBAAgB,KAAK,CAAC,OAAO,EAAE,uBAAuB,GAAG,iBAAiB,CAAC"}

package/dist/decorators.js

@@ -18,10 +18,14 @@ function registerReportField(metadata) {
 		});
 	});
 }
-function groupBy(sourceColumn) {
+function groupBy(sourceColumnOrExpr) {
+	if (typeof sourceColumnOrExpr === "object" && sourceColumnOrExpr !== null) return registerReportField({
+		kind: "group",
+		expr: sourceColumnOrExpr.expr
+	});
 	return registerReportField({
 		kind: "group",
-		sourceColumn
+		sourceColumn: sourceColumnOrExpr
 	});
 }
 function bucket(unit, sourceColumn) {
@@ -43,15 +47,19 @@ function aggregate(options) {
 		kind: "aggregate",
 		fn: options.fn,
 		column: options.column,
+		...options.expr ? { expr: options.expr } : {},
+		...options.filter ? { filter: options.filter } : {},
 		distinct: options.distinct
 	});
 }
 function aggregateDecorator(fn) {
-	return (column, options = {}) => aggregate({
-		fn,
-		column,
-		distinct: options.distinct
-	});
+	return (columnOrOptions, options = {}) => {
+		return aggregate({
+			fn,
+			column: typeof columnOrOptions === "string" ? columnOrOptions : void 0,
+			...typeof columnOrOptions === "object" ? columnOrOptions : options
+		});
+	};
 }
 var sum = aggregateDecorator("sum");
 var avg = aggregateDecorator("avg");
@@ -61,7 +69,7 @@ function count(columnOrOptions, options = {}) {
 	return aggregate({
 		fn: "count",
 		column: typeof columnOrOptions === "string" ? columnOrOptions : void 0,
-		distinct: (typeof columnOrOptions === "object" ? columnOrOptions : options).distinct
+		...typeof columnOrOptions === "object" ? columnOrOptions : options
 	});
 }
 //#endregion

package/dist/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","names":[],"sources":["../src/decorators.ts"],"sourcesContent":["import {\n  ObjectRegistry,\n  registerCompatibleFieldDecorator,\n} from '@happyvertical/smrt-core';\nimport type {\n  ReportAggregateFieldMetadata,\n  ReportAggregateFn,\n  ReportBucketFieldMetadata,\n  ReportFieldMetadata,\n  ReportOptions,\n  ReportTimeBucketUnit,\n} from './types.js';\n\nconst reportOptionsByConstructor = new WeakMap<Function, ReportOptions>();\n\nexport function report(options: ReportOptions) {\n  return <T extends abstract new (...args: any[]) => any>(ctor: T): T => {\n    reportOptionsByConstructor.set(ctor, options);\n    return ctor;\n  };\n}\n\nexport function getRuntimeReportOptions(\n  ctor: Function,\n): ReportOptions | undefined {\n  return reportOptionsByConstructor.get(ctor);\n}\n\nfunction registerReportField(metadata: ReportFieldMetadata) {\n  return ((targetOrValue: any, propertyKeyOrContext: any) => {\n    registerCompatibleFieldDecorator(\n      targetOrValue,\n      propertyKeyOrContext,\n      (className, propertyKey, ctor) => {\n        const options = {\n          __report: metadata,\n        };\n        ObjectRegistry.registerFieldDecorator(\n          className,\n          propertyKey,\n          options,\n          ctor,\n        );\n      },\n    );\n  }) as PropertyDecorator;\n}\n\nexport function groupBy(sourceColumn?: string): PropertyDecorator {\n  return registerReportField({ kind: 'group', sourceColumn });\n}\n\nfunction bucket(\n  unit: ReportTimeBucketUnit,\n  sourceColumn: string,\n): PropertyDecorator {\n  return registerReportField({\n    kind: 'bucket',\n    unit,\n    sourceColumn,\n  } satisfies ReportBucketFieldMetadata);\n}\n\nexport const minute = (sourceColumn: string) => bucket('minute', sourceColumn);\nexport const hour = (sourceColumn: string) => bucket('hour', sourceColumn);\nexport const day = (sourceColumn: string) => bucket('day', sourceColumn);\nexport const week = (sourceColumn: string) => bucket('week', sourceColumn);\nexport const month = (sourceColumn: string) => bucket('month', sourceColumn);\nexport const quarter = (sourceColumn: string) =>\n  bucket('quarter', sourceColumn);\nexport const year = (sourceColumn: string) => bucket('year', sourceColumn);\n\nexport interface AggregateDecoratorOptions {\n  fn: ReportAggregateFn;\n  column?: string;\n  distinct?: boolean;\n}\n\nexport function aggregate(\n  options: AggregateDecoratorOptions,\n): PropertyDecorator {\n  return registerReportField({\n    kind: 'aggregate',\n    fn: options.fn,\n    column: options.column,\n    distinct: options.distinct,\n  } satisfies ReportAggregateFieldMetadata);\n}\n\nfunction aggregateDecorator(fn: ReportAggregateFn) {\n  return (column?: string, options: { distinct?: boolean } = {}) =>\n    aggregate({ fn, column, distinct: options.distinct });\n}\n\nexport const sum = aggregateDecorator('sum');\nexport const avg = aggregateDecorator('avg');\nexport const min = aggregateDecorator('min');\nexport const max = aggregateDecorator('max');\n\nexport function count(): PropertyDecorator;\nexport function count(\n  column: string,\n  options?: { distinct?: boolean },\n): PropertyDecorator;\nexport function count(options: { distinct?: boolean }): PropertyDecorator;\nexport function count(\n  columnOrOptions?: string | { distinct?: boolean },\n  options: { distinct?: boolean } = {},\n): PropertyDecorator {\n  const column =\n    typeof columnOrOptions === 'string' ? columnOrOptions : undefined;\n  const resolvedOptions =\n    typeof columnOrOptions === 'object' ? columnOrOptions : options;\n  return aggregate({\n    fn: 'count',\n    column,\n    distinct: resolvedOptions.distinct,\n  });\n}\n"],"mappings":";;AAaA,IAAM,6CAA6B,IAAI,QAAiC;AAEjE,SAAS,OAAO,SAAwB;CAC7C,QAAwD,SAAe;EACrE,2BAA2B,IAAI,MAAM,OAAO;EAC5C,OAAO;CACT;AACF;AAEO,SAAS,wBACd,MAC2B;CAC3B,OAAO,2BAA2B,IAAI,IAAI;AAC5C;AAEA,SAAS,oBAAoB,UAA+B;CAC1D,SAAS,eAAoB,yBAA8B;EACzD,iCACE,eACA,uBACC,WAAW,aAAa,SAAS;GAChC,MAAM,UAAU,EACd,UAAU,SACZ;GACA,eAAe,uBACb,WACA,aACA,SACA,IACF;EACF,CACF;CACF;AACF;AAEO,SAAS,QAAQ,cAA0C;CAChE,OAAO,oBAAoB;EAAE,MAAM;EAAS;CAAa,CAAC;AAC5D;AAEA,SAAS,OACP,MACA,cACmB;CACnB,OAAO,oBAAoB;EACzB,MAAM;EACN;EACA;CACF,CAAqC;AACvC;AAEO,IAAM,UAAU,iBAAyB,OAAO,UAAU,YAAY;AACtE,IAAM,QAAQ,iBAAyB,OAAO,QAAQ,YAAY;AAClE,IAAM,OAAO,iBAAyB,OAAO,OAAO,YAAY;AAChE,IAAM,QAAQ,iBAAyB,OAAO,QAAQ,YAAY;AAClE,IAAM,SAAS,iBAAyB,OAAO,SAAS,YAAY;AACpE,IAAM,WAAW,iBACtB,OAAO,WAAW,YAAY;AACzB,IAAM,QAAQ,iBAAyB,OAAO,QAAQ,YAAY;AAQlE,SAAS,UACd,SACmB;CACnB,OAAO,oBAAoB;EACzB,MAAM;EACN,IAAI,QAAQ;EACZ,QAAQ,QAAQ;EAChB,UAAU,QAAQ;CACpB,CAAwC;AAC1C;AAEA,SAAS,mBAAmB,IAAuB;CACjD,QAAQ,QAAiB,UAAkC,CAAC,MAC1D,UAAU;EAAE;EAAI;EAAQ,UAAU,QAAQ;CAAS,CAAC;AACxD;AAEO,IAAM,MAAM,mBAAmB,KAAK;AACpC,IAAM,MAAM,mBAAmB,KAAK;AACpC,IAAM,MAAM,mBAAmB,KAAK;AACpC,IAAM,MAAM,mBAAmB,KAAK;AAQpC,SAAS,MACd,iBACA,UAAkC,CAAC,GAChB;CAKnB,OAAO,UAAU;EACf,IAAI;EACJ,QALA,OAAO,oBAAoB,WAAW,kBAAkB,KAAA;EAMxD,WAJA,OAAO,oBAAoB,WAAW,kBAAkB,QAAA,CAI9B;CAC5B,CAAC;AACH"}
+{"version":3,"file":"decorators.js","names":[],"sources":["../src/decorators.ts"],"sourcesContent":["import {\n  ObjectRegistry,\n  registerCompatibleFieldDecorator,\n} from '@happyvertical/smrt-core';\nimport type {\n  ReportAggregateFieldMetadata,\n  ReportAggregateFn,\n  ReportBucketFieldMetadata,\n  ReportFieldMetadata,\n  ReportOperand,\n  ReportOptions,\n  ReportTimeBucketUnit,\n} from './types.js';\n\nconst reportOptionsByConstructor = new WeakMap<Function, ReportOptions>();\n\nexport function report(options: ReportOptions) {\n  return <T extends abstract new (...args: any[]) => any>(ctor: T): T => {\n    reportOptionsByConstructor.set(ctor, options);\n    return ctor;\n  };\n}\n\nexport function getRuntimeReportOptions(\n  ctor: Function,\n): ReportOptions | undefined {\n  return reportOptionsByConstructor.get(ctor);\n}\n\nfunction registerReportField(metadata: ReportFieldMetadata) {\n  return ((targetOrValue: any, propertyKeyOrContext: any) => {\n    registerCompatibleFieldDecorator(\n      targetOrValue,\n      propertyKeyOrContext,\n      (className, propertyKey, ctor) => {\n        const options = {\n          __report: metadata,\n        };\n        ObjectRegistry.registerFieldDecorator(\n          className,\n          propertyKey,\n          options,\n          ctor,\n        );\n      },\n    );\n  }) as PropertyDecorator;\n}\n\n/**\n * Group by a source column (`'status'`), a joined model's column\n * (`'wo.title'`), or a value computed from each row (`{ expr }`).\n */\nexport function groupBy(\n  sourceColumnOrExpr?: string | { expr: ReportOperand },\n): PropertyDecorator {\n  if (typeof sourceColumnOrExpr === 'object' && sourceColumnOrExpr !== null) {\n    return registerReportField({\n      kind: 'group',\n      expr: sourceColumnOrExpr.expr,\n    });\n  }\n  return registerReportField({\n    kind: 'group',\n    sourceColumn: sourceColumnOrExpr,\n  });\n}\n\nfunction bucket(\n  unit: ReportTimeBucketUnit,\n  sourceColumn: string,\n): PropertyDecorator {\n  return registerReportField({\n    kind: 'bucket',\n    unit,\n    sourceColumn,\n  } satisfies ReportBucketFieldMetadata);\n}\n\nexport const minute = (sourceColumn: string) => bucket('minute', sourceColumn);\nexport const hour = (sourceColumn: string) => bucket('hour', sourceColumn);\nexport const day = (sourceColumn: string) => bucket('day', sourceColumn);\nexport const week = (sourceColumn: string) => bucket('week', sourceColumn);\nexport const month = (sourceColumn: string) => bucket('month', sourceColumn);\nexport const quarter = (sourceColumn: string) =>\n  bucket('quarter', sourceColumn);\nexport const year = (sourceColumn: string) => bucket('year', sourceColumn);\n\nexport interface AggregateMeasureOptions {\n  distinct?: boolean;\n  /** Aggregate a computed value of each row instead of a column. */\n  expr?: ReportOperand;\n  /** Aggregate only the rows this predicate holds for (a filtered count or sum). */\n  filter?: ReportOperand;\n}\n\nexport interface AggregateDecoratorOptions extends AggregateMeasureOptions {\n  fn: ReportAggregateFn;\n  column?: string;\n}\n\nexport function aggregate(\n  options: AggregateDecoratorOptions,\n): PropertyDecorator {\n  return registerReportField({\n    kind: 'aggregate',\n    fn: options.fn,\n    column: options.column,\n    ...(options.expr ? { expr: options.expr } : {}),\n    ...(options.filter ? { filter: options.filter } : {}),\n    distinct: options.distinct,\n  } satisfies ReportAggregateFieldMetadata);\n}\n\nfunction aggregateDecorator(fn: ReportAggregateFn) {\n  return (\n    columnOrOptions?: string | AggregateMeasureOptions,\n    options: AggregateMeasureOptions = {},\n  ) => {\n    const column =\n      typeof columnOrOptions === 'string' ? columnOrOptions : undefined;\n    const resolved =\n      typeof columnOrOptions === 'object' ? columnOrOptions : options;\n    return aggregate({ fn, column, ...resolved });\n  };\n}\n\nexport const sum = aggregateDecorator('sum');\nexport const avg = aggregateDecorator('avg');\nexport const min = aggregateDecorator('min');\nexport const max = aggregateDecorator('max');\n\nexport function count(): PropertyDecorator;\nexport function count(\n  column: string,\n  options?: AggregateMeasureOptions,\n): PropertyDecorator;\nexport function count(options: AggregateMeasureOptions): PropertyDecorator;\nexport function count(\n  columnOrOptions?: string | AggregateMeasureOptions,\n  options: AggregateMeasureOptions = {},\n): PropertyDecorator {\n  const column =\n    typeof columnOrOptions === 'string' ? columnOrOptions : undefined;\n  const resolvedOptions =\n    typeof columnOrOptions === 'object' ? columnOrOptions : options;\n  return aggregate({ fn: 'count', column, ...resolvedOptions });\n}\n"],"mappings":";;AAcA,IAAM,6CAA6B,IAAI,QAAiC;AAEjE,SAAS,OAAO,SAAwB;CAC7C,QAAwD,SAAe;EACrE,2BAA2B,IAAI,MAAM,OAAO;EAC5C,OAAO;CACT;AACF;AAEO,SAAS,wBACd,MAC2B;CAC3B,OAAO,2BAA2B,IAAI,IAAI;AAC5C;AAEA,SAAS,oBAAoB,UAA+B;CAC1D,SAAS,eAAoB,yBAA8B;EACzD,iCACE,eACA,uBACC,WAAW,aAAa,SAAS;GAChC,MAAM,UAAU,EACd,UAAU,SACZ;GACA,eAAe,uBACb,WACA,aACA,SACA,IACF;EACF,CACF;CACF;AACF;AAMO,SAAS,QACd,oBACmB;CACnB,IAAI,OAAO,uBAAuB,YAAY,uBAAuB,MACnE,OAAO,oBAAoB;EACzB,MAAM;EACN,MAAM,mBAAmB;CAC3B,CAAC;CAEH,OAAO,oBAAoB;EACzB,MAAM;EACN,cAAc;CAChB,CAAC;AACH;AAEA,SAAS,OACP,MACA,cACmB;CACnB,OAAO,oBAAoB;EACzB,MAAM;EACN;EACA;CACF,CAAqC;AACvC;AAEO,IAAM,UAAU,iBAAyB,OAAO,UAAU,YAAY;AACtE,IAAM,QAAQ,iBAAyB,OAAO,QAAQ,YAAY;AAClE,IAAM,OAAO,iBAAyB,OAAO,OAAO,YAAY;AAChE,IAAM,QAAQ,iBAAyB,OAAO,QAAQ,YAAY;AAClE,IAAM,SAAS,iBAAyB,OAAO,SAAS,YAAY;AACpE,IAAM,WAAW,iBACtB,OAAO,WAAW,YAAY;AACzB,IAAM,QAAQ,iBAAyB,OAAO,QAAQ,YAAY;AAelE,SAAS,UACd,SACmB;CACnB,OAAO,oBAAoB;EACzB,MAAM;EACN,IAAI,QAAQ;EACZ,QAAQ,QAAQ;EAChB,GAAI,QAAQ,OAAO,EAAE,MAAM,QAAQ,KAAK,IAAI,CAAC;EAC7C,GAAI,QAAQ,SAAS,EAAE,QAAQ,QAAQ,OAAO,IAAI,CAAC;EACnD,UAAU,QAAQ;CACpB,CAAwC;AAC1C;AAEA,SAAS,mBAAmB,IAAuB;CACjD,QACE,iBACA,UAAmC,CAAC,MACjC;EAKH,OAAO,UAAU;GAAE;GAAI,QAHrB,OAAO,oBAAoB,WAAW,kBAAkB,KAAA;GAG3B,GAD7B,OAAO,oBAAoB,WAAW,kBAAkB;EACf,CAAC;CAC9C;AACF;AAEO,IAAM,MAAM,mBAAmB,KAAK;AACpC,IAAM,MAAM,mBAAmB,KAAK;AACpC,IAAM,MAAM,mBAAmB,KAAK;AACpC,IAAM,MAAM,mBAAmB,KAAK;AAQpC,SAAS,MACd,iBACA,UAAmC,CAAC,GACjB;CAKnB,OAAO,UAAU;EAAE,IAAI;EAAS,QAH9B,OAAO,oBAAoB,WAAW,kBAAkB,KAAA;EAGlB,GADtC,OAAO,oBAAoB,WAAW,kBAAkB;CACC,CAAC;AAC9D"}

package/dist/index.d.ts

@@ -3,6 +3,7 @@ export type { ReportAdapterDescriptor, ReportAdapterOptions, ReportBackgroundQue
 export { buildReportAdapterDescriptor, buildReportDrilldownQuery, queryReportMaterializedRows, reportMaterializedRowKey, splitReportFilterScopes, } from './adapter.js';
 export { bucketExpr, buildAggregate, } from './aggregate.js';
 export { buildReportDefinition, compileReportDefinition, compileReportSpec, getReportGroupingColumns, } from './compiler.js';
+export type { AggregateDecoratorOptions, AggregateMeasureOptions, } from './decorators.js';
 export { aggregate, avg, count, day, getRuntimeReportOptions, groupBy, hour, max, min, minute, month, quarter, report, sum, week, year, } from './decorators.js';
 export type { AppliedReportRefresh, ApplyReportRefreshOptions, PreviewReportRefreshOptions, ReportLifecycleOptions, ReportLifecycleRun, ReportLifecycleSnapshot, ReportLifecycleState, ReportRefreshActionContext, ReportRefreshActionHost, ReportRefreshJobHandle, ReportRefreshOutcome, ReportRefreshPreview, } from './lifecycle.js';
 export { applyReportRefresh, getReportLifecycle, previewReportRefresh, reportRefreshOutcome, } from './lifecycle.js';
@@ -27,7 +28,7 @@ export { parseRuntimeReportTime, resolveRuntimeReportTimeRange, runtimeReportBuc
 export type { EnqueueReportRefreshOptions, EnsureReportSchedulesOptions, ReportExecutionPrincipalReference, ReportRefreshExecutionAuditEvent, ReportRefreshExecutionAuthority, ReportRefreshExecutionAuthorityContext, ReportRefreshExecutionAuthorityHost, ReportRefreshInterceptorOptions, ReportRefreshJobArgs, ReportScheduleInfo, ReportScheduleRunnerConfig, ReportScheduleRunnerEvents, } from './scheduler.js';
 export { enqueueReportRefresh, ensureReportRefreshSchedules, ReportScheduleRunner, registerReportRefreshExecutionAuthorityHost, registerReportRefreshInterceptor, registerReportRefreshJobIntegritySigner, SmrtPrincipalReportRefreshTask, SmrtReportRefreshTask, } from './scheduler.js';
 export { assertReportTablesReady, REPORT_LOCKS_TABLE, REPORT_REFRESH_TASKS_TABLE, REPORT_RUNS_TABLE, REPORT_RUNTIME_TABLES, REPORT_SCHEDULER_TABLES, REPORT_SCHEDULES_TABLE, REPORT_WATERMARKS_TABLE, SmrtReportLock, SmrtReportLockCollection, SmrtReportRun, SmrtReportRunCollection, SmrtReportSchedule, SmrtReportScheduleCollection, SmrtReportWatermark, SmrtReportWatermarkCollection, scopeKeyForTenant, } from './state.js';
-export type { AggregateBuildResult, AggregateSelectExpr, AggregateSpec, ReportAggregateFieldMetadata, ReportAggregateFn, ReportBucketFieldMetadata, ReportDefinition, ReportFieldDefinition, ReportFieldMetadata, ReportGroupFieldMetadata, ReportOptions, ReportRefreshConfig, ReportRefreshMode, ReportRefreshOptions, ReportRefreshResult, ReportRefreshTrigger, ReportSource, ReportTimeBucketUnit, } from './types.js';
+export type { AggregateBuildResult, AggregateSelectExpr, AggregateSpec, ReportAggregateFieldMetadata, ReportAggregateFn, ReportBucketFieldMetadata, ReportDefinition, ReportFieldDefinition, ReportFieldMetadata, ReportGroupFieldMetadata, ReportJoinDefinition, ReportJoinOptions, ReportOperand, ReportOptions, ReportRefreshConfig, ReportRefreshMode, ReportRefreshOptions, ReportRefreshResult, ReportRefreshTrigger, ReportRelatedFieldPolicy, ReportSource, ReportTimeBucketUnit, } from './types.js';
 export type { AppliedReportExport, ReportBackgroundExportTask, ReportExportActionContext, ReportExportActionHost, ReportExportArtifact, ReportExportFormat, ReportExportLimits, ReportExportPreview, ReportExportProgress, ReportExportReadPlan, ReportExportRequest, ReportExportSnapshot, ReportExportSnapshotBinding, ReportExportSnapshotContext, ReportSavedView, ReportSavedViewColumn, ReportSavedViewDisplay, ReportSavedViewGrouping, ReportSavedViewPinnedSide, } from './views.js';
 export { applyReportExport, createReportExportPageRequest, createReportExportRequest, createReportExportSnapshot, migrateReportSavedView, normalizeReportSavedView, previewReportExport, ReportSurfaceValidationError, reportDefinitionFingerprint, restoreReportSavedView, validateReportExportArtifact, validateReportExportExecution, validateReportExportRequest, verifyReportExportSnapshot, } from './views.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAC;AAEhC,YAAY,EACV,uBAAuB,EACvB,oBAAoB,EACpB,4BAA4B,EAC5B,2BAA2B,EAC3B,yBAAyB,EACzB,sBAAsB,EACtB,sBAAsB,EACtB,gBAAgB,EAChB,uBAAuB,EACvB,qBAAqB,EACrB,qBAAqB,EACrB,6BAA6B,EAC7B,+BAA+B,EAC/B,yBAAyB,EACzB,yBAAyB,EACzB,gCAAgC,EAChC,kCAAkC,EAClC,4BAA4B,EAC5B,iCAAiC,EACjC,gCAAgC,EAChC,0BAA0B,EAC1B,yBAAyB,EACzB,yBAAyB,EACzB,8BAA8B,EAC9B,oBAAoB,EACpB,iBAAiB,EACjB,+BAA+B,EAC/B,8BAA8B,EAC9B,wBAAwB,EACxB,kBAAkB,EAClB,6BAA6B,EAC7B,uBAAuB,GACxB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,4BAA4B,EAC5B,yBAAyB,EACzB,2BAA2B,EAC3B,wBAAwB,EACxB,uBAAuB,GACxB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,UAAU,EACV,cAAc,GACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,eAAe,CAAC;AACvB,YAAY,EACV,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,SAAS,EACT,GAAG,EACH,KAAK,EACL,GAAG,EACH,uBAAuB,EACvB,OAAO,EACP,IAAI,EACJ,GAAG,EACH,GAAG,EACH,MAAM,EACN,KAAK,EACL,OAAO,EACP,MAAM,EACN,GAAG,EACH,IAAI,EACJ,IAAI,GACL,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,oBAAoB,EACpB,yBAAyB,EACzB,2BAA2B,EAC3B,sBAAsB,EACtB,kBAAkB,EAClB,uBAAuB,EACvB,oBAAoB,EACpB,0BAA0B,EAC1B,uBAAuB,EACvB,sBAAsB,EACtB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,EAC1B,KAAK,6BAA6B,EAClC,KAAK,sCAAsC,EAC3C,KAAK,uCAAuC,EAC5C,KAAK,iCAAiC,EACtC,KAAK,kCAAkC,EACvC,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,GACnC,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EACL,aAAa,EACb,iBAAiB,GAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC/D,YAAY,EACV,qBAAqB,EACrB,uBAAuB,EACvB,mBAAmB,EACnB,uBAAuB,EACvB,2BAA2B,EAC3B,mBAAmB,EACnB,6BAA6B,EAC7B,8BAA8B,GAC/B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,wBAAwB,EACxB,2BAA2B,EAC3B,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EACV,+BAA+B,EAC/B,wBAAwB,EACxB,sBAAsB,EACtB,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,iCAAiC,EACjC,wBAAwB,GACzB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EACV,2BAA2B,EAC3B,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,mBAAmB,EACnB,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACb,uBAAuB,EACvB,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EACV,iCAAiC,EACjC,sBAAsB,EACtB,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,gCAAgC,EAChC,iCAAiC,EACjC,6BAA6B,EAC7B,sBAAsB,EACtB,sBAAsB,EACtB,4BAA4B,GAC7B,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EACV,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,EACtB,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,GAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,0BAA0B,EAC1B,yBAAyB,EACzB,yBAAyB,EACzB,qBAAqB,EACrB,0BAA0B,EAC1B,2BAA2B,EAC3B,kBAAkB,EAClB,uBAAuB,EACvB,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,YAAY,EACV,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,sBAAsB,EACtB,6BAA6B,EAC7B,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,2BAA2B,EAC3B,4BAA4B,EAC5B,iCAAiC,EACjC,gCAAgC,EAChC,+BAA+B,EAC/B,sCAAsC,EACtC,mCAAmC,EACnC,+BAA+B,EAC/B,oBAAoB,EACpB,kBAAkB,EAClB,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,oBAAoB,EACpB,2CAA2C,EAC3C,gCAAgC,EAChC,uCAAuC,EACvC,8BAA8B,EAC9B,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EAClB,0BAA0B,EAC1B,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,EACvB,sBAAsB,EACtB,uBAAuB,EACvB,cAAc,EACd,wBAAwB,EACxB,aAAa,EACb,uBAAuB,EACvB,kBAAkB,EAClB,4BAA4B,EAC5B,mBAAmB,EACnB,6BAA6B,EAC7B,iBAAiB,GAClB,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,oBAAoB,EACpB,mBAAmB,EACnB,aAAa,EACb,4BAA4B,EAC5B,iBAAiB,EACjB,yBAAyB,EACzB,gBAAgB,EAChB,qBAAqB,EACrB,mBAAmB,EACnB,wBAAwB,EACxB,oBAAoB,EACpB,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,mBAAmB,EACnB,iBAAiB,EACjB,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,wBAAwB,EACxB,YAAY,EACZ,oBAAoB,GACrB,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,mBAAmB,EACnB,0BAA0B,EAC1B,yBAAyB,EACzB,sBAAsB,EACtB,oBAAoB,EACpB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,2BAA2B,EAC3B,2BAA2B,EAC3B,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EACtB,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,iBAAiB,EACjB,6BAA6B,EAC7B,yBAAyB,EACzB,0BAA0B,EAC1B,sBAAsB,EACtB,wBAAwB,EACxB,mBAAmB,EACnB,4BAA4B,EAC5B,2BAA2B,EAC3B,sBAAsB,EACtB,4BAA4B,EAC5B,6BAA6B,EAC7B,2BAA2B,EAC3B,0BAA0B,GAC3B,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -1,7 +1,7 @@
 import { aggregate, avg, count, day, getRuntimeReportOptions, groupBy, hour, max, min, minute, month, quarter, report, sum, week, year } from "./decorators.js";
-import { buildReportDefinition, compileReportDefinition, compileReportSpec, getReportGroupingColumns } from "./compiler.js";
+import { a as getReportGroupingColumns, c as tenantColumn, i as compileReportSpec, n as buildReportDefinition, r as compileReportDefinition, s as fieldPolicy } from "./chunks/compiler-IUB2YNgM.js";
 import { REPORT_LOCKS_TABLE, REPORT_REFRESH_TASKS_TABLE, REPORT_RUNS_TABLE, REPORT_RUNTIME_TABLES, REPORT_SCHEDULER_TABLES, REPORT_SCHEDULES_TABLE, REPORT_WATERMARKS_TABLE, SmrtReportLock, SmrtReportLockCollection, SmrtReportRun, SmrtReportRunCollection, SmrtReportSchedule, SmrtReportScheduleCollection, SmrtReportWatermark, SmrtReportWatermarkCollection, assertReportTablesReady, scopeKeyForTenant } from "./state.js";
-import { adapterTypeFromDb, refreshReport, reportRowIdentity, tenantColumn } from "./refresh.js";
+import { adapterTypeFromDb, refreshReport, reportRowIdentity } from "./refresh.js";
 import { ReportScheduleRunner, SmrtPrincipalReportRefreshTask, SmrtReportRefreshTask, enqueueReportRefresh, ensureReportRefreshSchedules, registerReportRefreshExecutionAuthorityHost, registerReportRefreshInterceptor, registerReportRefreshJobIntegritySigner } from "./scheduler.js";
 import { bucketExpr, buildAggregate } from "./aggregate.js";
 import { C as runtimeReportSpecDigest, S as parseRuntimeReportSpec, _ as RUNTIME_REPORT_HAVING_OPS, a as runRuntimeReportInMemory, b as RUNTIME_REPORT_SPEC_VERSION, c as coerceRuntimeReportValue, d as planRuntimeReportColumns, f as resolveRuntimeReportFieldPolicy, g as RUNTIME_REPORT_FILTER_OPS, h as RUNTIME_REPORT_CHART_TYPES, i as describeRuntimeReportMemorySource, l as humanizeRuntimeReportName, m as RUNTIME_REPORT_BUCKETS, n as resolveRuntimeReportTimeRange, o as describeRuntimeReportSourceFields, p as unknownRuntimeReportField, r as runtimeReportBucketForSpan, s as assertRuntimeReportFilterOperator, t as parseRuntimeReportTime, u as normalizeRuntimeReportCell, v as RUNTIME_REPORT_LIMITS, w as serializeRuntimeReportSpec, x as RuntimeReportError, y as RUNTIME_REPORT_MEASURE_FNS } from "./chunks/runtime-time-D7JZ1e4J.js";
@@ -213,14 +213,6 @@ var SENSITIVITIES = /* @__PURE__ */ new Set([
 function registeredClass(ctor) {
 	return ObjectRegistry.getClassByConstructor(ctor) ?? ObjectRegistry.getClass(ctor.name);
 }
-function fieldPolicy(field) {
-	const meta = field?._meta ?? {};
-	const sensitivity = [field?.sensitivity, meta.sensitivity].find((value) => typeof value === "string");
-	return {
-		sensitive: field?.sensitive === true || meta.sensitive === true || sensitivity === "sensitive" || sensitivity === "secret",
-		readPermission: typeof field?.readPermission === "string" ? field.readPermission : typeof meta.readPermission === "string" ? meta.readPermission : void 0
-	};
-}
 function descriptorMetadata(field) {
 	const metadata = field?._meta ?? {};
 	const format = [field?.format, metadata.format].find((value) => typeof value === "string" && value.length > 0);
@@ -243,6 +235,34 @@ function queryType(type) {
 		default: return "string";
 	}
 }
+function canonical(value) {
+	if (Array.isArray(value)) return `[${value.map(canonical).join(",")}]`;
+	if (value && typeof value === "object") {
+		const object = value;
+		return `{${Object.keys(object).filter((key) => object[key] !== void 0).sort().map((key) => `${JSON.stringify(key)}:${canonical(object[key])}`).join(",")}}`;
+	}
+	return JSON.stringify(value ?? null);
+}
+function columnSemantics(field, joins) {
+	const report = field.report;
+	if (!report) return void 0;
+	const expr = report.kind === "aggregate" || report.kind === "group" ? report.expr : void 0;
+	const filter = report.kind === "aggregate" ? report.filter : void 0;
+	const text = canonical([expr, filter]);
+	const aliases = new Set([...text.matchAll(/"col":"([a-z][a-z0-9_]*)\./g)].map((match) => match[1]));
+	const own = report.kind === "group" ? report.sourceColumn : report.kind === "bucket" ? report.sourceColumn : report.column;
+	if (own?.includes(".")) aliases.add(own.split(".")[0]);
+	const used = joins.filter((join) => aliases.has(join.alias)).map((join) => ({ ...join }));
+	if (!expr && !filter && used.length === 0) return void 0;
+	return canonical({
+		expr,
+		filter,
+		joins: used
+	});
+}
+function columnRef(ref) {
+	return ref.split(".").map(toSnakeCase).join(".");
+}
 function configuredTenantField(configured) {
 	return configured ? toSnakeCase(configured) : void 0;
 }
@@ -255,15 +275,16 @@ function isColumnBackedField(field) {
 		"manyToMany"
 	].includes(field.type ?? "");
 }
-function reportColumn(field, registryField) {
+function reportColumn(field, registryField, joins = []) {
 	const policy = fieldPolicy(registryField);
-	if (policy.sensitive || policy.readPermission || !isColumnBackedField(registryField)) return;
+	const relatedRestricted = (field.related ?? []).some((related) => related.sensitive || related.readPermission);
+	if (policy.sensitive || policy.readPermission || relatedRestricted || !isColumnBackedField(registryField)) return;
 	const id = field.columnName ?? toSnakeCase(field.fieldName);
 	const report = field.report;
 	if (!report) return void 0;
 	const type = queryType(field.type ?? registryField?.type);
 	const filterOperators = filterOperatorsFor(type);
-	return {
+	const base = {
 		id,
 		fieldName: field.fieldName,
 		label: registryField?.description || labelFor(field.fieldName),
@@ -282,18 +303,21 @@ function reportColumn(field, registryField) {
 			...report.kind !== "aggregate" ? ["facet"] : [],
 			...report.kind === "aggregate" ? ["aggregate"] : report.kind === "group" ? ["group"] : []
 		],
-		...report.kind === "group" ? { sourceColumn: toSnakeCase(report.sourceColumn ?? field.fieldName) } : {},
+		...report.kind === "group" && !report.expr ? { sourceColumn: columnRef(report.sourceColumn ?? field.fieldName) } : {},
 		...report.kind === "bucket" ? {
 			bucket: report.unit,
-			sourceColumn: toSnakeCase(report.sourceColumn)
+			sourceColumn: columnRef(report.sourceColumn)
 		} : {},
 		...report.kind === "aggregate" ? {
 			aggregate: report.fn,
-			...report.column ? { sourceColumn: toSnakeCase(report.column) } : {},
+			...report.column ? { sourceColumn: columnRef(report.column) } : {},
 			...report.distinct === void 0 ? {} : { distinct: report.distinct }
 		} : {},
 		...descriptorMetadata(registryField)
 	};
+	const semantics = columnSemantics(field, joins);
+	if (semantics) base.semantics = semantics;
+	return base;
 }
 function identityColumn() {
 	return {
@@ -526,7 +550,7 @@ function drilldownDescriptor(columns, sourceClassName) {
 	return {
 		id: "drilldown",
 		sourceClassName,
-		fields: columns.filter((column) => (column.kind === "group" || column.kind === "bucket") && typeof column.sourceColumn === "string").map((column) => ({
+		fields: columns.filter((column) => (column.kind === "group" || column.kind === "bucket") && typeof column.sourceColumn === "string" && !column.sourceColumn.includes(".")).map((column) => ({
 			id: column.id,
 			sourceColumn: column.sourceColumn,
 			kind: column.kind,
@@ -545,7 +569,7 @@ async function buildReportAdapterDescriptor(reportCtor, options = {}) {
 	const registered = registeredClass(reportCtor);
 	const fields = await ObjectRegistry.getAllFields(definition.reportClassName);
 	const tenantField = configuredTenantField(registered?.tenantScopedConfig?.field);
-	const columns = [identityColumn(), ...definition.fields.map((field) => reportColumn(field, fields.get(field.fieldName))).filter((field) => Boolean(field))].sort((left, right) => left.id.localeCompare(right.id));
+	const columns = [identityColumn(), ...definition.fields.map((field) => reportColumn(field, fields.get(field.fieldName), definition.joins)).filter((field) => Boolean(field))].sort((left, right) => left.id.localeCompare(right.id));
 	const schema = {
 		version: 1,
 		identityField: "id",
@@ -597,6 +621,11 @@ async function buildReportAdapterDescriptor(reportCtor, options = {}) {
 		},
 		dataTable,
 		drilldown: drilldownDescriptor(columns, definition.sourceClassName),
+		...definition.joins?.length ? { semantics: canonical({
+			joins: definition.joins,
+			where: definition.where,
+			having: definition.having
+		}) } : {},
 		refresh: refreshDescriptor(definition.refresh, options.refreshPermission)
 	};
 }
@@ -604,6 +633,9 @@ function publicFieldMap(descriptor) {
 	return new Map(descriptor.columns.map((column) => [column.id, column.fieldName]));
 }
 async function buildReportDrilldownQuery(reportCtor, row, options = {}) {
+	const definition = await buildReportDefinition(reportCtor);
+	const unbindable = definition.fields.find((field) => field.report?.kind === "group" && (field.report.expr || field.report.sourceColumn?.includes(".")) || field.report?.kind === "bucket" && field.report.sourceColumn.includes("."));
+	if (unbindable) throw new DataQueryValidationError(`Report drilldown is not available for ${definition.reportClassName}: ${unbindable.fieldName} groups by a joined or computed value`, "DATA_QUERY_UNSUPPORTED");
 	const descriptor = await buildReportAdapterDescriptor(reportCtor, options);
 	const constraints = descriptor.drilldown.fields.map((field) => {
 		if (!Object.hasOwn(row, field.id)) throw new DataQueryValidationError(`Report drilldown row is missing grouping field: ${field.id}`, "DATA_QUERY_RESULT_INVALID");
@@ -2009,9 +2041,11 @@ function reportDefinitionFingerprint(descriptor) {
 			sourceColumn: column.sourceColumn ?? null,
 			bucket: column.bucket ?? null,
 			aggregate: column.aggregate ?? null,
-			distinct: column.distinct ?? null
+			distinct: column.distinct ?? null,
+			...column.semantics ? { semantics: column.semantics } : {}
 		})),
-		schema: descriptor.schema
+		schema: descriptor.schema,
+		...descriptor.semantics ? { semantics: descriptor.semantics } : {}
 	};
 	return "rv1_" + createHash("sha256").update(stable(definition), "utf8").digest("base64url");
 }