sof-mssql 2.1.0 → 2.2.0

package/dist/queryGenerator.js

@@ -1,24 +1,19 @@
 "use strict";
 /**
  * T-SQL query generator for ViewDefinition structures.
- * Generates SQL queries that can be executed against MS SQL Server.
+ *
+ * Public façade over the tree-walker query compiler. Builds the base
+ * transpiler context (resource alias, constants, optional test id) and
+ * delegates SQL generation to `compileViewDefinition`.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryGenerator = void 0;
-const transpiler_js_1 = require("./fhirpath/transpiler.js");
-const index_js_1 = require("./queryGenerator/index.js");
+const index_js_1 = require("./queryGenerator/treeWalker/index.js");
 /**
- * Main query generator that orchestrates SQL generation from ViewDefinitions.
+ * Compiles a SQL on FHIR `ViewDefinition` to a T-SQL query.
  */
 class QueryGenerator {
     options;
-    pathParser;
-    combinationExpander;
-    forEachProcessor;
-    repeatProcessor;
-    selectClauseBuilder;
-    whereClauseBuilder;
-    columnGenerator;
     constructor(options = {}) {
         this.options = {
             tableName: "fhir_resources",
@@ -27,249 +22,26 @@ class QueryGenerator {
             resourceJsonColumn: "json",
             ...options,
         };
-        // Initialise specialised processors.
-        this.pathParser = new index_js_1.PathParser();
-        this.combinationExpander = new index_js_1.SelectCombinationExpander();
-        this.columnGenerator = new index_js_1.ColumnExpressionGenerator();
-        this.forEachProcessor = new index_js_1.ForEachProcessor(this.pathParser);
-        this.repeatProcessor = new index_js_1.RepeatProcessor();
-        this.selectClauseBuilder = new index_js_1.SelectClauseBuilder(this.columnGenerator);
-        this.whereClauseBuilder = new index_js_1.WhereClauseBuilder();
     }
     /**
      * Generate a T-SQL query from a ViewDefinition.
      */
     generateQuery(viewDef, testId) {
         try {
-            const context = this.createBaseContext(viewDef, testId);
-            const columns = this.collectAllColumns(viewDef.select);
-            const { statements, allCteDefinitions } = this.generateAllSelectStatements(viewDef, context);
-            let sql;
-            if (statements.length > 1) {
-                // Multiple statements (unionAll). If any have CTEs, consolidate them.
-                if (allCteDefinitions.length > 0) {
-                    const withClause = `WITH\n${allCteDefinitions.join(",\n")}\n`;
-                    sql = withClause + statements.join("\nUNION ALL\n");
-                }
-                else {
-                    sql = statements.join("\nUNION ALL\n");
-                }
-            }
-            else {
-                // Single statement. If it has CTEs, they're already included.
-                sql = statements[0];
-            }
-            return {
-                sql,
-                columns,
-            };
+            const transpilerCtx = this.createBaseContext(viewDef, testId);
+            return (0, index_js_1.compileViewDefinition)(viewDef, {
+                tableName: this.options.tableName,
+                schemaName: this.options.schemaName,
+                testId,
+                transpilerCtx,
+            });
         }
         catch (error) {
             throw new Error(`Failed to generate query for ViewDefinition: ${error}`);
         }
     }
     /**
-     * Result of generating all SELECT statements.
-     */
-    generateAllSelectStatements(viewDef, context) {
-        const unionCombinations = this.combinationExpander.expandCombinations(viewDef.select);
-        const statements = [];
-        const allCteDefinitions = [];
-        const isMultiUnion = unionCombinations.length > 1;
-        // Shared counter state to ensure unique CTE aliases across all combinations.
-        const cteCounter = { value: 0 };
-        for (const combination of unionCombinations) {
-            const { statement, cteDefinitions } = this.generateStatementForCombination(combination, viewDef, context, isMultiUnion, cteCounter);
-            statements.push(statement);
-            allCteDefinitions.push(...cteDefinitions);
-        }
-        return { statements, allCteDefinitions };
-    }
-    /**
-     * Generate a complete SQL statement for a specific combination.
-     *
-     * Routes to the appropriate statement generator based on the directives
-     * present in the combination:
-     * - Repeat statements use recursive CTEs.
-     * - ForEach statements use CROSS APPLY.
-     * - Simple statements have neither.
-     *
-     * @param combination - The select combination to generate.
-     * @param viewDef - The ViewDefinition being processed.
-     * @param context - The transpiler context.
-     * @param isMultiUnion - If true, CTEs are returned separately for consolidation.
-     * @param cteCounter - Shared counter for unique CTE aliases across combinations.
-     * @returns The statement and any CTE definitions (empty if not repeat or single statement).
-     */
-    generateStatementForCombination(combination, viewDef, context, isMultiUnion, cteCounter) {
-        const hasRepeat = this.repeatProcessor.combinationHasRepeat(combination);
-        const hasForEach = this.forEachProcessor.combinationHasForEach(combination);
-        // Repeat takes precedence if both are present (forEach will be nested).
-        if (hasRepeat) {
-            return this.generateRepeatStatement(combination, viewDef, context, isMultiUnion, cteCounter);
-        }
-        else if (hasForEach) {
-            return {
-                statement: this.generateForEachStatement(combination, viewDef, context),
-                cteDefinitions: [],
-            };
-        }
-        else {
-            return {
-                statement: this.generateSimpleStatement(combination, viewDef, context),
-                cteDefinitions: [],
-            };
-        }
-    }
-    /**
-     * Generate a simple SELECT statement without forEach.
-     */
-    generateSimpleStatement(combination, viewDef, context) {
-        const selectClause = this.selectClauseBuilder.generateSimpleSelectClause(combination, context);
-        const fromClause = this.generateFromClause(context);
-        const whereClause = this.whereClauseBuilder.buildWhereClause(viewDef.resource, context.resourceAlias, context.testId, viewDef.where, context);
-        let statement = `${selectClause}\n${fromClause}`;
-        if (whereClause !== null) {
-            statement += `\n${whereClause}`;
-        }
-        return statement;
-    }
-    /**
-     * Generate a SELECT statement with forEach using CROSS APPLY.
-     */
-    generateForEachStatement(combination, viewDef, context) {
-        const fromClause = this.generateFromClause(context);
-        const { forEachContextMap, topLevelForEach } = this.forEachProcessor.buildForEachContextMap(combination.selects, context, combination);
-        const applyClauses = this.forEachProcessor.buildApplyClauses(forEachContextMap, topLevelForEach, combination);
-        const selectClause = this.selectClauseBuilder.generateForEachSelectClause(combination, context, forEachContextMap);
-        const whereClause = this.whereClauseBuilder.buildWhereClause(viewDef.resource, context.resourceAlias, context.testId, viewDef.where, context);
-        let statement = `${selectClause}\n${fromClause}${applyClauses}`;
-        if (whereClause !== null) {
-            statement += `\n${whereClause}`;
-        }
-        return statement;
-    }
-    /**
-     * Generate a SELECT statement with repeat using recursive CTEs.
-     *
-     * The repeat directive generates a recursive CTE that traverses a tree
-     * structure by following one or more paths at each level. The CTE is then
-     * joined to the main query using INNER JOIN.
-     *
-     * If the combination also contains forEach, the forEach is processed after
-     * the repeat CTE, using the repeat context as its source.
-     *
-     * @param combination - The select combination being processed.
-     * @param viewDef - The ViewDefinition.
-     * @param context - The transpiler context.
-     * @param isMultiUnion - If true, return CTE definitions separately for consolidation.
-     * @param cteCounter - Shared counter for unique CTE aliases across combinations.
-     * @returns Statement and CTE definitions.
-     */
-    generateRepeatStatement(combination, viewDef, context, isMultiUnion, cteCounter) {
-        // Build repeat contexts and CTEs.
-        const { repeatContextMap, topLevelRepeat } = this.repeatProcessor.buildRepeatContextMap(combination.selects, context, combination, cteCounter);
-        const tableName = `[${this.options.schemaName}].[${this.options.tableName}]`;
-        const cteDefinitions = this.repeatProcessor.buildRepeatCteDefinitions(repeatContextMap, topLevelRepeat, context.resourceAlias, viewDef.resource, context.testId, tableName);
-        const joinClauses = this.repeatProcessor.buildRepeatApplyClauses(repeatContextMap, topLevelRepeat, context.resourceAlias);
-        const { selectClause, forEachApplyClauses } = this.buildRepeatSelectAndForEach(combination, context, repeatContextMap);
-        const fromClause = this.generateFromClause(context);
-        const statement = this.assembleRepeatStatement(selectClause, fromClause, joinClauses, forEachApplyClauses, cteDefinitions, isMultiUnion);
-        return { statement, cteDefinitions: isMultiUnion ? cteDefinitions : [] };
-    }
-    /**
-     * Build select clause and forEach apply clauses for repeat statements.
-     */
-    buildRepeatSelectAndForEach(combination, context, repeatContextMap) {
-        const hasNestedForEach = this.forEachProcessor.combinationHasForEach(combination);
-        if (!hasNestedForEach) {
-            return {
-                selectClause: this.selectClauseBuilder.generateRepeatSelectClause(combination, context, repeatContextMap),
-                forEachApplyClauses: "",
-            };
-        }
-        const { forEachContextMap, topLevelForEach } = this.forEachProcessor.buildForEachContextMap(combination.selects, context, combination);
-        this.updateForEachSourcesForRepeat(forEachContextMap, repeatContextMap);
-        return {
-            selectClause: this.selectClauseBuilder.generateRepeatSelectClause(combination, context, repeatContextMap, forEachContextMap),
-            forEachApplyClauses: this.forEachProcessor.buildApplyClauses(forEachContextMap, topLevelForEach, combination),
-        };
-    }
-    /**
-     * Assemble the final repeat statement from its components.
-     */
-    assembleRepeatStatement(selectClause, fromClause, joinClauses, forEachApplyClauses, cteDefinitions, isMultiUnion) {
-        const baseStatement = `${selectClause}\n${fromClause}${joinClauses}${forEachApplyClauses}`;
-        if (isMultiUnion) {
-            return baseStatement;
-        }
-        const withClause = cteDefinitions.length > 0 ? `WITH\n${cteDefinitions.join(",\n")}\n` : "";
-        return `${withClause}${baseStatement}`;
-    }
-    /**
-     * Update forEach source expressions to use repeat CTE instead of resource JSON.
-     *
-     * When forEach is nested inside repeat, the forEach should iterate over
-     * arrays within the repeat context (e.g., repeat_0.item_json) rather than
-     * the root resource JSON.
-     */
-    updateForEachSourcesForRepeat(forEachContextMap, repeatContextMap) {
-        // Find the repeat select that contains each forEach.
-        for (const [forEachSelect, forEachContext] of forEachContextMap) {
-            const containingRepeat = this.findContainingRepeat(forEachSelect, repeatContextMap);
-            if (containingRepeat) {
-                const repeatContext = repeatContextMap.get(containingRepeat);
-                if (repeatContext) {
-                    // Update the forEach source to use the repeat CTE's item_json.
-                    forEachContext.forEachSource = `${repeatContext.cteAlias}.item_json`;
-                }
-            }
-        }
-    }
-    /**
-     * Find the repeat select that contains a given forEach select.
-     */
-    findContainingRepeat(forEachSelect, repeatContextMap) {
-        // Check each repeat select to see if the forEach is nested within it.
-        for (const [repeatSelect] of repeatContextMap) {
-            if (this.isForEachNestedInRepeat(forEachSelect, repeatSelect)) {
-                return repeatSelect;
-            }
-        }
-        return undefined;
-    }
-    /**
-     * Check if a forEach select is nested within a repeat select.
-     */
-    isForEachNestedInRepeat(forEachSelect, repeatSelect) {
-        if (!repeatSelect.select) {
-            return false;
-        }
-        return this.isSelectNestedIn(forEachSelect, repeatSelect.select);
-    }
-    /**
-     * Recursively check if a select is nested within a list of selects.
-     */
-    isSelectNestedIn(target, selects) {
-        for (const select of selects) {
-            if (select === target) {
-                return true;
-            }
-            if (select.select && this.isSelectNestedIn(target, select.select)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    /**
-     * Generate the FROM clause.
-     */
-    generateFromClause(context) {
-        const tableName = `[${this.options.schemaName}].[${this.options.tableName}]`;
-        return `FROM ${tableName} AS [${context.resourceAlias}]`;
-    }
-    /**
-     * Create the base transpiler context.
+     * Create the base transpiler context with resource alias and constants.
      */
     createBaseContext(viewDef, testId) {
         const constants = {};
@@ -285,7 +57,8 @@ class QueryGenerator {
         };
     }
     /**
-     * Extract the value from a ViewDefinitionConstant.
+     * Extract the value from a ViewDefinitionConstant. Throws if zero or more
+     * than one `value[x]` element is set.
      */
     getConstantValue(constant) {
         const primitiveKeys = [
@@ -320,31 +93,6 @@ class QueryGenerator {
         const key = definedValues[0];
         return constant[key];
     }
-    /**
-     * Collect all column definitions from select elements.
-     */
-    collectAllColumns(selects) {
-        const columns = [];
-        for (const select of selects) {
-            if (select.column) {
-                for (const column of select.column) {
-                    columns.push({
-                        name: column.name,
-                        type: transpiler_js_1.Transpiler.inferSqlType(column.type, column.tag),
-                        nullable: true, // FHIR data is generally nullable.
-                        description: column.description,
-                    });
-                }
-            }
-            if (select.select) {
-                columns.push(...this.collectAllColumns(select.select));
-            }
-            if (select.unionAll) {
-                columns.push(...this.collectAllColumns(select.unionAll));
-            }
-        }
-        return columns;
-    }
 }
 exports.QueryGenerator = QueryGenerator;
 //# sourceMappingURL=queryGenerator.js.map

package/dist/queryGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryGenerator.js","sourceRoot":"","sources":["../src/queryGenerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queryGenerator.js","sourceRoot":"","sources":["../src/queryGenerator.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAGH,mEAA6E;AAc7E;;GAEG;AACH,MAAa,cAAc;IACR,OAAO,CAAkC;IAE1D,YAAY,UAAiC,EAAE;QAC7C,IAAI,CAAC,OAAO,GAAG;YACb,SAAS,EAAE,gBAAgB;YAC3B,UAAU,EAAE,KAAK;YACjB,gBAAgB,EAAE,IAAI;YACtB,kBAAkB,EAAE,MAAM;YAC1B,GAAG,OAAO;SACX,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,OAAuB,EAAE,MAAe;QACpD,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC9D,OAAO,IAAA,gCAAqB,EAAC,OAAO,EAAE;gBACpC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;gBACjC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;gBACnC,MAAM;gBACN,aAAa;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,gDAAgD,KAAK,EAAE,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAED;;OAEG;IACK,iBAAiB,CACvB,OAAuB,EACvB,MAAe;QAEf,MAAM,SAAS,GAAwD,EAAE,CAAC;QAE1E,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACxC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QAED,OAAO;YACL,aAAa,EAAE,GAAG;YAClB,SAAS;YACT,MAAM;SACP,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,gBAAgB,CACtB,QAAgC;QAEhC,MAAM,aAAa,GAAqC;YACtD,aAAa;YACb,cAAc;YACd,cAAc;YACd,cAAc;YACd,WAAW;YACX,eAAe;YACf,WAAW;YACX,cAAc;YACd,WAAW;YACX,SAAS;YACT,UAAU;YACV,UAAU;YACV,gBAAgB;YAChB,WAAW;YACX,UAAU;YACV,eAAe;YACf,mBAAmB;YACnB,kBAAkB;YAClB,kBAAkB;YAClB,gBAAgB;SACjB,CAAC;QAEF,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,CACxC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,SAAS,CACrC,CAAC;QAEF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CACb,aAAa,QAAQ,CAAC,IAAI,kDAAkD,CAC7E,CAAC;QACJ,CAAC;QAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CACb,aAAa,QAAQ,CAAC,IAAI,6DAA6D,aAAa,CAAC,MAAM,EAAE,CAC9G,CAAC;QACJ,CAAC;QAED,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QAC7B,OAAO,QAAQ,CAAC,GAAG,CAA8B,CAAC;IACpD,CAAC;CACF;AArGD,wCAqGC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sof-mssql",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "A SQL on FHIR view runner that transpiles view definitions into T-SQL queries for MS SQL Server",
   "author": "Australian e-Health Research Centre, CSIRO",
   "contributors": [

package/dist/queryGenerator/ForEachProcessor.d.ts

@@ -1,127 +0,0 @@
-/**
- * Processes forEach operations and generates CROSS APPLY clauses.
- */
-import { TranspilerContext } from "../fhirpath/transpiler.js";
-import { ViewDefinitionSelect } from "../types.js";
-import { SelectCombination } from "./SelectCombinationExpander.js";
-import { PathParser } from "./PathParser.js";
-/**
- * Result of building forEach context map.
- */
-interface ForEachContextMapResult {
-    forEachContextMap: Map<ViewDefinitionSelect, TranspilerContext>;
-    topLevelForEach: ViewDefinitionSelect[];
-}
-/**
- * Handles all forEach-related processing and CROSS APPLY generation.
- */
-export declare class ForEachProcessor {
-    private readonly pathParser;
-    constructor(pathParser: PathParser);
-    /**
-     * Check if a specific combination has forEach operations.
-     */
-    combinationHasForEach(combination: SelectCombination): boolean;
-    /**
-     * Check if a single select has forEach operations (including nested).
-     */
-    selectHasForEach(select: ViewDefinitionSelect): boolean;
-    /**
-     * Check if any select in the tree has forEach operations.
-     */
-    private hasForEachInSelects;
-    /**
-     * Check if any unionAll option has forEach operations.
-     */
-    private unionAllHasForEach;
-    /**
-     * Build the forEach context map by generating contexts for all forEach.
-     */
-    buildForEachContextMap(selects: ViewDefinitionSelect[], context: TranspilerContext, combination?: SelectCombination): ForEachContextMapResult;
-    /**
-     * Collect all forEach that should be treated as top-level.
-     */
-    private collectTopLevelForEach;
-    /**
-     * Process a select for forEach, handling both direct forEach and nested selects.
-     */
-    private processSelectForEach;
-    /**
-     * Process a select with a unionAll choice from a combination.
-     */
-    private processUnionAllChoice;
-    /**
-     * Add forEach from a select array to the topLevelForEach list.
-     */
-    private addForEachFromSelectArray;
-    /**
-     * Check if a select is a forEach or forEachOrNull.
-     */
-    private isForEachSelect;
-    /**
-     * Generate forEach contexts recursively.
-     */
-    private generateForEachContexts;
-    /**
-     * Create a transpiler context specific to a forEach.
-     */
-    private createForEachContext;
-    /**
-     * Generate nested forEach contexts within this forEach's select and unionAll options.
-     */
-    private generateNestedForEachContexts;
-    /**
-     * Generate forEach contexts for nested selects.
-     */
-    private generateNestedSelectContexts;
-    /**
-     * Generate forEach contexts for nested unionAll options.
-     */
-    private generateNestedUnionAllContexts;
-    /**
-     * Build CROSS APPLY clauses in reverse order for forEach processing.
-     */
-    buildApplyClauses(forEachContextMap: Map<ViewDefinitionSelect, TranspilerContext>, topLevelForEach: ViewDefinitionSelect[], combination: SelectCombination): string;
-    /**
-     * Generate CROSS APPLY clauses for a forEach and its nested forEach.
-     */
-    private generateForEachClause;
-    /**
-     * Build the APPLY clause for a forEach using its pre-generated context.
-     */
-    private buildApplyClause;
-    /**
-     * Build a simple APPLY clause for single array paths.
-     */
-    private buildSimpleApplyClause;
-    /**
-     * Build WHERE clauses for APPLY operations.
-     */
-    private buildWhereClauses;
-    /**
-     * Build nested CROSS APPLY clauses for array flattening.
-     */
-    private buildNestedForEachClause;
-    /**
-     * Build WHERE clause conditions for nested array filtering.
-     */
-    private buildNestedWhereClauses;
-    /**
-     * Build APPLY clause with optional WHERE conditions.
-     */
-    private buildApplyWithOptionalWhere;
-    /**
-     * Process nested forEach within this forEach's select.
-     */
-    private processNestedSelectClauses;
-    /**
-     * Process nested forEach within this forEach's unionAll options.
-     */
-    private processNestedUnionAllClauses;
-    /**
-     * Get the selected unionAll option for a forEach in a combination.
-     */
-    private getSelectedUnionOption;
-}
-export {};
-//# sourceMappingURL=ForEachProcessor.d.ts.map

package/dist/queryGenerator/ForEachProcessor.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ForEachProcessor.d.ts","sourceRoot":"","sources":["../../src/queryGenerator/ForEachProcessor.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAS7C;;GAEG;AACH,UAAU,uBAAuB;IAC/B,iBAAiB,EAAE,GAAG,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;IAChE,eAAe,EAAE,oBAAoB,EAAE,CAAC;CACzC;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;gBAE5B,UAAU,EAAE,UAAU;IAIlC;;OAEG;IACH,qBAAqB,CAAC,WAAW,EAAE,iBAAiB,GAAG,OAAO;IAoB9D;;OAEG;IACH,gBAAgB,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO;IAYvD;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAQ1B;;OAEG;IACH,sBAAsB,CACpB,OAAO,EAAE,oBAAoB,EAAE,EAC/B,OAAO,EAAE,iBAAiB,EAC1B,WAAW,CAAC,EAAE,iBAAiB,GAC9B,uBAAuB;IAsB1B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAkB9B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAW5B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAmB7B;;OAEG;IACH,OAAO,CAAC,yBAAyB;IAWjC;;OAEG;IACH,OAAO,CAAC,eAAe;IAIvB;;OAEG;IACH,OAAO,CAAC,uBAAuB;IA0B/B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAiB5B;;OAEG;IACH,OAAO,CAAC,6BAA6B;IA4BrC;;OAEG;IACH,OAAO,CAAC,4BAA4B;IAoBpC;;OAEG;IACH,OAAO,CAAC,8BAA8B;IAoBtC;;OAEG;IACH,iBAAiB,CACf,iBAAiB,EAAE,GAAG,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,EAC/D,eAAe,EAAE,oBAAoB,EAAE,EACvC,WAAW,EAAE,iBAAiB,GAC7B,MAAM;IAkBT;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAqB7B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAyCxB;;OAEG;IACH,OAAO,CAAC,sBAAsB;IA2B9B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAczB;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAyChC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAqB/B;;OAEG;IACH,OAAO,CAAC,2BAA2B;IAgBnC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IA0BlC;;OAEG;IACH,OAAO,CAAC,4BAA4B;IA8BpC;;OAEG;IACH,OAAO,CAAC,sBAAsB;CAqB/B"}