@vizzly/services 0.15.0-dev-8a72201c3d82e791bf61245fda865c4ef9852097 → 0.15.0-dev-9ba9cfcf5d6fdab60b458c0b97e98590696c65ea

package/dist/results-driver/src/driver/VizzlyQuery/AdditionalFilter/toQueries.d.ts

@@ -1,9 +1,9 @@
+import { AdditionalFilter } from '../../../../../shared-logic/src/AdditionalFilter/types';
 import { DataSet } from '../../../../../shared-logic/src/DataSet/types';
-import { QueryEngineConfig } from '../../../../../shared-logic/src/QueryEngineConfig/types';
 import { PreparedQuery, Query as QueryType } from '../../../../../shared-logic/src/Query/types';
-import { Result as ResultType } from '../../../../../shared-logic/src/Result/types';
 import { QueryAttributes } from '../../../../../shared-logic/src/QueryAttributes/types';
-import { AdditionalFilter } from '../../../../../shared-logic/src/AdditionalFilter/types';
+import { QueryEngineConfig } from '../../../../../shared-logic/src/QueryEngineConfig/types';
+import { Result as ResultType } from '../../../../../shared-logic/src/Result/types';
 import { Params } from '../../../types';
 export declare const toQueries: (additionalFilter: AdditionalFilter, dataSets: DataSet[], queryEngineConfig: QueryEngineConfig, params: Params) => {
     queries: (QueryType | PreparedQuery)[];
@@ -12,5 +12,5 @@ export declare const toQueries: (additionalFilter: AdditionalFilter, dataSets: D
 export declare function getOptionsFilters(additionalFilter: AdditionalFilter, field: {
     dataSetId: string;
     fieldId: string;
-}): QueryAttributes.Filter[][];
+}): QueryType['filter'];
 export declare function getOptionsOrders(dataSetField: DataSet.Field): QueryAttributes.Order[] | [];

package/dist/shared-logic/src/AdditionalFilter/AdditionalFilter.d.ts

@@ -5,6 +5,7 @@ import * as Filter from '../Filter';
 import { QueryAttributes } from '../QueryAttributes/types';
 import { QueryEngineConfig } from '../QueryEngineConfig/types';
 import { TextOverride } from '../Translations/types';
+import { VariableList } from '../Variables/types';
 import { AdditionalFilter, DateAndTimeFilter, DateFilter, Field, LegacyNumericFilterValue, OptionalFilters } from './types';
 export declare const typeToString: (type: AdditionalFilter['type'], textOverride: TextOverride) => string;
 export declare const NULL_VALUE_OPT = "__vizzly_null_value_option";
@@ -41,7 +42,7 @@ export declare enum DateOp {
     Less = 1
 }
 export declare function inclusiveExclusiveCurrent(op: DateOp, filter: DateFilter | DateAndTimeFilter): string;
-export declare function getCascadeOptionsFilters(globalFilters: AdditionalFilter[], dataSets: DataSet[], dateFilterOptions: DateTimeFilterOptions, cascadeFilterSelection?: boolean): OptionalFilters | undefined;
+export declare function getCascadeOptionsFilters(globalFilters: AdditionalFilter[], dataSets: DataSet[], dateFilterOptions: DateTimeFilterOptions, variables: VariableList, cascadeFilterSelection?: boolean): OptionalFilters | undefined;
 export declare const updateFilterForOptionalPulledFromOptions: (filter: AdditionalFilter) => AdditionalFilter;
 export declare const buildAdvancedFilters: (filterValue: QueryAttributes.Filter[][], field: Field, dataSetId: string) => QueryAttributes.Filter[][];
 export declare function getFilterDataType(filter: AdditionalFilter, dataSets: DataSet[]): "string" | "number" | "boolean" | "date_time" | "string[]" | undefined;

package/dist/shared-logic/src/AdditionalFilter/FilterConfig.d.ts

@@ -1,4 +1,17 @@
-import { FilterConfig, TimeRangeOptions } from './types';
-import { QueryAttributes } from '../QueryAttributes/types';
 import { DataSet } from '../DataSet/types';
+import { Query } from '../Query/types';
+import { QueryAttributes } from '../QueryAttributes/types';
+import { VariableList } from '../Variables/types';
+import { AdditionalFilter, FilterConfig, TimeRangeOptions } from './types';
 export declare const fromFilterConfig: (filterConfig: FilterConfig, dataSet: DataSet, timeRangeOptions: TimeRangeOptions) => QueryAttributes.Filter[][];
