@devrev/meerkat-core 0.0.111 → 0.0.115

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

@@ -0,0 +1,34 @@
+import { Query } from '../../types/cube-types/query';
+import { ContextParams, TableSchema } from '../../types/cube-types/table';
+import { ResolutionConfig } from '../types';
+export interface ApplyAliasesParams {
+    aggregatedTableSchema: TableSchema;
+    originalTableSchemas: TableSchema[];
+    resolutionConfig: ResolutionConfig;
+    contextParams?: ContextParams;
+    cubeQueryToSQL: (params: {
+        query: Query;
+        tableSchemas: TableSchema[];
+        contextParams?: ContextParams;
+    }) => Promise<string>;
+}
+/**
+ * Restores aliases from the original table schemas to the aggregated schema
+ * and generates the final SQL with proper column names.
+ *
+ * This step:
+ * 1. Creates an alias map from the original table schemas
+ * 2. Handles resolution column configs to determine proper aliases
+ *    - For single resolution columns: uses the original alias
+ *    - For multiple resolution columns: creates compound aliases (e.g., "Owners - Display Name")
+ * 3. Creates a new schema with restored aliases
+ * 4. Generates final SQL with proper aliases
+ *
+ * @param aggregatedTableSchema - The aggregated table schema from the aggregation step
+ * @param originalTableSchemas - The original table schemas with aliases
+ * @param resolutionConfig - Resolution configuration
+ * @param contextParams - Optional context parameters
+ * @param cubeQueryToSQL - Function to generate SQL from query and table schemas
+ * @returns Final SQL string with aliases
+ */
+export declare const applyAliases: ({ aggregatedTableSchema, originalTableSchemas, resolutionConfig, contextParams, cubeQueryToSQL, }: ApplyAliasesParams) => Promise<string>;

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

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyAliases = void 0;
+const tslib_1 = require("tslib");
+const get_alias_1 = require("../../member-formatters/get-alias");
+const get_namespaced_key_1 = require("../../member-formatters/get-namespaced-key");
+const member_key_to_safe_key_1 = require("../../member-formatters/member-key-to-safe-key");
+/**
+ * Restores aliases from the original table schemas to the aggregated schema
+ * and generates the final SQL with proper column names.
+ *
+ * This step:
+ * 1. Creates an alias map from the original table schemas
+ * 2. Handles resolution column configs to determine proper aliases
+ *    - For single resolution columns: uses the original alias
+ *    - For multiple resolution columns: creates compound aliases (e.g., "Owners - Display Name")
+ * 3. Creates a new schema with restored aliases
+ * 4. Generates final SQL with proper aliases
+ *
+ * @param aggregatedTableSchema - The aggregated table schema from the aggregation step
+ * @param originalTableSchemas - The original table schemas with aliases
+ * @param resolutionConfig - Resolution configuration
+ * @param contextParams - Optional context parameters
+ * @param cubeQueryToSQL - Function to generate SQL from query and table schemas
+ * @returns Final SQL string with aliases
+ */
+const applyAliases = ({ aggregatedTableSchema, originalTableSchemas, resolutionConfig, contextParams, cubeQueryToSQL, }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    // Restore aliases from original tableSchemas to get nice column names in final output
+    // Create a map of schemaName__fieldName -> alias from original schemas
+    const aliasMap = new Map();
+    const columnConfigMap = new Map(((_a = resolutionConfig.columnConfigs) === null || _a === void 0 ? void 0 : _a.map((colConfig) => [
+        colConfig.name,
+        colConfig,
+    ])) || []);
+    const tableSchemaMap = new Map(resolutionConfig.tableSchemas.map((schema) => [schema.name, schema]));
+    const safeKeyOptions = { useDotNotation: false };
+    // Helper function to process dimensions or measures and populate the alias map
+    const processMembers = (members, schemaName) => {
+        members.forEach((member) => {
+            var _a;
+            if (!member.alias)
+                return;
+            const columnName = (0, member_key_to_safe_key_1.memberKeyToSafeKey)(`${schemaName}.${member.name}`, safeKeyOptions);
+            const columnConfig = columnConfigMap.get(columnName);
+            // No resolution config - use original alias
+            if (!columnConfig) {
+                aliasMap.set(columnName, member.alias);
+                return;
+            }
+            const joinedTableName = columnName;
+            // Single resolution column - use original alias
+            if (columnConfig.resolutionColumns.length === 1) {
+                aliasMap.set((0, member_key_to_safe_key_1.memberKeyToSafeKey)((0, get_namespaced_key_1.getNamespacedKey)(joinedTableName, columnConfig.resolutionColumns[0]), safeKeyOptions), member.alias);
+                return;
+            }
+            // Multiple resolution columns - create compound aliases
+            const sourceTableSchema = tableSchemaMap.get(columnConfig.source);
+            if (!sourceTableSchema) {
+                throw new Error(`Source table schema not found for ${columnConfig.source}`);
+            }
+            for (const resolutionColumn of columnConfig.resolutionColumns) {
+                const sourceFieldAlias = (_a = sourceTableSchema.dimensions.find((dimension) => dimension.name === resolutionColumn)) === null || _a === void 0 ? void 0 : _a.alias;
+                if (!sourceFieldAlias) {
+                    throw new Error(`Source field alias not found for ${resolutionColumn}`);
+                }
+                aliasMap.set((0, member_key_to_safe_key_1.memberKeyToSafeKey)((0, get_namespaced_key_1.getNamespacedKey)(joinedTableName, resolutionColumn), safeKeyOptions), (0, get_alias_1.constructCompoundAlias)(member.alias, sourceFieldAlias));
+            }
+        });
+    };
+    originalTableSchemas.forEach((schema) => {
+        processMembers(schema.dimensions, schema.name);
+        processMembers(schema.measures, schema.name);
+    });
+    // Create a new schema with restored aliases
+    const schemaWithAliases = Object.assign(Object.assign({}, aggregatedTableSchema), { dimensions: [
+            ...aggregatedTableSchema.dimensions.map((dim) => {
+                var _a;
+                return (Object.assign(Object.assign({}, dim), { alias: aliasMap.get((_a = dim.alias) !== null && _a !== void 0 ? _a : '') || dim.alias }));
+            }),
+            ...aggregatedTableSchema.measures.map((measure) => {
+                var _a;
+                return (Object.assign(Object.assign({}, measure), { alias: aliasMap.get((_a = measure.alias) !== null && _a !== void 0 ? _a : '') || measure.alias }));
+            }),
+        ], measures: [] });
+    // Generate final SQL with aliases
+    const sqlWithAliases = yield cubeQueryToSQL({
+        query: {
+            dimensions: [
+                ...schemaWithAliases.dimensions.map((d) => (0, get_namespaced_key_1.getNamespacedKey)(schemaWithAliases.name, d.name)),
+            ],
+            measures: [],
+        },
+        tableSchemas: [schemaWithAliases],
+        contextParams,
+    });
+    return sqlWithAliases;
+});
+exports.applyAliases = applyAliases;
+//# sourceMappingURL=apply-aliases-step.js.map

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

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

