@quillsql/react 2.13.40 → 2.13.42

package/dist/esm/models/Filter.js

@@ -85,16 +85,24 @@ export var FieldType;
     FieldType["Null"] = "null";
     FieldType["Boolean"] = "boolean";
 })(FieldType || (FieldType = {}));
+export var InternalFilterType;
+(function (InternalFilterType) {
+    InternalFilterType["StringFilter"] = "string-filter";
+    InternalFilterType["DateFilter"] = "date-filter";
+    InternalFilterType["DateCustomFilter"] = "date-custom-filter";
+    InternalFilterType["DateComparisonFilter"] = "date-comparison-filter";
+    InternalFilterType["NumericFilter"] = "numeric-filter";
+    InternalFilterType["NullFilter"] = "null-filter";
+    InternalFilterType["StringInFilter"] = "string-in-filter";
+    InternalFilterType["BooleanFilter"] = "boolean-filter";
+})(InternalFilterType || (InternalFilterType = {}));
 export var FilterType;
 (function (FilterType) {
-    FilterType["StringFilter"] = "string-filter";
-    FilterType["DateFilter"] = "date-filter";
-    FilterType["DateCustomFilter"] = "date-custom-filter";
-    FilterType["DateComparisonFilter"] = "date-comparison-filter";
-    FilterType["NumericFilter"] = "numeric-filter";
-    FilterType["NullFilter"] = "null-filter";
-    FilterType["StringInFilter"] = "string-in-filter";
-    FilterType["BooleanFilter"] = "boolean-filter";
+    FilterType["String"] = "string";
+    FilterType["Date"] = "date";
+    FilterType["Numeric"] = "numeric";
+    FilterType["Boolean"] = "boolean";
+    FilterType["Null"] = "null";
 })(FilterType || (FilterType = {}));
 /** Dashboard filters are filters that persist with the dashboard */
 export var DashboardFilterType;
