@devrev/meerkat-core 0.0.104 → 0.0.106

package/src/resolution/resolution.js

@@ -1,9 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateResolutionJoinPaths = exports.generateResolvedDimensions = exports.generateResolutionSchemas = exports.createBaseTableSchema = void 0;
+exports.wrapWithRowIdOrderingAndExclusion = exports.getArrayTypeResolutionColumnConfigs = exports.withArrayFlattenModifier = exports.createWrapperTableSchema = exports.createBaseTableSchema = exports.shouldSkipResolution = exports.getColumnReference = void 0;
 const member_formatters_1 = require("../member-formatters");
-const find_in_table_schema_1 = require("../utils/find-in-table-schema");
+const is_array_member_type_1 = require("../utils/is-array-member-type");
 const types_1 = require("./types");
+/**
+ * Constructs a SQL column reference from a table name and a dimension/measure.
+ *
+ * @param tableName - The name of the table
+ * @param member - The dimension or measure object with name and optional alias
+ * @returns Formatted SQL column reference like: tableName."columnName"
+ */
+const getColumnReference = (tableName, member) => {
+    return `${tableName}."${member.alias || member.name}"`;
+};
+exports.getColumnReference = getColumnReference;
+/**
+ * Checks if resolution should be skipped based on the resolution configuration and column projections.
+ * Resolution is skipped when there are no columns to resolve and no column projections.
+ *
+ * @param resolutionConfig - The resolution configuration
+ * @param columnProjections - Optional array of column projections
+ * @returns true if resolution should be skipped, false otherwise
+ */
+const shouldSkipResolution = (resolutionConfig, query, columnProjections) => {
+    // If no resolution required and no column projections to ensure order in which export is happening
+    // and explicit order is not provided, then skip resolution.
+    return (resolutionConfig.columnConfigs.length === 0 &&
+        (columnProjections === null || columnProjections === void 0 ? void 0 : columnProjections.length) === 0 &&
+        !query.order);
+};
+exports.shouldSkipResolution = shouldSkipResolution;
 const constructBaseDimension = (name, schema) => {
     return {
         name: (0, member_formatters_1.memberKeyToSafeKey)(name),
@@ -58,86 +85,51 @@ const createBaseTableSchema = (baseSql, tableSchemas, resolutionConfig, measures
     };
 };
 exports.createBaseTableSchema = createBaseTableSchema;
-const generateResolutionSchemas = (config, baseTableSchemas) => {
-    const resolutionSchemas = [];
-    config.columnConfigs.forEach((colConfig) => {
-        var _a;
-        const tableSchema = config.tableSchemas.find((ts) => ts.name === colConfig.source);
-        if (!tableSchema) {
-            throw new Error(`Table schema not found for ${colConfig.source}`);
-        }
-        const baseName = (0, member_formatters_1.memberKeyToSafeKey)(colConfig.name);
-        const baseAlias = (0, member_formatters_1.constructAlias)({
-            name: colConfig.name,
-            alias: (_a = (0, find_in_table_schema_1.findInSchemas)(colConfig.name, baseTableSchemas)) === null || _a === void 0 ? void 0 : _a.alias,
-            aliasContext: { isTableSchemaAlias: true },
-        });
-        // For each column that needs to be resolved, create a copy of the relevant table schema.
-        // We use the name of the column in the base query as the table schema name
-        // to avoid conflicts.
-        const resolutionSchema = {
-            name: baseName,
-            sql: tableSchema.sql,
-            measures: [],
-            dimensions: colConfig.resolutionColumns.map((col) => {
-                const dimension = (0, find_in_table_schema_1.findInDimensionSchemas)((0, member_formatters_1.getNamespacedKey)(colConfig.source, col), config.tableSchemas);
-                if (!dimension) {
-                    throw new Error(`Dimension not found: ${col}`);
-                }
-                return {
-                    // Need to create a new name due to limitations with how
-                    // CubeToSql handles duplicate dimension names between different sources.
-                    name: (0, member_formatters_1.memberKeyToSafeKey)((0, member_formatters_1.getNamespacedKey)(colConfig.name, col)),
-                    sql: `${baseName}.${col}`,
-                    type: dimension.type,
-                    alias: `${baseAlias} - ${(0, member_formatters_1.constructAlias)({
-                        name: col,
-                        alias: dimension.alias,
-                        aliasContext: { isTableSchemaAlias: true },
-                    })}`,
-                };
-            }),
-        };
-        resolutionSchemas.push(resolutionSchema);
-    });
-    return resolutionSchemas;
+const createWrapperTableSchema = (sql, baseTableSchema) => {
+    return {
+        name: types_1.BASE_DATA_SOURCE_NAME,
+        sql: sql,
+        dimensions: baseTableSchema.dimensions.map((d) => ({
+            name: d.name,
+            sql: (0, exports.getColumnReference)(types_1.BASE_DATA_SOURCE_NAME, d),
+            type: d.type,
+            alias: d.alias,
+        })),
+        measures: baseTableSchema.measures.map((m) => ({
+            name: m.name,
+            sql: (0, exports.getColumnReference)(types_1.BASE_DATA_SOURCE_NAME, m),
+            type: m.type,
+            alias: m.alias,
+        })),
+        joins: baseTableSchema.joins,
+    };
 };
-exports.generateResolutionSchemas = generateResolutionSchemas;
-const generateResolvedDimensions = (query, config, columnProjections) => {
-    // If column projections are provided, use those.
-    // Otherwise, use all measures and dimensions from the original query.
-    const aggregatedDimensions = columnProjections
-        ? columnProjections
-        : [...query.measures, ...(query.dimensions || [])];
-    const resolvedDimensions = aggregatedDimensions.flatMap((dimension) => {
-        const columnConfig = config.columnConfigs.find((c) => c.name === dimension);
-        if (!columnConfig) {
-            return [
-                (0, member_formatters_1.getNamespacedKey)(types_1.BASE_DATA_SOURCE_NAME, (0, member_formatters_1.memberKeyToSafeKey)(dimension)),
-            ];
-        }
-        else {
-            return columnConfig.resolutionColumns.map((col) => (0, member_formatters_1.getNamespacedKey)((0, member_formatters_1.memberKeyToSafeKey)(dimension), (0, member_formatters_1.memberKeyToSafeKey)((0, member_formatters_1.getNamespacedKey)(columnConfig.name, col))));
-        }
-    });
-    return resolvedDimensions;
+exports.createWrapperTableSchema = createWrapperTableSchema;
+const withArrayFlattenModifier = (baseTableSchema, resolutionConfig) => {
+    const arrayColumns = (0, exports.getArrayTypeResolutionColumnConfigs)(resolutionConfig);
+    return Object.assign(Object.assign({}, baseTableSchema), { dimensions: baseTableSchema.dimensions.map((dimension) => {
+            const shouldFlatten = arrayColumns.some((ac) => ac.name === dimension.name);
+            if (shouldFlatten) {
+                return Object.assign(Object.assign({}, dimension), { modifier: { shouldFlattenArray: true } });
+            }
+            return dimension;
+        }) });
 };
-exports.generateResolvedDimensions = generateResolvedDimensions;
-const generateResolutionJoinPaths = (resolutionConfig, baseTableSchemas) => {
-    return resolutionConfig.columnConfigs.map((config) => {
-        var _a;
-        return [
-            {
-                left: types_1.BASE_DATA_SOURCE_NAME,
-                right: (0, member_formatters_1.memberKeyToSafeKey)(config.name),
-                on: (0, member_formatters_1.constructAlias)({
-                    name: config.name,
-                    alias: (_a = (0, find_in_table_schema_1.findInSchemas)(config.name, baseTableSchemas)) === null || _a === void 0 ? void 0 : _a.alias,
-                    aliasContext: { isAstIdentifier: false },
-                }),
-            },
-        ];
-    });
+exports.withArrayFlattenModifier = withArrayFlattenModifier;
+const getArrayTypeResolutionColumnConfigs = (resolutionConfig) => {
+    return resolutionConfig.columnConfigs.filter((config) => (0, is_array_member_type_1.isArrayTypeMember)(config.type));
+};
+exports.getArrayTypeResolutionColumnConfigs = getArrayTypeResolutionColumnConfigs;
+/**
+ * Wraps SQL to order by row_id and then exclude it from results.
+ * This maintains the ordering from the base query while removing the internal row_id column.
+ *
+ * @param sql - The SQL query that includes a __row_id column
+ * @param rowIdColumnName - The name of the row_id column (defaults to '__row_id')
+ * @returns SQL query ordered by row_id with the row_id column excluded
+ */
+const wrapWithRowIdOrderingAndExclusion = (sql, rowIdColumnName) => {
+    return `select * exclude(${rowIdColumnName}) from (${sql}) order by ${rowIdColumnName}`;
 };
-exports.generateResolutionJoinPaths = generateResolutionJoinPaths;
+exports.wrapWithRowIdOrderingAndExclusion = wrapWithRowIdOrderingAndExclusion;
 //# sourceMappingURL=resolution.js.map

package/src/resolution/resolution.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolution.js","sourceRoot":"","sources":["../../../../meerkat-core/src/resolution/resolution.ts"],"names":[],"mappings":";;;AAAA,4DAI8B;AAG9B,wEAGuC;AACvC,mCAAkE;AAElE,MAAM,sBAAsB,GAAG,CAAC,IAAY,EAAE,MAA2B,EAAE,EAAE;IAC3E,OAAO;QACL,IAAI,EAAE,IAAA,sCAAkB,EAAC,IAAI,CAAC;QAC9B,GAAG,EAAE,GAAG,6BAAqB,IAAI,IAAA,kCAAc,EAAC;YAC9C,IAAI;YACJ,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,YAAY,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE;SACzC,CAAC,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,wDAAwD;QACxD,KAAK,EAAE,IAAA,kCAAc,EAAC;YACpB,IAAI;YACJ,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,YAAY,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE;SAC3C,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CACnC,OAAe,EACf,YAA2B,EAC3B,gBAAkC,EAClC,QAAkB,EAClB,UAAqB,EACrB,EAAE;IACF,MAAM,YAAY,GAAwC,EAAE,CAAC;IAC7D,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QACnC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC3C,YAAY,CAAC,IAAA,oCAAgB,EAAC,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC9D,SAAS,CAAC;QACd,CAAC,CAAC,CAAC;QACH,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACvC,YAAY,CAAC,IAAA,oCAAgB,EAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC;QAC3E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,6BAAqB;QAC3B,GAAG,EAAE,OAAO;QACZ,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9D,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,MAAM,EAAE;gBACV,OAAO,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aAC/C;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,cAAc,MAAM,EAAE,CAAC,CAAC;aACzC;QACH,CAAC,CAAC;QACF,KAAK,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;;YAAC,OAAA,CAAC;gBACrD,GAAG,EAAE,GAAG,6BAAqB,IAAI,IAAA,kCAAc,EAAC;oBAC9C,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,KAAK,EAAE,MAAA,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAE,KAAK;oBACvC,YAAY,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE;iBACzC,CAAC,MAAM,IAAA,sCAAkB,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE;aAC/D,CAAC,CAAA;SAAA,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC;AAtCW,QAAA,qBAAqB,yBAsChC;AAEK,MAAM,yBAAyB,GAAG,CACvC,MAAwB,EACxB,gBAA+B,EAC/B,EAAE;IACF,MAAM,iBAAiB,GAAkB,EAAE,CAAC;IAC5C,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;;QACzC,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAC1C,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,CACrC,CAAC;QACF,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,8BAA8B,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;SACnE;QAED,MAAM,QAAQ,GAAG,IAAA,sCAAkB,EAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,IAAA,kCAAc,EAAC;YAC/B,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,KAAK,EAAE,MAAA,IAAA,oCAAa,EAAC,SAAS,CAAC,IAAI,EAAE,gBAAgB,CAAC,0CAAE,KAAK;YAC7D,YAAY,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE;SAC3C,CAAC,CAAC;QAEH,yFAAyF;QACzF,2EAA2E;QAC3E,sBAAsB;QACtB,MAAM,gBAAgB,GAAgB;YACpC,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,WAAW,CAAC,GAAG;YACpB,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,SAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBAClD,MAAM,SAAS,GAAG,IAAA,6CAAsB,EACtC,IAAA,oCAAgB,EAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,EACvC,MAAM,CAAC,YAAY,CACpB,CAAC;gBACF,IAAI,CAAC,SAAS,EAAE;oBACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,EAAE,CAAC,CAAC;iBAChD;gBACD,OAAO;oBACL,wDAAwD;oBACxD,yEAAyE;oBACzE,IAAI,EAAE,IAAA,sCAAkB,EAAC,IAAA,oCAAgB,EAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBAC/D,GAAG,EAAE,GAAG,QAAQ,IAAI,GAAG,EAAE;oBACzB,IAAI,EAAE,SAAS,CAAC,IAAI;oBACpB,KAAK,EAAE,GAAG,SAAS,MAAM,IAAA,kCAAc,EAAC;wBACtC,IAAI,EAAE,GAAG;wBACT,KAAK,EAAE,SAAS,CAAC,KAAK;wBACtB,YAAY,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE;qBAC3C,CAAC,EAAE;iBACL,CAAC;YACJ,CAAC,CAAC;SACH,CAAC;QAEF,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AAtDW,QAAA,yBAAyB,6BAsDpC;AAEK,MAAM,0BAA0B,GAAG,CACxC,KAAY,EACZ,MAAwB,EACxB,iBAA4B,EAClB,EAAE;IACZ,iDAAiD;IACjD,sEAAsE;IACtE,MAAM,oBAAoB,GAAG,iBAAiB;QAC5C,CAAC,CAAC,iBAAiB;QACnB,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;IAErD,MAAM,kBAAkB,GAAa,oBAAoB,CAAC,OAAO,CAC/D,CAAC,SAAS,EAAE,EAAE;QACZ,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,CAC5C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAC5B,CAAC;QAEF,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO;gBACL,IAAA,oCAAgB,EACd,6BAAqB,EACrB,IAAA,sCAAkB,EAAC,SAAS,CAAC,CAC9B;aACF,CAAC;SACH;aAAM;YACL,OAAO,YAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAChD,IAAA,oCAAgB,EACd,IAAA,sCAAkB,EAAC,SAAS,CAAC,EAC7B,IAAA,sCAAkB,EAAC,IAAA,oCAAgB,EAAC,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAC7D,CACF,CAAC;SACH;IACH,CAAC,CACF,CAAC;IACF,OAAO,kBAAkB,CAAC;AAC5B,CAAC,CAAC;AAnCW,QAAA,0BAA0B,8BAmCrC;AAEK,MAAM,2BAA2B,GAAG,CACzC,gBAAkC,EAClC,gBAA+B,EACnB,EAAE;IACd,OAAO,gBAAgB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;;QAAC,OAAA;YACpD;gBACE,IAAI,EAAE,6BAAqB;gBAC3B,KAAK,EAAE,IAAA,sCAAkB,EAAC,MAAM,CAAC,IAAI,CAAC;gBACtC,EAAE,EAAE,IAAA,kCAAc,EAAC;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,KAAK,EAAE,MAAA,IAAA,oCAAa,EAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,0CAAE,KAAK;oBAC1D,YAAY,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE;iBACzC,CAAC;aACH;SACF,CAAA;KAAA,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,2BAA2B,+BAetC"}
+{"version":3,"file":"resolution.js","sourceRoot":"","sources":["../../../../meerkat-core/src/resolution/resolution.ts"],"names":[],"mappings":"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"}

package/src/resolution/steps/aggregation-step.d.ts

@@ -0,0 +1,24 @@
+import { ContextParams, Query, ResolutionConfig, TableSchema } from '../../index';
+/**
+ * Re-aggregate to reverse the unnest
+ *
+ * This function:
+ * 1. Groups by row_id
+ * 2. Uses MAX for non-array columns (they're duplicated)
+ * 3. Uses ARRAY_AGG for resolved array columns
+ *
+ * @param resolvedTableSchema - Schema from Phase 2 (contains all column info)
+ * @param resolutionConfig - Resolution configuration
+ * @param contextParams - Optional context parameters
+ * @returns Final SQL with arrays containing resolved values
+ */
+export declare const getAggregatedSql: ({ resolvedTableSchema, resolutionConfig, contextParams, cubeQueryToSQL, }: {
+    resolvedTableSchema: TableSchema;
+    resolutionConfig: ResolutionConfig;
+    contextParams?: ContextParams | undefined;
+    cubeQueryToSQL: (params: {
+        query: Query;
+        tableSchemas: TableSchema[];
+        contextParams?: ContextParams | undefined;
+    }) => Promise<string>;
+}) => Promise<string>;

package/src/resolution/steps/aggregation-step.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAggregatedSql = void 0;
+const tslib_1 = require("tslib");
+const index_1 = require("../../index");
+/**
+ * Constructs the resolved column name prefix for array resolution.
+ * This is used to identify which columns in the resolved schema correspond to array fields.
+ *
+ * @param columnName - The original column name
+ * @returns The prefixed column name used in resolution
+ */
+const getResolvedArrayColumnPrefix = (columnName) => {
+    return `${columnName}${index_1.MEERKAT_OUTPUT_DELIMITER}`;
+};
+/**
+ * Re-aggregate to reverse the unnest
+ *
+ * This function:
+ * 1. Groups by row_id
+ * 2. Uses MAX for non-array columns (they're duplicated)
+ * 3. Uses ARRAY_AGG for resolved array columns
+ *
+ * @param resolvedTableSchema - Schema from Phase 2 (contains all column info)
+ * @param resolutionConfig - Resolution configuration
+ * @param contextParams - Optional context parameters
+ * @returns Final SQL with arrays containing resolved values
+ */
+const getAggregatedSql = ({ resolvedTableSchema, resolutionConfig, contextParams, cubeQueryToSQL, }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const aggregationBaseTableSchema = resolvedTableSchema;
+    // Identify which columns need ARRAY_AGG vs MAX
+    const arrayColumns = (0, index_1.getArrayTypeResolutionColumnConfigs)(resolutionConfig);
+    const baseTableName = aggregationBaseTableSchema.name;
+    const isResolvedArrayColumn = (dimName) => {
+        return arrayColumns.some((arrayCol) => {
+            return dimName.includes(getResolvedArrayColumnPrefix(arrayCol.name));
+        });
+    };
+    // Create aggregation measures with proper aggregation functions
+    // Get row_id dimension for GROUP BY
+    const rowIdDimension = aggregationBaseTableSchema.dimensions.find((d) => d.name === index_1.ROW_ID_DIMENSION_NAME);
+    if (!rowIdDimension) {
+        throw new Error('Row id dimension not found');
+    }
+    // Create measures with MAX or ARRAY_AGG based on column type
+    const aggregationMeasures = [];
+    aggregationBaseTableSchema.dimensions
+        .filter((dim) => dim.name !== (rowIdDimension === null || rowIdDimension === void 0 ? void 0 : rowIdDimension.name))
+        .forEach((dim) => {
+        const isArrayColumn = isResolvedArrayColumn(dim.name);
+        // The dimension's sql field already has the correct reference (e.g., __resolved_query."__row_id")
+        // We just need to wrap it in the aggregation function
+        const columnRef = dim.sql;
+        // Use ARRAY_AGG for resolved array columns, MAX for others
+        // Filter out null values for ARRAY_AGG using FILTER clause
+        const aggregationFn = isArrayColumn
+            ? `COALESCE(ARRAY_AGG(DISTINCT ${columnRef}) FILTER (WHERE ${columnRef} IS NOT NULL), [])`
+            : `MAX(${columnRef})`;
+        aggregationMeasures.push({
+            name: dim.name,
+            sql: aggregationFn,
+            type: dim.type,
+            alias: dim.alias,
+        });
+    });
+    // Update the schema with aggregation measures
+    const schemaWithAggregation = Object.assign(Object.assign({}, aggregationBaseTableSchema), { measures: aggregationMeasures, dimensions: [rowIdDimension] });
+    // Generate the final SQL
+    const aggregatedSql = yield cubeQueryToSQL({
+        query: {
+            measures: aggregationMeasures.map((m) => (0, index_1.getNamespacedKey)(baseTableName, m.name)),
+            dimensions: [(0, index_1.getNamespacedKey)(baseTableName, rowIdDimension.name)],
+        },
+        tableSchemas: [schemaWithAggregation],
+        contextParams,
+    });
+    // Order by row_id to maintain consistent ordering before excluding it
+    return (0, index_1.wrapWithRowIdOrderingAndExclusion)(aggregatedSql, index_1.ROW_ID_DIMENSION_NAME);
+});
+exports.getAggregatedSql = getAggregatedSql;
+//# sourceMappingURL=aggregation-step.js.map

package/src/resolution/steps/aggregation-step.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aggregation-step.js","sourceRoot":"","sources":["../../../../../meerkat-core/src/resolution/steps/aggregation-step.ts"],"names":[],"mappings":";;;;AAAA,uCAWqB;AAErB;;;;;;GAMG;AACH,MAAM,4BAA4B,GAAG,CAAC,UAAkB,EAAU,EAAE;IAClE,OAAO,GAAG,UAAU,GAAG,gCAAwB,EAAE,CAAC;AACpD,CAAC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACI,MAAM,gBAAgB,GAAG,CAAO,EACrC,mBAAmB,EACnB,gBAAgB,EAChB,aAAa,EACb,cAAc,GAUf,EAAmB,EAAE;IACpB,MAAM,0BAA0B,GAAgB,mBAAmB,CAAC;IAEpE,+CAA+C;IAC/C,MAAM,YAAY,GAAG,IAAA,2CAAmC,EAAC,gBAAgB,CAAC,CAAC;IAC3E,MAAM,aAAa,GAAG,0BAA0B,CAAC,IAAI,CAAC;IAEtD,MAAM,qBAAqB,GAAG,CAAC,OAAe,EAAE,EAAE;QAChD,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACpC,OAAO,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,gEAAgE;IAChE,oCAAoC;IACpC,MAAM,cAAc,GAAG,0BAA0B,CAAC,UAAU,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,6BAAqB,CACxC,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IACD,6DAA6D;IAC7D,MAAM,mBAAmB,GAAc,EAAE,CAAC;IAE1C,0BAA0B,CAAC,UAAU;SAClC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,MAAK,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,CAAA,CAAC;SAClD,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACf,MAAM,aAAa,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEtD,kGAAkG;QAClG,sDAAsD;QACtD,MAAM,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC;QAE1B,2DAA2D;QAC3D,2DAA2D;QAC3D,MAAM,aAAa,GAAG,aAAa;YACjC,CAAC,CAAC,+BAA+B,SAAS,mBAAmB,SAAS,oBAAoB;YAC1F,CAAC,CAAC,OAAO,SAAS,GAAG,CAAC;QAExB,mBAAmB,CAAC,IAAI,CAAC;YACvB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,aAAa;YAClB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,KAAK,EAAE,GAAG,CAAC,KAAK;SACjB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEL,8CAA8C;IAC9C,MAAM,qBAAqB,mCACtB,0BAA0B,KAC7B,QAAQ,EAAE,mBAAmB,EAC7B,UAAU,EAAE,CAAC,cAAc,CAAC,GAC7B,CAAC;IAEF,yBAAyB;IACzB,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC;QACzC,KAAK,EAAE;YACL,QAAQ,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACtC,IAAA,wBAAgB,EAAC,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,CACxC;YACD,UAAU,EAAE,CAAC,IAAA,wBAAgB,EAAC,aAAa,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;SACnE;QACD,YAAY,EAAE,CAAC,qBAAqB,CAAC;QACrC,aAAa;KACd,CAAC,CAAC;IAEH,sEAAsE;IACtE,OAAO,IAAA,yCAAiC,EACtC,aAAa,EACb,6BAAqB,CACtB,CAAC;AACJ,CAAC,CAAA,CAAC;AAtFW,QAAA,gBAAgB,oBAsF3B"}

package/src/resolution/steps/resolution-step.d.ts

@@ -0,0 +1,21 @@
+import { ContextParams, Query, ResolutionConfig, TableSchema } from '../../index';
+/**
+ * Apply resolution (join with lookup tables)
+ *
+ * This function:
+ * 1. Uses the base table schema from Phase 1 (source of truth)
+ * 2. Generates resolution schemas for array fields
+ * 3. Sets up join paths between unnested data and resolution tables
+ * @returns Table schema with resolved values from lookup tables
+ */
+export declare const getResolvedTableSchema: ({ baseTableSchema, resolutionConfig, columnProjections, contextParams, cubeQueryToSQL, }: {
+    baseTableSchema: TableSchema;
+    resolutionConfig: ResolutionConfig;
+    columnProjections: string[];
+    contextParams?: ContextParams | undefined;
+    cubeQueryToSQL: (params: {
+        query: Query;
+        tableSchemas: TableSchema[];
+        contextParams?: ContextParams | undefined;
+    }) => Promise<string>;
+}) => Promise<TableSchema>;

package/src/resolution/steps/resolution-step.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getResolvedTableSchema = void 0;
+const tslib_1 = require("tslib");
+const index_1 = require("../../index");
+/**
+ * Apply resolution (join with lookup tables)
+ *
+ * This function:
+ * 1. Uses the base table schema from Phase 1 (source of truth)
+ * 2. Generates resolution schemas for array fields
+ * 3. Sets up join paths between unnested data and resolution tables
+ * @returns Table schema with resolved values from lookup tables
+ */
+const getResolvedTableSchema = ({ baseTableSchema, resolutionConfig, columnProjections, contextParams, cubeQueryToSQL, }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const updatedBaseTableSchema = baseTableSchema;
+    // Generate resolution schemas for fields that need resolution
+    const resolutionSchemas = (0, index_1.generateResolutionSchemas)(resolutionConfig, [
+        updatedBaseTableSchema,
+    ]);
+    const joinPaths = (0, index_1.generateResolutionJoinPaths)(updatedBaseTableSchema.name, resolutionConfig, [updatedBaseTableSchema]);
+    const tempQuery = {
+        measures: [],
+        dimensions: baseTableSchema.dimensions.map((d) => (0, index_1.getNamespacedKey)(updatedBaseTableSchema.name, d.name)),
+    };
+    const updatedColumnProjections = columnProjections === null || columnProjections === void 0 ? void 0 : columnProjections.map((cp) => (0, index_1.memberKeyToSafeKey)(cp));
+    // Generate resolved dimensions using columnProjections
+    const resolvedDimensions = (0, index_1.generateResolvedDimensions)(updatedBaseTableSchema.name, tempQuery, resolutionConfig, updatedColumnProjections);
+    // Create query and generate SQL
+    const resolutionQuery = {
+        measures: [],
+        dimensions: resolvedDimensions,
+        joinPaths,
+    };
+    const resolvedSql = yield cubeQueryToSQL({
+        query: resolutionQuery,
+        tableSchemas: [updatedBaseTableSchema, ...resolutionSchemas],
+        contextParams,
+    });
+    // Use the baseTableSchema which already has all the column info
+    const resolvedTableSchema = (0, index_1.createWrapperTableSchema)(resolvedSql, updatedBaseTableSchema);
+    // Create a map of resolution schema dimensions by original column name
+    const resolutionDimensionsByColumnName = new Map();
+    // Create a map of resolution schemas by config name for efficient lookup
+    const resolutionSchemaByConfigName = new Map();
+    resolutionSchemas.forEach((resSchema) => {
+        resolutionConfig.columnConfigs.forEach((config) => {
+            if (resSchema.dimensions.some((dim) => dim.name.startsWith(config.name))) {
+                resolutionSchemaByConfigName.set(config.name, resSchema);
+            }
+        });
+    });
+    // Build the dimension map using the pre-indexed schemas
+    resolutionConfig.columnConfigs.forEach((config) => {
+        const resSchema = resolutionSchemaByConfigName.get(config.name);
+        if (resSchema) {
+            resolutionDimensionsByColumnName.set(config.name, resSchema.dimensions.map((dim) => ({
+                name: dim.name,
+                sql: (0, index_1.getColumnReference)(resolvedTableSchema.name, dim),
+                type: dim.type,
+                alias: dim.alias,
+            })));
+        }
+    });
+    // Maintain the same order as columnProjections
+    // Replace dimensions that need resolution with their resolved counterparts
+    resolvedTableSchema.dimensions = (updatedColumnProjections || []).flatMap((projectionName) => {
+        // Check if this column has resolved dimensions
+        const resolvedDims = resolutionDimensionsByColumnName.get(projectionName);
+        if (resolvedDims) {
+            // Use resolved dimensions
+            return resolvedDims;
+        }
+        // Otherwise, find the original dimension from baseTableSchema
+        const originalDim = baseTableSchema.dimensions.find((d) => d.name === projectionName);
+        if (originalDim) {
+            return [originalDim];
+        }
+        // If not found, throw an error
+        throw new Error(`Column projection '${projectionName}' not found in base table schema dimensions`);
+    });
+    return resolvedTableSchema;
+});
+exports.getResolvedTableSchema = getResolvedTableSchema;
+//# sourceMappingURL=resolution-step.js.map

package/src/resolution/steps/resolution-step.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolution-step.js","sourceRoot":"","sources":["../../../../../meerkat-core/src/resolution/steps/resolution-step.ts"],"names":[],"mappings":"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"}

package/src/resolution/steps/unnest-step.d.ts

@@ -0,0 +1,19 @@
+import { ContextParams, Query, ResolutionConfig, TableSchema } from '../../index';
+/**
+ * Apply unnesting
+ *
+ * This function performs 1 step:
+ * 1. Create schema with unnest modifiers for array columns
+ * 2. Generate final unnested SQL
+ * @returns Table schema with unnest modifiers for array columns
+ */
+export declare const getUnnestTableSchema: ({ baseTableSchema, resolutionConfig, contextParams, cubeQueryToSQL, }: {
+    baseTableSchema: TableSchema;
+    resolutionConfig: ResolutionConfig;
+    contextParams?: ContextParams | undefined;
+    cubeQueryToSQL: (params: {
+        query: Query;
+        tableSchemas: TableSchema[];
+        contextParams?: ContextParams | undefined;
+    }) => Promise<string>;
+}) => Promise<TableSchema>;

package/src/resolution/steps/unnest-step.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUnnestTableSchema = void 0;
+const tslib_1 = require("tslib");
+const index_1 = require("../../index");
+/**
+ * Apply unnesting
+ *
+ * This function performs 1 step:
+ * 1. Create schema with unnest modifiers for array columns
+ * 2. Generate final unnested SQL
+ * @returns Table schema with unnest modifiers for array columns
+ */
+const getUnnestTableSchema = ({ baseTableSchema, resolutionConfig, contextParams, cubeQueryToSQL, }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    const updatedBaseTableSchema = (0, index_1.withArrayFlattenModifier)(baseTableSchema, resolutionConfig);
+    const unnestedSql = yield cubeQueryToSQL({
+        query: {
+            measures: [],
+            dimensions: updatedBaseTableSchema.dimensions.map((d) => (0, index_1.getNamespacedKey)(updatedBaseTableSchema.name, d.name)),
+        },
+        tableSchemas: [updatedBaseTableSchema],
+        contextParams,
+    });
+    const unnestedBaseTableSchema = (0, index_1.createWrapperTableSchema)(unnestedSql, baseTableSchema);
+    return unnestedBaseTableSchema;
+});
+exports.getUnnestTableSchema = getUnnestTableSchema;
+//# sourceMappingURL=unnest-step.js.map

package/src/resolution/steps/unnest-step.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unnest-step.js","sourceRoot":"","sources":["../../../../../meerkat-core/src/resolution/steps/unnest-step.ts"],"names":[],"mappings":";;;;AAAA,uCAQqB;AAErB;;;;;;;GAOG;AACI,MAAM,oBAAoB,GAAG,CAAO,EACzC,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,cAAc,GAUf,EAAwB,EAAE;IACzB,MAAM,sBAAsB,GAAG,IAAA,gCAAwB,EACrD,eAAe,EACf,gBAAgB,CACjB,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC;QACvC,KAAK,EAAE;YACL,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,sBAAsB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACtD,IAAA,wBAAgB,EAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CACtD;SACF;QACD,YAAY,EAAE,CAAC,sBAAsB,CAAC;QACtC,aAAa;KACd,CAAC,CAAC;IAEH,MAAM,uBAAuB,GAAgB,IAAA,gCAAwB,EACnE,WAAW,EACX,eAAe,CAChB,CAAC;IAEF,OAAO,uBAAuB,CAAC;AACjC,CAAC,CAAA,CAAC;AArCW,QAAA,oBAAoB,wBAqC/B"}

package/src/resolution/types.d.ts

@@ -1,6 +1,7 @@
-import { TableSchema } from '../types/cube-types/table';
+import { DimensionType, MeasureType, TableSchema } from '../types/cube-types/table';
 export interface ResolutionColumnConfig {
     name: string;
+    type: DimensionType | MeasureType;
     source: string;
     joinColumn: string;
     resolutionColumns: string[];

package/src/resolution/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../meerkat-core/src/resolution/types.ts"],"names":[],"mappings":";;;AAmBa,QAAA,qBAAqB,GAAG,cAAc,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../meerkat-core/src/resolution/types.ts"],"names":[],"mappings":";;;AA0Ba,QAAA,qBAAqB,GAAG,cAAc,CAAC"}

package/src/types/cube-types/table.d.ts

@@ -12,6 +12,7 @@ export type Dimension = {
     type: DimensionType;
     modifier?: {
         shouldUnnestGroupBy?: boolean;
+        shouldFlattenArray?: boolean;
     };
     alias?: string;
 };

package/src/utils/find-in-table-schema.js

@@ -42,8 +42,15 @@ exports.findInDimensionSchemas = findInDimensionSchemas;
 const findInSchemas = (name, tableSchemas) => {
     /*
      ** Finds the dimension or measure in the provided table schemas.
-     ** Assumes the provided name is namespaced as `tableName.columnName`.
+     ** Handles both namespaced (`tableName.columnName`) and non-namespaced names.
      */
+    // TODO: Move to only using namespaced keys.
+    if (!name.includes('.')) {
+        if (tableSchemas.length > 1) {
+            throw new Error(`Multiple table schemas found for ${name} and field doesn't have a table name`);
+        }
+        return (0, exports.findInSchema)(name, tableSchemas[0]);
+    }
     const [tableName, columnName] = (0, member_formatters_1.splitIntoDataSourceAndFields)(name);
     const tableSchema = tableSchemas.find((table) => table.name === tableName);
     if (!tableSchema) {

package/src/utils/find-in-table-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-in-table-schema.js","sourceRoot":"","sources":["../../../../meerkat-core/src/utils/find-in-table-schema.ts"],"names":[],"mappings":";;;AAAA,4DAAoE;AAG7D,MAAM,qBAAqB,GAAG,CACnC,OAAe,EACf,WAAwB,EACxB,EAAE;IACF,OAAO,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;AAChE,CAAC,CAAC;AALW,QAAA,qBAAqB,yBAKhC;AAEK,MAAM,mBAAmB,GAAG,CACjC,OAAe,EACf,WAAwB,EACxB,EAAE;IACF,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAC;AALW,QAAA,mBAAmB,uBAK9B;AAEK,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,WAAwB,EAAE,EAAE;IACxE;;;OAGG;IACH,MAAM,cAAc,GAAG,IAAA,6BAAqB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACnE,IAAI,cAAc,EAAE;QAClB,OAAO,cAAc,CAAC;KACvB;IACD,MAAM,YAAY,GAAG,IAAA,2BAAmB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/D,IAAI,YAAY,EAAE;QAChB,OAAO,YAAY,CAAC;KACrB;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAdW,QAAA,YAAY,gBAcvB;AAEK,MAAM,sBAAsB,GAAG,CACpC,IAAY,EACZ,YAA2B,EAC3B,EAAE;IACF;;;OAGG;IACH,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,IAAA,gDAA4B,EAAC,IAAI,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAC3E,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,IAAA,6BAAqB,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;AACxD,CAAC,CAAC;AAdW,QAAA,sBAAsB,0BAcjC;AAEK,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,YAA2B,EAAE,EAAE;IACzE;;;OAGG;IACH,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,IAAA,gDAA4B,EAAC,IAAI,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAC3E,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,IAAA,oBAAY,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;AAC/C,CAAC,CAAC;AAXW,QAAA,aAAa,iBAWxB"}
+{"version":3,"file":"find-in-table-schema.js","sourceRoot":"","sources":["../../../../meerkat-core/src/utils/find-in-table-schema.ts"],"names":[],"mappings":";;;AAAA,4DAAoE;AAG7D,MAAM,qBAAqB,GAAG,CACnC,OAAe,EACf,WAAwB,EACxB,EAAE;IACF,OAAO,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;AAChE,CAAC,CAAC;AALW,QAAA,qBAAqB,yBAKhC;AAEK,MAAM,mBAAmB,GAAG,CACjC,OAAe,EACf,WAAwB,EACxB,EAAE;IACF,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAC;AALW,QAAA,mBAAmB,uBAK9B;AAEK,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,WAAwB,EAAE,EAAE;IACxE;;;OAGG;IACH,MAAM,cAAc,GAAG,IAAA,6BAAqB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACnE,IAAI,cAAc,EAAE;QAClB,OAAO,cAAc,CAAC;KACvB;IACD,MAAM,YAAY,GAAG,IAAA,2BAAmB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/D,IAAI,YAAY,EAAE;QAChB,OAAO,YAAY,CAAC;KACrB;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAdW,QAAA,YAAY,gBAcvB;AAEK,MAAM,sBAAsB,GAAG,CACpC,IAAY,EACZ,YAA2B,EAC3B,EAAE;IACF;;;OAGG;IACH,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,IAAA,gDAA4B,EAAC,IAAI,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAC3E,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,IAAA,6BAAqB,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;AACxD,CAAC,CAAC;AAdW,QAAA,sBAAsB,0BAcjC;AAEK,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,YAA2B,EAAE,EAAE;IACzE;;;OAGG;IACH,4CAA4C;IAC5C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACvB,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,MAAM,IAAI,KAAK,CACb,oCAAoC,IAAI,sCAAsC,CAC/E,CAAC;SACH;QACD,OAAO,IAAA,oBAAY,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5C;IAED,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,IAAA,gDAA4B,EAAC,IAAI,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;IAC3E,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,IAAA,oBAAY,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;AAC/C,CAAC,CAAC;AArBW,QAAA,aAAa,iBAqBxB"}