package/src/resolution/steps/apply-sql-overrides.d.ts

@@ -0,0 +1,38 @@
+import { TableSchema } from '../../types/cube-types/table';
+import { ResolutionConfig } from '../types';
+/**
+ * Applies SQL override configurations to a table schema.
+ * This function overrides dimensions/measures with custom SQL expressions.
+ *
+ * This is done AFTER the base SQL is generated, so filters and sorts
+ * that rely on original values are already compiled into the SQL.
+ *
+ * NOTE: The fieldName in sqlOverrideConfigs should be in natural format (e.g., 'issues.priority').
+ * This function will apply memberKeyToSafeKey internally.
+ *
+ * The overrideSql should reference fields in datasource.fieldname format (same as fieldName),
+ * which will be automatically converted to the safe format.
+ *
+ * @param baseSchema - The base table schema to apply overrides to
+ * @param resolutionConfig - Resolution config containing SQL overrides
+ * @returns A new TableSchema with SQL overrides applied
+ *
+ * @example
+ * ```typescript
+ * // For scalar fields:
+ * {
+ *   fieldName: 'issues.priority',
+ *   overrideSql: `CASE WHEN issues.priority = 1 THEN 'P0' WHEN issues.priority = 2 THEN 'P1' END`,
+ *   type: 'string'
+ * }
+ * // issues.priority gets replaced with issues__priority
+ *
+ * // For array fields:
+ * {
+ *   fieldName: 'issues.priority_tags',
+ *   overrideSql: `list_transform(issues.priority_tags, x -> CASE WHEN x = 1 THEN 'P0' ... END)`,
+ *   type: 'string_array'
+ * }
+ * ```
+ */
+export declare const applySqlOverrides: (baseSchema: TableSchema, resolutionConfig: ResolutionConfig) => TableSchema;