@@ -108,43 +116,59 @@ var StringFilterType;
     StringFilterType["Multiselect"] = "multiselect";
 })(StringFilterType || (StringFilterType = {}));
 export const convertCustomFilter = (filter) => {
+    let field;
+    let filterType;
+    let fieldType;
+    let operator;
+    let value;
+    let table;
     switch (filter.filterType) {
-        case FilterType.StringFilter:
-            if (typeof filter.value !== 'string') {
-                throw new Error(`Invalid value for StringFilter, expected string, got ${filter.value}`);
+        case FilterType.String:
+            if (!filter.field) {
+                throw new Error('Field is required for StringFilter');
             }
-            if (filter.operator === undefined) {
-                filter.operator = StringOperator.IsExactly;
+            if (typeof filter.value === 'string') {
+                filterType = InternalFilterType.StringFilter;
+                fieldType = FieldType.String;
+                operator = filter.operator;
+                field = filter.field;
+                table = filter.table;
+                value = filter.value;
             }
-            if (!(filter.operator in StringOperator) &&
-                !Object.values(StringOperator).includes(filter.operator)) {
-                throw new Error(`Invalid operator for StringFilter, expected StringOperator, got ${filter.operator}`);
+            else if (Array.isArray(filter.value) &&
+                filter.value.every((v) => typeof v === 'string')) {
+                filterType = InternalFilterType.StringInFilter;
+                fieldType = FieldType.String;
+                operator = filter.operator;
+                field = filter.field;
+                table = filter.table;
+                value = filter.value;
             }
-            return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.String,
-            };
-        case FilterType.StringInFilter:
-            if (!Array.isArray(filter.value)) {
-                throw new Error(`Invalid value for StringInFilter, expected string[], got ${filter.value}`);
+            else {
+                throw new Error(`Invalid value for StringFilter, expected string, or string array, got ${filter.value}`);
             }
             if (filter.operator === undefined) {
                 filter.operator = StringOperator.IsExactly;
             }
             if (!(filter.operator in StringOperator) &&
                 !Object.values(StringOperator).includes(filter.operator)) {
-                throw new Error(`Invalid operator for StringInFilter, expected StringOperator, got ${filter.operator}`);
+                throw new Error(`Invalid operator for StringFilter, expected StringOperator, got ${filter.operator}`);
             }
             return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.String,
+                filterType,
+                fieldType,
+                field,
+                value,
+                table,
+                operator,
             };
-        case FilterType.NumericFilter:
+        case FilterType.Numeric:
             if (typeof filter.value !== 'number') {
                 throw new Error(`Invalid value for NumericFilter, expected number, got ${filter.value}`);
             }
+            else if (!filter.field) {
+                throw new Error('Field is required for NumericFilter');
+            }
             if (filter.operator === undefined) {
                 filter.operator = NumberOperator.EqualTo;
             }
@@ -152,15 +176,27 @@ export const convertCustomFilter = (filter) => {
                 !Object.values(NumberOperator).includes(filter.operator)) {
                 throw new Error(`Invalid operator for NumericFilter, expected NumberOperator, got ${filter.operator}`);
             }
+            filterType = InternalFilterType.NumericFilter;
+            fieldType = FieldType.Number;
+            operator = filter.operator;
+            field = filter.field;
+            value = filter.value;
+            table = filter.table;
             return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.Number,
+                filterType,
+                fieldType,
+                field,
+                value,
+                table,
+                operator,
             };
-        case FilterType.NullFilter:
+        case FilterType.Null:
             if (filter.value !== null) {
                 throw new Error(`Invalid value for NullFilter, expected null, got ${filter.value}`);
             }
+            else if (!filter.field) {
+                throw new Error('Field is required for NullFilter');
+            }
             if (filter.operator === undefined) {
                 filter.operator = NullOperator.IsNotNull;
             }
@@ -168,15 +204,27 @@ export const convertCustomFilter = (filter) => {
                 !Object.values(NullOperator).includes(filter.operator)) {
                 throw new Error(`Invalid operator for NullFilter, expected NullOperator, got ${filter.operator}`);
             }
+            filterType = InternalFilterType.NullFilter;
+            fieldType = FieldType.Null;
+            operator = filter.operator;
+            field = filter.field;
+            value = null;
+            table = filter.table;
             return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.Null,
+                filterType,
+                fieldType,
+                field,
+                value,
+                table,
+                operator,
             };
-        case FilterType.BooleanFilter:
+        case FilterType.Boolean:
             if (typeof filter.value !== 'boolean') {
                 throw new Error(`Invalid value for BooleanFilter, expected boolean, got ${filter.value}`);
             }
+            else if (!filter.field) {
+                throw new Error('Field is required for BooleanFilter');
+            }
             if (filter.operator === undefined) {
                 filter.operator = BoolOperator.EqualTo;
             }
@@ -184,62 +232,88 @@ export const convertCustomFilter = (filter) => {
                 !Object.values(BoolOperator).includes(filter.operator)) {
                 throw new Error(`Invalid operator for BooleanFilter, expected BoolOperator, got ${filter.operator}`);
             }
+            filterType = InternalFilterType.BooleanFilter;
+            fieldType = FieldType.Boolean;
+            operator = filter.operator;
+            field = filter.field;
+            value = null;
+            table = filter.table;
             return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.Boolean,
+                filterType,
+                fieldType,
+                field,
+                value,
+                table,
+                operator,
             };
-        case FilterType.DateFilter:
-            if (typeof filter.value !== 'object' ||
-                filter.value === null ||
-                !('value' in filter.value) ||
-                typeof filter.value.value !== 'number' ||
-                typeof filter.value.unit !== 'string') {
-                throw new Error(`Invalid value for DateFilter, expected { value: number, unit: string }, got ${filter.value}`);
-            }
-            if (filter.operator === undefined) {
-                filter.operator = DateOperator.EqualTo;
+        case FilterType.Date:
+            if (typeof filter.value === 'object' &&
+                filter.value &&
+                'value' in filter.value &&
+                filter.value.unit) {
+                if ((filter.value.value && typeof filter.value.value !== 'number') ||
+                    typeof filter.value.unit !== 'string') {
+                    throw new Error(`Invalid value for DateFilter, expected { value: number, unit: string }, got ${filter.value}`);
+                }
+                if (!filter.value.value) {
+                    filter.value.value = 1;
+                }
+                if (filter.operator === undefined) {
+                    filter.operator = DateOperator.EqualTo;
+                }
+                if (!(filter.operator in DateOperator) &&
+                    !Object.values(DateOperator).includes(filter.operator)) {
+                    throw new Error(`Invalid operator for DateFilter, expected DateOperator, got ${filter.operator}`);
+                }
+                filterType = InternalFilterType.DateFilter;
+                fieldType = FieldType.Date;
+                operator = filter.operator;
+                value = filter.value;
+                field = filter.field || '';
+                table = filter.table;
             }
-            if (!(filter.operator in DateOperator) &&
-                !Object.values(DateOperator).includes(filter.operator)) {
-                throw new Error(`Invalid operator for DateFilter, expected DateOperator, got ${filter.operator}`);
+            else if (typeof filter.value === 'object' &&
+                filter.value &&
+                'startDate' in filter.value &&
+                filter.value.startDate &&
+                'endDate' in filter.value &&
+                filter.value.endDate) {
+                if (typeof filter.value.startDate !== 'string' ||
+                    typeof filter.value.endDate !== 'string') {
+                    throw new Error(`Invalid value for DateCustomFilter, expected { startDate: string, endDate: string }, got ${filter.value}`);
+                }
+                filterType = InternalFilterType.DateCustomFilter;
+                fieldType = FieldType.Date;
+                operator = DateOperator.Custom;
+                value = filter.value;
+                field = filter.field || '';
+                table = filter.table;
             }
-            return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.Date,
-            };
-        case FilterType.DateCustomFilter:
-            if (typeof filter.value !== 'object' ||
-                filter.value === null ||
-                !('startDate' in filter.value) ||
-                !('endDate' in filter.value) ||
-                typeof filter.value.startDate !== 'string' ||
-                typeof filter.value.endDate !== 'string') {
-                throw new Error(`Invalid value for DateCustomFilter, expected { startDate: string, endDate: string }, got ${filter.value}`);
-            }
-            // Right now we're silently ignoring the operator, may want to generate error instead?
-            filter.operator = DateOperator.Custom;
-            return {
-                ...filter,
-                operator: DateOperator.Custom,
-                fieldType: FieldType.Date,
-            };
-        case FilterType.DateComparisonFilter:
-            if (typeof filter.value !== 'string') {
-                throw new Error(`Invalid value for DateComparisonFilter, expected string, got ${filter.value}`);
-            }
-            if (filter.operator === undefined) {
-                filter.operator = DateOperator.EqualTo;
+            else if (typeof filter.value === 'string') {
+                if (filter.operator === undefined) {
+                    filter.operator = DateOperator.EqualTo;
+                }
+                if (!(filter.operator in DateOperator) &&
+                    !Object.values(DateOperator).includes(filter.operator)) {
+                    throw new Error(`Invalid operator for DateComparisonFilter, expected DateOperator, got ${filter.operator}`);
+                }
+                filterType = InternalFilterType.DateComparisonFilter;
+                fieldType = FieldType.Date;
+                operator = filter.operator;
+                value = filter.value;
+                field = filter.field || '';
+                table = filter.table;
             }
-            if (!(filter.operator in DateOperator) &&
-                !Object.values(DateOperator).includes(filter.operator)) {
-                throw new Error(`Invalid operator for DateComparisonFilter, expected DateOperator, got ${filter.operator}`);
+            else {
+                throw new Error(`Invalid value for DateFilter, expected { value: number, unit: string }, { startDate: string, endDate: string}, or string, got ${filter.value}`);
             }
             return {
-                ...filter,
-                operator: filter.operator,
-                fieldType: FieldType.Date,
+                filterType,
+                fieldType,
+                field,
+                value,
+                table,
+                operator,
             };
     }
 };

package/dist/esm/models/Report.d.ts

@@ -86,6 +86,17 @@ export interface QuillReport {
             field: string;
         };
     };
+    referenceLines?: {
+        label: string;
+        query: [number, number] | string;
+    }[];
+    /** Resolved reference line y values */
+    referenceLineYValues?: {
+        label: string;
+        query: [number, number];
+    }[];
+    includeCustomFields?: boolean;
+    columnsWithCustomFields?: Column[];
 }
 export interface QuillReportInternal extends QuillReport {
     /** The pivot row info. */
@@ -122,7 +133,7 @@ export interface QuillReportInternal extends QuillReport {
     adminError?: string;
     /** An internal flag to force a report to trigger a reload from the backend */
     triggerReload?: boolean;
-    /** An internal flag to force a report to trigger a reload from the backend */
+    /** columns as ColumnInternal */
     columnInternal: ColumnInternal[];
     /** Represents if the report is currently loading rows */
     loadingRows?: boolean;

package/dist/esm/models/Report.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Report.d.ts","sourceRoot":"","sources":["../../../src/models/Report.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Report.d.ts","sourceRoot":"","sources":["../../../src/models/Report.ts"],"names":[],"mappings":"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"}

package/dist/esm/models/Schema.d.ts

@@ -2,6 +2,17 @@ import { Table } from './Tables';
 export type SchemaData = {
     schema: Table[];
     isSchemaLoading: boolean;
-    customFields: any[] | null;
+    customFields: {
+        [tableName: string]: CustomField[];
+    } | null;
+    schemaWithCustomFields: Table[];
+};
+export type CustomField = {
+    viewName: string;
+    refTable: string;
+    field: string;
+    refColumn?: string;
+    type?: string;
+    refField?: string;
 };
 //# sourceMappingURL=Schema.d.ts.map

package/dist/esm/models/Schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../../src/models/Schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../../src/models/Schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAAA;KAAE,GAAG,IAAI,CAAC;IAC5D,sBAAsB,EAAE,KAAK,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC"}

package/dist/esm/utils/astFilterProcessing.js

@@ -1,4 +1,4 @@
-import { BoolOperator, DateOperator, FieldType, FilterType, NullOperator, NumberOperator, StringOperator, TimeUnit, } from '../models/Filter';
+import { BoolOperator, DateOperator, FieldType, InternalFilterType, NullOperator, NumberOperator, StringOperator, TimeUnit, } from '../models/Filter';
 import { format, isValid, parse, subDays, subHours, subMonths, subWeeks, subYears, } from 'date-fns';
 import { isBoolType, isDateType, isNumberType, isStringType, } from './columnProcessing';
 // Map SQL string operators to corresponding StringOperator enums
@@ -93,34 +93,34 @@ function mapOperatorToFilterName(operator, fieldType) {
         case FieldType.Date:
             switch (operator) {
                 case DateOperator.Custom:
-                    return FilterType.DateCustomFilter;
+                    return InternalFilterType.DateCustomFilter;
                 case DateOperator.EqualTo:
                 case DateOperator.GreaterThan:
                 case DateOperator.GreaterThanOrEqualTo:
                 case DateOperator.LessThan:
                 case DateOperator.LessThanOrEqualTo:
                 case DateOperator.NotEqualTo:
-                    return FilterType.DateComparisonFilter;
+                    return InternalFilterType.DateComparisonFilter;
                 case DateOperator.InTheCurrent:
                 case DateOperator.InTheLast:
                 case DateOperator.InThePrevious:
-                    return FilterType.DateFilter;
+                    return InternalFilterType.DateFilter;
             }
         // fallthrough
         case FieldType.String:
             switch (operator) {
                 case StringOperator.Is:
                 case StringOperator.IsNot:
-                    return FilterType.StringInFilter;
+                    return InternalFilterType.StringInFilter;
                 default:
-                    return FilterType.StringFilter;
+                    return InternalFilterType.StringFilter;
             }
         case FieldType.Number:
-            return FilterType.NumericFilter;
+            return InternalFilterType.NumericFilter;
         case FieldType.Null:
-            return FilterType.NullFilter;
+            return InternalFilterType.NullFilter;
         case FieldType.Boolean:
-            return FilterType.BooleanFilter;
+            return InternalFilterType.BooleanFilter;
         default:
             console.error(`Could not determine filter name: {operator: ${operator}, fieldType: ${fieldType}}`);
             return null;
@@ -8700,7 +8700,7 @@ export const astToFilter = (ast, db, columns) => {
     }
     // Finally, with the operator, field, and filter name, return the corresponding Filter object
     switch (filterName) {
-        case FilterType.StringFilter:
+        case InternalFilterType.StringFilter:
             return {
                 field: (lowerFunctionToField(field, db) ?? '').replaceAll('%', ''),
                 filterType: filterName,
@@ -8708,7 +8708,7 @@ export const astToFilter = (ast, db, columns) => {
                 operator: mappedOperator,
                 value: (lowerFunctionToField(right, db) ?? '').replaceAll('%', ''),
             };
-        case FilterType.StringInFilter:
+        case InternalFilterType.StringInFilter:
             return {
                 field: (lowerFunctionToField(field, db) ?? '').replaceAll('%', ''),
                 filterType: filterName,
@@ -8716,7 +8716,7 @@ export const astToFilter = (ast, db, columns) => {
                 operator: mappedOperator,
                 value: right.value.map((v) => (lowerFunctionToField(v, db) ?? '').replaceAll('%', '')),
             };
-        case FilterType.NumericFilter:
+        case InternalFilterType.NumericFilter:
             return {
                 field: field,
                 filterType: filterName,
@@ -8724,7 +8724,7 @@ export const astToFilter = (ast, db, columns) => {
                 operator: mappedOperator,
                 value: Number(right.value),
             };
-        case FilterType.NullFilter:
+        case InternalFilterType.NullFilter:
             return {
                 field: field,
                 filterType: filterName,
@@ -8732,7 +8732,7 @@ export const astToFilter = (ast, db, columns) => {
                 operator: mappedOperator,
                 value: null,
             };
-        case FilterType.DateCustomFilter: {
+        case InternalFilterType.DateCustomFilter: {
             const rightExprList = right;
             const values = parseBetweenDates(rightExprList.value);
             if (!values) {
@@ -8747,7 +8747,7 @@ export const astToFilter = (ast, db, columns) => {
                 value: values,
             };
         }
-        case FilterType.DateComparisonFilter: {
+        case InternalFilterType.DateComparisonFilter: {
             const numericDateComparison = reverseOperatorMap(operator, FieldType.Number);
             if (numericDateComparison) {
                 if (!right.value ||
@@ -8759,7 +8759,7 @@ export const astToFilter = (ast, db, columns) => {
                     if (numericDateComparison === NumberOperator.EqualTo) {
                         return {
                             field: field,
-                            filterType: FilterType.DateCustomFilter,
+                            filterType: InternalFilterType.DateCustomFilter,
                             fieldType: FieldType.Date,
                             operator: DateOperator.Custom,
                             value: { startDate: right.value, endDate: right.value },
@@ -8767,7 +8767,7 @@ export const astToFilter = (ast, db, columns) => {
                     }
                     return {
                         field: field,
-                        filterType: FilterType.DateComparisonFilter,
+                        filterType: InternalFilterType.DateComparisonFilter,
                         fieldType: FieldType.Date,
                         operator: numericDateComparison,
                         value: right.value,
@@ -8776,7 +8776,7 @@ export const astToFilter = (ast, db, columns) => {
             }
         }
         // fallthrough
-        case FilterType.DateFilter: {
+        case InternalFilterType.DateFilter: {
             const { operator: dateOperator, value } = parseDateOperatorAndValue(ast, db);
             if (!value) {
                 return null;
@@ -8793,14 +8793,14 @@ export const astToFilter = (ast, db, columns) => {
             else {
                 return {
                     field: field,
-                    filterType: FilterType.DateCustomFilter,
+                    filterType: InternalFilterType.DateCustomFilter,
                     fieldType: FieldType.Date,
                     operator: DateOperator.Custom,
                     value: value.value,
                 };
             }
         }
-        case FilterType.BooleanFilter: {
+        case InternalFilterType.BooleanFilter: {
             const value = right.value !== undefined &&
                 ['boolean', 'string'].includes(typeof right.value)
                 ? Boolean(right.value)
@@ -8925,7 +8925,7 @@ export const filterToAst = (filter, db) => {
             }
         case FieldType.Date:
             switch (filter.filterType) {
-                case FilterType.DateCustomFilter:
+                case InternalFilterType.DateCustomFilter:
                     return {
                         type: 'binary_expr',
                         operator: mappedOperator,
@@ -8950,7 +8950,7 @@ export const filterToAst = (filter, db) => {
                             ],
                         },
                     };
-                case FilterType.DateFilter:
+                case InternalFilterType.DateFilter:
                     switch (filter.operator) {
                         case DateOperator.InTheLast:
                             switch (db) {
@@ -10796,7 +10796,7 @@ export const filterToAst = (filter, db) => {
                         default:
                             return null;
                     }
-                case FilterType.DateComparisonFilter:
+                case InternalFilterType.DateComparisonFilter:
                     switch (filter.operator) {
                         case DateOperator.EqualTo:
                             return {

package/dist/esm/utils/astProcessing.d.ts

@@ -24,7 +24,7 @@ export declare function getColumnAndTableInfo(tableAliasMap: {
     tableName: string;
     columnName: string;
 } | undefined;
-export declare function getColumnsByTableFromASTAndSchema(ast: any, tables: Table[], tableAliasMap: any): {
+export declare function getColumnsByTableFromASTAndSchema(ast: any, tables: Table[], tableAliasMap: any, skipStar?: boolean): {
     [table: string]: string[];
 };
 export declare const isSubquery: (node: any) => boolean;
@@ -69,7 +69,7 @@ export declare const fetchASTFromQuillReport: (report: QuillReportInternal, clie
     schema?: Table[];
     error?: string;
 }>;
-export declare function getTablesHelper(ast: any, allTables: Table[]): {
+export declare function getTablesHelper(ast: any, allTables: Table[], skipStar?: boolean): {
     referencedTablesAndColumns: {
         name: string;
         columns: {

package/dist/esm/utils/astProcessing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"astProcessing.d.ts","sourceRoot":"","sources":["../../../src/utils/astProcessing.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAKzC,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,OAQxC;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAe5D;AAGD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,GAAG,GAAG,CAgBtE;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CAgB1E;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG;;EA4BtD;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,GAChB;IAAE,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAahD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CActE;AAED,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,GAAG,EACT,UAAU,EAAE,MAAM,EAAE,EACpB,OAAO,EAAE,GAAG,EAAE,GACb,GAAG,CAYL;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC1C,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,KAAK,EAAE,GAClB;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAmCvD;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,KAAK,EAAE,EACf,aAAa,EAAE,GAAG,EAClB,QAAQ,UAAQ,GACf;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAAE,CA8H/B;AAED,eAAO,MAAM,UAAU,SAAU,GAAG,YAWnC,CAAC;AAEF,eAAO,MAAM,qBAAqB,YACvB,GAAG,UACJ,KAAK,EAAE,KACd,CAAC,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,EAmCtC,CAAC;AAEF,eAAO,MAAM,+BAA+B,YACjC,cAAc,EAAE,aACd,MAAM;;;;;;;;;;;;;;;;;;;;;;CAqBlB,CAAC;AAGF,eAAO,MAAM,4BAA4B,aAC7B,MAAM,UACR,KAAK,EAAE,UACP,mBAAmB,cACf,KAAK,iBACF,MAAM,cACT,MAAM,kBACF,MAAM,YAElB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAAE,EAAE,GACzD,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KACtB,OAAO,CAAC;IACT,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAChC,QAAQ,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAmHA,CAAC;AAEF,eAAO,MAAM,uBAAuB,WAC1B,mBAAmB,UACnB,mBAAmB,UACnB,KAAK,EAAE,KACd,OAAO,CAAC;IACT,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI,CAAC;IAChC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAqDA,CAAC;AAUF,wBAAgB,eAAe,CAC7B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,KAAK,EAAE,EAClB,QAAQ,CAAC,EAAE,OAAO,GACjB;IACD,0BAA0B,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAA;KAAE,EAAE,CAAC;IAC7E,UAAU,EAAE,GAAG,CAAC;CACjB,CAqEA"}