+export declare const processAdditionalFilter: (filter: AdditionalFilter, dataSet: DataSet, timeRangeOptions: TimeRangeOptions, variables: VariableList) => Query['filter'];
+/**
+ * Combines different types of filters (global, local, and view filters) into a single Query filter structure.
+ *
+ * @param filterConfig - Configuration containing different filter types
+ * @param dataSet - Dataset to validate filters against
+ * @param timeRangeOptions - Time range configuration for date filters
+ * @param variables - Variable list for template substitution
+ * @returns Combined Query filter with proper AND/OR structure
+ */
+export declare const combineFiltersFromFilterConfig: (filterConfig: FilterConfig, dataSet: DataSet, timeRangeOptions: TimeRangeOptions, variables: VariableList) => Query['filter'];

package/dist/shared-logic/src/AdditionalFilter/types.d.ts

@@ -1,3 +1,4 @@
+import { Query } from '@vizzly/sqlbuilder-public';
 import { QueryAttributes } from '../QueryAttributes/types';
 import * as FilterType from './constants';
 export declare type FilterConfig = {
@@ -15,7 +16,7 @@ export declare type Field = {
 };
 declare type AdditionalFilterType = typeof FilterType.DATE_FILTER | typeof FilterType.DATE_TIME_FILTER | typeof FilterType.DATE_AND_TIME_FILTER | typeof FilterType.SINGLE_SELECT_FILTER | typeof FilterType.MULTI_SELECT_FILTER | typeof FilterType.NUMERIC_FILTER | typeof FilterType.ADVANCED_FILTER;
 export declare type OptionalFilters = {
-    [dataSetId: string]: Array<Array<QueryAttributes.Filter>>;
+    [dataSetId: string]: Query['filter'];
 };
 declare type BaseAdditionalFilter<T extends AdditionalFilterType> = {
     /**

package/dist/shared-logic/src/Component/sharedSchemas.d.ts

@@ -8,6 +8,7 @@ export declare const measureSchema: (supportedAggregates: SupportedAggregates, a
 export declare const orderSchema: (queryEngineConfig: QueryEngineConfig) => Joi.ObjectSchema<any>;
 export declare const timeDimensionSchema: (supportedTimeTruncFunctions: SupportedTimeTruncFunctions) => Joi.ObjectSchema<any>;
 export declare const dimensionSchema: (supportedTimeTruncFunctions: SupportedTimeTruncFunctions, attributeSchemaOptions: ComponentInterfaceConfig['attributesSchemaOptions']) => Joi.ArraySchema<any[]>;
+export declare const queryFilterSchema: (queryEngineConfig: QueryEngineConfig, maxDepth?: number) => Joi.Schema;
 export declare const filterSchema: (queryEngineConfig: QueryEngineConfig) => Joi.ObjectSchema<any>;
 export declare const queryAttributesFilter: (queryEngineConfig: QueryEngineConfig) => Joi.ArraySchema<any[]>;
 export declare const queryAttributesLimit: () => Joi.NumberSchema<number>;

package/dist/shared-logic/src/CustomField/AggregateMath/index.d.ts

@@ -1,6 +1,7 @@
 import { AggregateMathField, AggregateNested } from '../../CustomField/types';
 import { Query } from '../../Query/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
+import { VariableList } from '../../Variables/types';
 import { MathOperator } from '../types';
 export declare const init: (publicName: string, leftFieldId: string, leftFunction: string, operator: MathOperator, rightFieldId: string, rightFunction: string, queryEngineConfig: QueryEngineConfig, leftNested: AggregateNested | undefined, rightNested: AggregateNested | undefined) => AggregateMathField;
-export declare const build: (customField: AggregateMathField) => Query['measure'][number];
+export declare const build: (customField: AggregateMathField, variables: VariableList) => Query['measure'][number];

package/dist/shared-logic/src/CustomField/Conditional/index.d.ts

@@ -1,9 +1,9 @@
+import { Params } from '../../../../results-driver/src/types';
 import { DataSet } from '../../DataSet/types';
+import * as Filter from '../../Filter';
 import { Query } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
 import { ConditionalField } from '../types';
-import * as Filter from '../../Filter';
-import { Params } from '../../../../results-driver/src/types';
 export declare const init: (publicName: string, fieldId: string, func: string, rule: QueryAttributes.Filter[][], queryEngineConfig: QueryEngineConfig) => ConditionalField;
 export declare const build: (field: ConditionalField, queryEngineConfig: QueryEngineConfig, dataSet: DataSet, params: Params) => Query['measure'][number];

package/dist/shared-logic/src/CustomField/DateCalculation/index.d.ts

@@ -1,6 +1,7 @@
 import { Query } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
+import { VariableList } from '../../Variables/types';
 import { DateCalculationField } from '../types';
 export declare const init: (publicName: string, leftFieldId: string, dateCalculationFunction: DateCalculationField['dateCalculationFunction'], rightFieldId: string, queryEngineConfig: QueryEngineConfig) => DateCalculationField;
-export declare const build: (measureAttribute: QueryAttributes.Measure, customField: DateCalculationField) => Query['measure'][number];
+export declare const build: (measureAttribute: QueryAttributes.Measure, customField: DateCalculationField, variables: VariableList) => Query['measure'][number];

package/dist/shared-logic/src/CustomField/Percentage/index.d.ts

@@ -3,13 +3,14 @@ import { DataSet } from '../../DataSet/types';
 import { Query } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
+import { VariableList } from '../../Variables/types';
 import { PercentageField } from '../types';
 /**
  * Creates a new custom percentage field.
  */
 export declare const init: (publicName: string, denominatorFieldId: string, denominatorAggregate: string, numeratorFieldId: string | null, numeratorAggregate: string | null, numeratorFilter: QueryAttributes['filter'], denominatorFilter: QueryAttributes['filter'], queryEngineConfig: QueryEngineConfig, denominatorScope?: PercentageField['denominatorScope']) => PercentageField;
 export declare const build: (customField: PercentageField, queryEngineConfig: QueryEngineConfig, dataSet: DataSet, _queryHasDimension: boolean, params: Params) => Query['measure'][number];
-export declare function buildPercentageFilters(filters: QueryAttributes.Filter[][] | undefined, customField: PercentageField): {
-    combinedNominatorFilters: QueryAttributes.Filter[][];
-    combinedDenominatorFilters: QueryAttributes.Filter[][];
+export declare function buildPercentageFilters(customField: PercentageField, variables: VariableList): {
+    queryFilterFromNumeratorFilter: import("@vizzly/sqlbuilder-public").RecursiveFilter;
+    queryFilterFromDenominatorFilter: import("@vizzly/sqlbuilder-public").RecursiveFilter;
 };

package/dist/shared-logic/src/CustomField/RoundedNumber/index.d.ts

@@ -2,5 +2,6 @@ import { RoundedNumberField } from '../../CustomField/types';
 import { Query } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
+import { VariableList } from '../../Variables/types';
 export declare const init: (publicName: string, fieldId: string, roundToDecimalPlaces: 0 | 2, queryEngineConfig: QueryEngineConfig) => RoundedNumberField;
-export declare const build: (measureAttribute: QueryAttributes.Measure, customField: RoundedNumberField) => Query['measure'][number];
+export declare const build: (measureAttribute: QueryAttributes.Measure, customField: RoundedNumberField, variables: VariableList) => Query['measure'][number];

package/dist/shared-logic/src/CustomField/Rules/index.d.ts

@@ -1,10 +1,10 @@
-import { DataSet } from '../../DataSet/types';
+import { Params } from '../../../../results-driver/src/types';
 import { RulesField } from '../../CustomField/types';
+import { DataSet } from '../../DataSet/types';
 import { Query, QueryNameSpace } from '../../Query/types';
 import { QueryAttributes } from '../../QueryAttributes/types';
 import { QueryEngineConfig } from '../../QueryEngineConfig/types';
 import { Rules } from './types';
-import { Params } from '../../../../results-driver/src/types';
 export declare const init: (publicName: string, rules: Rules[], queryEngineConfig: QueryEngineConfig) => RulesField;
 export declare const build: (measureAttribute: QueryAttributes.Measure, customField: RulesField, queryEngineConfig: QueryEngineConfig, dataSet: DataSet, params: Params) => Query['measure'][number];
 export declare const convertToCases: (rules: Rules[], queryEngineConfig: QueryEngineConfig, dataSet: DataSet, params: Params) => QueryNameSpace.Cases[];

package/dist/shared-logic/src/CustomField/constants.d.ts

@@ -0,0 +1,15 @@
+import { Clause } from '../Filter/types';
+export declare const alwaysTrueFilter: {
+    type: Clause.AND_WHERE;
+    value: {
+        type: Clause.WHERE;
+        value: {
+            field: {
+                type: "number";
+                value: number;
+            };
+            op: string;
+            value: number;
+        };
+    }[];
+};

package/dist/shared-logic/src/Filter/Filter.d.ts

@@ -3,8 +3,48 @@ import { DataSet } from '../DataSet/types';
 import { Query } from '../Query/types';
 import { QueryAttributes } from '../QueryAttributes/types';
 import { QueryEngineConfig } from '../QueryEngineConfig/types';
+import { VariableList } from '../Variables/types';
 export declare const addAndFilters: (filter: QueryAttributes['filter'], filterToAddToAll: QueryAttributes.Filter[][]) => QueryAttributes['filter'];
 export declare const filterAttributeToQueryFilter: (filterAttrs: QueryAttributes.Filter[][], queryEngineConfig: QueryEngineConfig, dataSet: DataSet, params: Params) => Query['filter'];
+export declare const convertArrayFilterStructureToQueryFilter: (arrayFilterStructure: QueryAttributes.Filter[][], variables: VariableList) => Query['filter'];
+export declare const combineQueryFilters: (filter: Query['filter'], filterToAddToAll: Query['filter']) => Query['filter'];
+/**
+ * Iterates through a query filter and, for each custom metric field, builds a custom metric.
+ */
+export declare function buildQueryCustomMetrics(filter: Query['filter'], dataSet: DataSet, queryEngineConfig: QueryEngineConfig, params: Params): Query['filter'];
+export declare function getFieldFromFilter(filter: Query['filter']): {
+    type: "number";
+    value: number;
+    as?: string | undefined;
+} | {
+    type: "string";
+    value: string;
+    as?: string | undefined;
+} | {
+    type: "boolean";
+    value: boolean | null;
+    as?: string | undefined;
+} | {
+    type: "field";
+    value: string;
+    function: string;
+    as?: string | undefined;
+} | {
+    type: "switchField";
+    value: {
+        cases: import("@vizzly/sqlbuilder-public/dist/Query/types").QueryNameSpace.Cases<string>[];
+    };
+    as?: string | undefined;
+} | {
+    type: "subquery";
+    value: import("@vizzly/sqlbuilder-public").SubQuery<string, string, "/" | "*" | "-" | "+", import("@vizzly/sqlbuilder-public").RecursiveFilter>;
+    as?: string | undefined;
+} | {
+    type: "function";
+    function: string;
+    value: import("@vizzly/sqlbuilder-public/dist/Query/types").QueryNameSpace.FieldDefinition<string, string, "/" | "*" | "-" | "+", import("@vizzly/sqlbuilder-public").RecursiveFilter>;
+    as?: string | undefined;
+} | null;
 export declare const takeUsedFields: (filter: QueryAttributes['filter']) => string[];
 export declare const isAvailable: (filter?: QueryAttributes['filter']) => boolean | undefined;
 export declare const isAdditionalFilter: (value: any) => boolean;

package/dist/shared-logic/src/Query/buildFromQueryAttributes.d.ts

@@ -1,8 +1,8 @@
+import { Params } from '../../../results-driver/src/types';
+import { DataSet } from '../DataSet/types';
 import { QueryAttributes } from '../QueryAttributes/types';
 import { QueryEngineConfig } from '../QueryEngineConfig/types';
 import { MeasureDescription, Query } from './types';
-import { DataSet } from '../DataSet/types';
-import { Params } from '../../../results-driver/src/types';
 export declare const buildFromQueryAttributes: (dataSet: DataSet, measureAttr: QueryAttributes.Measure[], filterAttr: QueryAttributes.Filter[][], orderAttr: QueryAttributes.Order[], dimensionAttr: QueryAttributes.Dimension[], timeDimensionAttr: QueryAttributes.TimeDimension | null, limitAttr: QueryAttributes.Limit | undefined, offsetAttr: QueryAttributes.Offset | undefined, queryEngineConfig: QueryEngineConfig, params: Params) => {
     query: Query;
     measureDescription: Array<MeasureDescription>;

package/package.json

@@ -26,7 +26,7 @@
     "fix-type-alias": "tsc-alias -p tsconfig.json",
     "prepare": "yarn build"
   },
-  "version": "0.15.0-dev-8a72201c3d82e791bf61245fda865c4ef9852097",
+  "version": "0.15.0-dev-9ba9cfcf5d6fdab60b458c0b97e98590696c65ea",
   "dependencies": {
     "@vizzly/api-client": "0.0.57",
     "@vizzly/joi": "^17.11.0",

package/dist/shared-logic/src/CustomField/CustomMetric/combineForCustomMetricFilters.d.ts

@@ -1,2 +0,0 @@
-import { QueryAttributes } from '../../QueryAttributes/types';
-export declare function combineForCustomMetricFilters(filters: QueryAttributes.Filter[][] | undefined, customFilters: QueryAttributes.Filter[][] | undefined): QueryAttributes.Filter[][];