package/src/resolution/steps/apply-sql-overrides.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applySqlOverrides = void 0;
+const member_formatters_1 = require("../../member-formatters");
+/**
+ * Applies SQL override configurations to a table schema.
+ * This function overrides dimensions/measures with custom SQL expressions.
+ *
+ * This is done AFTER the base SQL is generated, so filters and sorts
+ * that rely on original values are already compiled into the SQL.
+ *
+ * NOTE: The fieldName in sqlOverrideConfigs should be in natural format (e.g., 'issues.priority').
+ * This function will apply memberKeyToSafeKey internally.
+ *
+ * The overrideSql should reference fields in datasource.fieldname format (same as fieldName),
+ * which will be automatically converted to the safe format.
+ *
+ * @param baseSchema - The base table schema to apply overrides to
+ * @param resolutionConfig - Resolution config containing SQL overrides
+ * @returns A new TableSchema with SQL overrides applied
+ *
+ * @example
+ * ```typescript
+ * // For scalar fields:
+ * {
+ *   fieldName: 'issues.priority',
+ *   overrideSql: `CASE WHEN issues.priority = 1 THEN 'P0' WHEN issues.priority = 2 THEN 'P1' END`,
+ *   type: 'string'
+ * }
+ * // issues.priority gets replaced with issues__priority
+ *
+ * // For array fields:
+ * {
+ *   fieldName: 'issues.priority_tags',
+ *   overrideSql: `list_transform(issues.priority_tags, x -> CASE WHEN x = 1 THEN 'P0' ... END)`,
+ *   type: 'string_array'
+ * }
+ * ```
+ */
+const applySqlOverrides = (baseSchema, resolutionConfig) => {
+    const options = { useDotNotation: false };
+    if (!resolutionConfig.sqlOverrideConfigs ||
+        resolutionConfig.sqlOverrideConfigs.length === 0) {
+        return baseSchema;
+    }
+    // Validate that all SQL overrides reference the field being overridden
+    resolutionConfig.sqlOverrideConfigs.forEach((overrideConfig) => {
+        // fieldName is expected to be in natural format (e.g., 'issues.priority')
+        if (!overrideConfig.overrideSql.includes(overrideConfig.fieldName)) {
+            throw new Error(`SQL override for field '${overrideConfig.fieldName}' must reference the field in the SQL. ` +
+                `Current SQL: ${overrideConfig.overrideSql}`);
+        }
+    });
+    // Create a new schema with cloned dimensions and measures
+    const updatedSchema = Object.assign(Object.assign({}, baseSchema), { dimensions: [...baseSchema.dimensions], measures: [...baseSchema.measures] });
+    resolutionConfig.sqlOverrideConfigs.forEach((overrideConfig) => {
+        // Convert natural field name to safe key for matching
+        // e.g., with useDotNotation: false, 'issues.priority' -> 'issues__priority'
+        // e.g., with useDotNotation: true, 'issues.priority' -> 'issues.priority'
+        const safeFieldName = (0, member_formatters_1.memberKeyToSafeKey)(overrideConfig.fieldName, options);
+        // Check dimensions in base schema
+        const dimensionIndex = updatedSchema.dimensions.findIndex((dim) => dim.name === safeFieldName);
+        if (dimensionIndex !== -1) {
+            const originalDimension = updatedSchema.dimensions[dimensionIndex];
+            // Replace datasource.fieldName with datasource__fieldName in the SQL
+            // e.g., "issues.priority" -> "issues__priority"
+            const fieldNamePattern = overrideConfig.fieldName.replace(/\./g, '\\.'); // Escape dots for regex
+            const finalSql = overrideConfig.overrideSql.replace(new RegExp(`\\b${fieldNamePattern}\\b`, 'g'), // Word boundary to match exact field names
+            safeFieldName);
+            updatedSchema.dimensions[dimensionIndex] = Object.assign(Object.assign({}, originalDimension), { sql: finalSql, type: overrideConfig.type });
+        }
+        // Check measures in base schema
+        const measureIndex = updatedSchema.measures.findIndex((measure) => measure.name === safeFieldName);
+        if (measureIndex !== -1) {
+            const originalMeasure = updatedSchema.measures[measureIndex];
+            const fieldNamePattern = overrideConfig.fieldName.replace(/\./g, '\\.');
+            const finalSql = overrideConfig.overrideSql.replace(new RegExp(`\\b${fieldNamePattern}\\b`, 'g'), safeFieldName);
+            updatedSchema.measures[measureIndex] = Object.assign(Object.assign({}, originalMeasure), { sql: finalSql, type: overrideConfig.type });
+        }
+    });
+    return updatedSchema;
+};
+exports.applySqlOverrides = applySqlOverrides;
+//# sourceMappingURL=apply-sql-overrides.js.map

package/src/resolution/steps/apply-sql-overrides.js.map

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

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

@@ -13,17 +13,16 @@ const index_1 = require("../../index");
  * @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 config = { useDotNotation: false };
     const updatedBaseTableSchema = baseTableSchema;
     // Generate resolution schemas for fields that need resolution
-    const resolutionSchemas = (0, index_1.generateResolutionSchemas)(resolutionConfig, [
-        updatedBaseTableSchema,
-    ]);
+    const resolutionSchemas = (0, index_1.generateResolutionSchemas)(resolutionConfig);
     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));
+    const updatedColumnProjections = columnProjections === null || columnProjections === void 0 ? void 0 : columnProjections.map((cp) => (0, index_1.memberKeyToSafeKey)(cp, config));
     // Generate resolved dimensions using columnProjections
     const resolvedDimensions = (0, index_1.generateResolvedDimensions)(updatedBaseTableSchema.name, tempQuery, resolutionConfig, updatedColumnProjections);
     // Create query and generate SQL
@@ -47,10 +46,10 @@ const getResolvedTableSchema = ({ baseTableSchema, resolutionConfig, columnProje
         resolutionSchemaByConfigName.set(resSchema.name, resSchema);
     });
     // Build the dimension map using the pre-indexed schemas
-    resolutionConfig.columnConfigs.forEach((config) => {
-        const resSchema = resolutionSchemaByConfigName.get(config.name);
+    resolutionConfig.columnConfigs.forEach((colConfig) => {
+        const resSchema = resolutionSchemaByConfigName.get(colConfig.name);
         if (resSchema) {
-            resolutionDimensionsByColumnName.set(config.name, resSchema.dimensions.map((dim) => ({
+            resolutionDimensionsByColumnName.set(colConfig.name, resSchema.dimensions.map((dim) => ({
                 name: dim.name,
                 sql: (0, index_1.getColumnReference)(resolvedTableSchema.name, dim),
                 type: dim.type,

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

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

@@ -6,8 +6,14 @@ export interface ResolutionColumnConfig {
     joinColumn: string;
     resolutionColumns: string[];
 }
+export interface SqlOverrideConfig {
+    fieldName: string;
+    overrideSql: string;
+    type: DimensionType | MeasureType;
+}
 export interface ResolutionConfig {
     columnConfigs: ResolutionColumnConfig[];
     tableSchemas: TableSchema[];
+    sqlOverrideConfigs?: SqlOverrideConfig[];
 }
 export declare const BASE_DATA_SOURCE_NAME = "__base_query";

package/src/resolution/types.js.map

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

package/src/utils/meerkat-placeholder-replacer.d.ts

@@ -1,2 +1,3 @@
+import { QueryOptions } from '../member-formatters/get-alias';
 import { TableSchema } from '../types/cube-types';
-export declare const meerkatPlaceholderReplacer: (sql: string, originalTableName: string, tableSchema: TableSchema) => string;
+export declare const meerkatPlaceholderReplacer: (sql: string, originalTableName: string, tableSchema: TableSchema, config: QueryOptions) => string;

package/src/utils/meerkat-placeholder-replacer.js

@@ -1,17 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.meerkatPlaceholderReplacer = void 0;
-const member_formatters_1 = require("../member-formatters");
-const meerkatPlaceholderReplacer = (sql, originalTableName, tableSchema) => {
+const get_alias_1 = require("../member-formatters/get-alias");
+const get_namespaced_key_1 = require("../member-formatters/get-namespaced-key");
+const meerkatPlaceholderReplacer = (sql, originalTableName, tableSchema, config) => {
     const tableNameEncapsulationRegEx = /\{MEERKAT\}\.([a-zA-Z_][a-zA-Z0-9_]*)/g;
     return sql.replace(tableNameEncapsulationRegEx, (_, columnName) => {
-        return (0, member_formatters_1.getAliasFromSchema)({
-            name: (0, member_formatters_1.getNamespacedKey)(originalTableName, columnName),
-            tableSchema,
-            aliasContext: {
-                isAstIdentifier: false,
-            },
-        });
+        return (0, get_alias_1.getAliasForSQL)((0, get_namespaced_key_1.getNamespacedKey)(originalTableName, columnName), tableSchema, config);
     });
 };
 exports.meerkatPlaceholderReplacer = meerkatPlaceholderReplacer;

package/src/utils/meerkat-placeholder-replacer.js.map

@@ -1 +1 @@
-{"version":3,"file":"meerkat-placeholder-replacer.js","sourceRoot":"","sources":["../../../../meerkat-core/src/utils/meerkat-placeholder-replacer.ts"],"names":[],"mappings":";;;AAAA,4DAA4E;AAGrE,MAAM,0BAA0B,GAAG,CACxC,GAAW,EACX,iBAAyB,EACzB,WAAwB,EACxB,EAAE;IACF,MAAM,2BAA2B,GAAG,wCAAwC,CAAC;IAC7E,OAAO,GAAG,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE;QAChE,OAAO,IAAA,sCAAkB,EAAC;YACxB,IAAI,EAAE,IAAA,oCAAgB,EAAC,iBAAiB,EAAE,UAAU,CAAC;YACrD,WAAW;YACX,YAAY,EAAE;gBACZ,eAAe,EAAE,KAAK;aACvB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,0BAA0B,8BAerC"}
+{"version":3,"file":"meerkat-placeholder-replacer.js","sourceRoot":"","sources":["../../../../meerkat-core/src/utils/meerkat-placeholder-replacer.ts"],"names":[],"mappings":";;;AAAA,8DAGwC;AACxC,gFAA2E;AAGpE,MAAM,0BAA0B,GAAG,CACxC,GAAW,EACX,iBAAyB,EACzB,WAAwB,EACxB,MAAoB,EACpB,EAAE;IACF,MAAM,2BAA2B,GAAG,wCAAwC,CAAC;IAC7E,OAAO,GAAG,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE;QAChE,OAAO,IAAA,0BAAc,EACnB,IAAA,qCAAgB,EAAC,iBAAiB,EAAE,UAAU,CAAC,EAC/C,WAAW,EACX,MAAM,CACP,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAdW,QAAA,0BAA0B,8BAcrC"}