@devrev/meerkat-core 0.0.77 → 0.0.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/meerkat-core",
-  "version": "0.0.77",
+  "version": "0.0.79",
   "dependencies": {
     "@swc/helpers": "~0.5.0"
   },

package/src/{get-projection-clause/get-projection-clause.d.ts → get-wrapped-base-query-with-projections/get-aliased-columns-from-filters.d.ts}

@@ -1,27 +1,36 @@
-import { TableSchema } from '../types/cube-types';
-export declare const getFilterMeasureProjection: ({ key, tableSchema, measures, }: {
+import { MeerkatQueryFilter, Query, TableSchema } from "../types/cube-types";
+import { Modifier } from "./sql-expression-modifiers";
+export declare const getDimensionProjection: ({ key, tableSchema, modifiers, query }: {
     key: string;
     tableSchema: TableSchema;
-    measures: string[];
+    modifiers: Modifier[];
+    query: Query;
 }) => {
     sql: undefined;
     foundMember: undefined;
     aliasKey: undefined;
 } | {
     sql: string;
-    foundMember: import("../types/cube-types").Measure;
+    foundMember: import("../types/cube-types").Dimension;
     aliasKey: string;
 };
-export declare const getDimensionProjection: ({ key, tableSchema, }: {
+export declare const getFilterMeasureProjection: ({ key, tableSchema, measures, }: {
     key: string;
     tableSchema: TableSchema;
+    measures: string[];
 }) => {
     sql: undefined;
     foundMember: undefined;
     aliasKey: undefined;
 } | {
     sql: string;
-    foundMember: import("../types/cube-types").Dimension;
+    foundMember: import("../types/cube-types").Measure;
     aliasKey: string;
 };
-export declare const getProjectionClause: (measures: string[], dimensions: string[], tableSchema: TableSchema, aliasedColumnSet: Set<string>) => string;
+export declare const getAliasedColumnsFromFilters: ({ baseSql, meerkatFilters, tableSchema, aliasedColumnSet, query }: {
+    meerkatFilters?: MeerkatQueryFilter[] | undefined;
+    tableSchema: TableSchema;
+    baseSql: string;
+    aliasedColumnSet: Set<string>;
+    query: Query;
+}) => string;

package/src/get-wrapped-base-query-with-projections/get-aliased-columns-from-filters.js

@@ -0,0 +1,141 @@
+"use strict";
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    getDimensionProjection: function() {
+        return getDimensionProjection;
+    },
+    getFilterMeasureProjection: function() {
+        return getFilterMeasureProjection;
+    },
+    getAliasedColumnsFromFilters: function() {
+        return getAliasedColumnsFromFilters;
+    }
+});
+const _findintableschema = require("../utils/find-in-table-schema");
+const _memberkeytosafekey = require("../utils/member-key-to-safe-key");
+const _sqlexpressionmodifiers = require("./sql-expression-modifiers");
+const getDimensionProjection = ({ key, tableSchema, modifiers, query })=>{
+    // Find the table access key
+    const [tableName, measureWithoutTable] = key.split('.');
+    const foundMember = (0, _findintableschema.findInDimensionSchema)(measureWithoutTable, tableSchema);
+    if (!foundMember || tableName !== tableSchema.name) {
+        // If the selected member is not found in the table schema or if it is already selected, continue.
+        // If the selected member is not from the current table, don't create an alias.
+        return {
+            sql: undefined,
+            foundMember: undefined,
+            aliasKey: undefined
+        };
+    }
+    const modifiedSql = (0, _sqlexpressionmodifiers.getModifiedSqlExpression)({
+        dimension: foundMember,
+        key: key,
+        modifiers: modifiers,
+        sqlExpression: foundMember.sql,
+        query
+    });
+    const aliasKey = (0, _memberkeytosafekey.memberKeyToSafeKey)(key);
+    // Add the alias key to the set. So we have a reference to all the previously selected members.
+    return {
+        sql: `${modifiedSql} AS ${aliasKey}`,
+        foundMember,
+        aliasKey
+    };
+};
+const getFilterMeasureProjection = ({ key, tableSchema, measures })=>{
+    const [tableName, measureWithoutTable] = key.split('.');
+    const foundMember = (0, _findintableschema.findInMeasureSchema)(measureWithoutTable, tableSchema);
+    const isMeasure = measures.includes(key);
+    if (!foundMember || isMeasure || tableName !== tableSchema.name) {
+        // If the selected member is not found in the table schema or if it is already selected, continue.
+        // If the selected member is a measure, don't create an alias. Since measure computation is done in the outermost level of the query
+        // If the selected member is not from the current table, don't create an alias.
+        return {
+            sql: undefined,
+            foundMember: undefined,
+            aliasKey: undefined
+        };
+    }
+    const aliasKey = (0, _memberkeytosafekey.memberKeyToSafeKey)(key);
+    return {
+        sql: `${key} AS ${aliasKey}`,
+        foundMember,
+        aliasKey
+    };
+};
+const getFilterProjections = ({ member, tableSchema, measures, query })=>{
+    const memberWithoutTable = member.split('.')[1];
+    const isDimension = (0, _findintableschema.findInDimensionSchema)(memberWithoutTable, tableSchema);
+    if (isDimension) {
+        return getDimensionProjection({
+            key: member,
+            tableSchema,
+            modifiers: [],
+            query
+        });
+    }
+    const isMeasure = (0, _findintableschema.findInMeasureSchema)(memberWithoutTable, tableSchema);
+    if (isMeasure) {
+        return getFilterMeasureProjection({
+            key: member,
+            tableSchema,
+            measures
+        });
+    }
+    return {
+        sql: undefined,
+        foundMember: undefined,
+        aliasKey: undefined
+    };
+};
+const getAliasedColumnsFromFilters = ({ baseSql, meerkatFilters, tableSchema, aliasedColumnSet, query })=>{
+    let sql = baseSql;
+    const { measures } = query;
+    meerkatFilters == null ? void 0 : meerkatFilters.forEach((filter)=>{
+        if ('and' in filter) {
+            // Traverse through the passed 'and' filters
+            sql += getAliasedColumnsFromFilters({
+                baseSql: '',
+                meerkatFilters: filter.and,
+                tableSchema,
+                aliasedColumnSet,
+                query
+            });
+        }
+        if ('or' in filter) {
+            // Traverse through the passed 'or' filters
+            sql += getAliasedColumnsFromFilters({
+                baseSql: '',
+                tableSchema,
+                meerkatFilters: filter.or,
+                aliasedColumnSet,
+                query
+            });
+        }
+        if ('member' in filter) {
+            const { aliasKey, foundMember, sql: memberSql } = getFilterProjections({
+                member: filter.member,
+                tableSchema,
+                measures,
+                query
+            });
+            if (!foundMember || aliasedColumnSet.has(aliasKey)) {
+                // If the selected member is not found in the table schema or if it is already selected, continue.
+                return;
+            }
+            if (aliasKey) {
+                aliasedColumnSet.add(aliasKey);
+            }
+            // Add the alias key to the set. So we have a reference to all the previously selected members.
+            sql += `, ${memberSql}`;
+        }
+    });
+    return sql;
+};
+
+//# sourceMappingURL=get-aliased-columns-from-filters.js.map

package/src/get-wrapped-base-query-with-projections/get-aliased-columns-from-filters.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../meerkat-core/src/get-wrapped-base-query-with-projections/get-aliased-columns-from-filters.ts"],"sourcesContent":["import { MeerkatQueryFilter, Query, TableSchema } from \"../types/cube-types\";\nimport { findInDimensionSchema, findInMeasureSchema } from \"../utils/find-in-table-schema\";\nimport { memberKeyToSafeKey } from \"../utils/member-key-to-safe-key\";\nimport { getModifiedSqlExpression, Modifier } from \"./sql-expression-modifiers\";\n\n\nexport const getDimensionProjection = ({\n  key,\n  tableSchema,\n  modifiers,\n  query\n}: {\n  key: string;\n  tableSchema: TableSchema;\n  modifiers: Modifier[],\n  query: Query\n}) => {\n  // Find the table access key\n  const [tableName, measureWithoutTable] = key.split('.');\n\n  const foundMember = findInDimensionSchema(measureWithoutTable, tableSchema);\n  if (!foundMember || tableName !== tableSchema.name) {\n    // If the selected member is not found in the table schema or if it is already selected, continue.\n    // If the selected member is not from the current table, don't create an alias.\n    return {\n      sql: undefined,\n      foundMember: undefined,\n      aliasKey: undefined,\n    };\n  }\n\n  const modifiedSql = getModifiedSqlExpression({\n    dimension: foundMember,\n    key: key,\n    modifiers: modifiers,\n    sqlExpression: foundMember.sql,\n    query\n  })\n\n  const aliasKey = memberKeyToSafeKey(key);\n  // Add the alias key to the set. So we have a reference to all the previously selected members.\n  return { sql: `${modifiedSql} AS ${aliasKey}`, foundMember, aliasKey };\n};\n\n\nexport const getFilterMeasureProjection = ({\n  key,\n  tableSchema,\n  measures,\n}: {\n  key: string;\n  tableSchema: TableSchema;\n  measures: string[];\n}) => {\n  const [tableName, measureWithoutTable] = key.split('.');\n  const foundMember = findInMeasureSchema(measureWithoutTable, tableSchema);\n  const isMeasure = measures.includes(key);\n  if (!foundMember || isMeasure || tableName !== tableSchema.name) {\n    // If the selected member is not found in the table schema or if it is already selected, continue.\n    // If the selected member is a measure, don't create an alias. Since measure computation is done in the outermost level of the query\n    // If the selected member is not from the current table, don't create an alias.\n    return {\n      sql: undefined,\n      foundMember: undefined,\n      aliasKey: undefined,\n    };\n  }\n  const aliasKey = memberKeyToSafeKey(key);\n  return { sql: `${key} AS ${aliasKey}`, foundMember, aliasKey };\n};\n\n\nconst getFilterProjections = ({\n  member,\n  tableSchema,\n  measures,\n  query\n}: {\n  member: string;\n  tableSchema: TableSchema;\n  measures: string[];\n  query: Query\n}) => {\n  const memberWithoutTable = member.split('.')[1];\n  const isDimension = findInDimensionSchema(memberWithoutTable, tableSchema);\n  if (isDimension) {\n    return getDimensionProjection({ key: member, tableSchema, modifiers: [], query });\n  }\n  const isMeasure = findInMeasureSchema(memberWithoutTable, tableSchema);\n  if (isMeasure) {\n    return getFilterMeasureProjection({ key: member, tableSchema, measures });\n  }\n  return {\n    sql: undefined,\n    foundMember: undefined,\n    aliasKey: undefined,\n  };\n};\n\n\nexport const getAliasedColumnsFromFilters = ({\n  baseSql,\n  meerkatFilters,\n  tableSchema,\n  aliasedColumnSet,\n  query\n}: {\n  meerkatFilters?: MeerkatQueryFilter[];\n  tableSchema: TableSchema;\n  baseSql: string;\n  aliasedColumnSet: Set<string>;\n  query: Query;\n}) => {\n  let sql = baseSql;\n  const { measures } = query;\n  meerkatFilters?.forEach((filter) => {\n    if ('and' in filter) {\n      // Traverse through the passed 'and' filters\n      sql += getAliasedColumnsFromFilters({\n        baseSql: '',\n        meerkatFilters: filter.and,\n        tableSchema,\n        aliasedColumnSet,\n        query,\n      });\n    }\n    if ('or' in filter) {\n      // Traverse through the passed 'or' filters\n      sql += getAliasedColumnsFromFilters({\n        baseSql: '',\n        tableSchema,\n        meerkatFilters: filter.or,\n        aliasedColumnSet,\n        query,\n      });\n    }\n    if ('member' in filter) {\n      const {\n        aliasKey,\n        foundMember,\n        sql: memberSql,\n      } = getFilterProjections({\n        member: filter.member,\n        tableSchema,\n        measures,\n        query\n      });\n      if (!foundMember || aliasedColumnSet.has(aliasKey)) {\n        // If the selected member is not found in the table schema or if it is already selected, continue.\n        return;\n      }\n      if (aliasKey) {\n        aliasedColumnSet.add(aliasKey);\n      }\n      // Add the alias key to the set. So we have a reference to all the previously selected members.\n      sql += `, ${memberSql}`;\n    }\n  });\n  return sql;\n};\n  "],"names":["getDimensionProjection","getFilterMeasureProjection","getAliasedColumnsFromFilters","key","tableSchema","modifiers","query","tableName","measureWithoutTable","split","foundMember","findInDimensionSchema","name","sql","undefined","aliasKey","modifiedSql","getModifiedSqlExpression","dimension","sqlExpression","memberKeyToSafeKey","measures","findInMeasureSchema","isMeasure","includes","getFilterProjections","member","memberWithoutTable","isDimension","baseSql","meerkatFilters","aliasedColumnSet","forEach","filter","and","or","memberSql","has","add"],"mappings":"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"}

package/src/get-wrapped-base-query-with-projections/get-projection-clause.d.ts

@@ -0,0 +1,2 @@
+import { Query, TableSchema } from '../types/cube-types';
+export declare const getProjectionClause: (query: Query, tableSchema: TableSchema, aliasedColumnSet: Set<string>) => string;

package/src/get-wrapped-base-query-with-projections/get-projection-clause.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "getProjectionClause", {
+    enumerable: true,
+    get: function() {
+        return getProjectionClause;
+    }
+});
+const _cubemeasuretransformer = require("../cube-measure-transformer/cube-measure-transformer");
+const _memberkeytosafekey = require("../utils/member-key-to-safe-key");
+const _getaliasedcolumnsfromfilters = require("./get-aliased-columns-from-filters");
+const _sqlexpressionmodifiers = require("./sql-expression-modifiers");
+const aggregator = ({ member, aliasedColumnSet, acc, sql })=>{
+    if (aliasedColumnSet.has(member) || !sql) {
+        return acc;
+    }
+    aliasedColumnSet.add(member);
+    acc.push(sql);
+    return acc;
+};
+const getProjectionClause = (query, tableSchema, aliasedColumnSet)=>{
+    const { measures, dimensions = [] } = query;
+    const filteredDimensions = dimensions.filter((dimension)=>{
+        return dimension.split('.')[0] === tableSchema.name;
+    });
+    const filteredMeasures = measures.filter((measure)=>{
+        return measure.split('.')[0] === tableSchema.name;
+    });
+    const dimensionsProjectionsArr = filteredDimensions.reduce((acc, member, currentIndex, members)=>{
+        const { sql: memberSql } = (0, _getaliasedcolumnsfromfilters.getDimensionProjection)({
+            key: member,
+            tableSchema,
+            modifiers: _sqlexpressionmodifiers.MODIFIERS,
+            query
+        });
+        return aggregator({
+            member,
+            aliasedColumnSet,
+            acc,
+            currentIndex,
+            members,
+            sql: memberSql
+        });
+    }, []);
+    const dimensionsProjections = dimensionsProjectionsArr.join(', ');
+    const measureProjectionsArr = filteredMeasures.reduce((acc, member, currentIndex, members)=>{
+        const { sql: memberSql } = (0, _getaliasedcolumnsfromfilters.getFilterMeasureProjection)({
+            key: member,
+            tableSchema,
+            measures
+        });
+        return aggregator({
+            member,
+            aliasedColumnSet,
+            acc,
+            currentIndex,
+            members,
+            sql: memberSql
+        });
+    }, []);
+    const measureProjections = measureProjectionsArr.join(', ');
+    const usedMeasureObjects = tableSchema.measures.filter((measure)=>{
+        return measures.findIndex((key)=>{
+            const keyWithoutTable = key.split('.')[1];
+            return keyWithoutTable === measure.name;
+        }) !== -1;
+    });
+    const columnsUsedInMeasures = (0, _cubemeasuretransformer.getAllColumnUsedInMeasures)(usedMeasureObjects, tableSchema);
+    let columnsUsedInMeasuresInProjection = '';
+    columnsUsedInMeasures.forEach((column, index)=>{
+        const safeKey = (0, _memberkeytosafekey.memberKeyToSafeKey)(column);
+        columnsUsedInMeasuresInProjection += `${column} AS ${safeKey}`;
+        if (index !== columnsUsedInMeasures.length - 1) {
+            columnsUsedInMeasuresInProjection += ', ';
+        }
+    });
+    const combinedStr = [
+        dimensionsProjections,
+        measureProjections,
+        columnsUsedInMeasuresInProjection
+    ];
+    return combinedStr.filter((str)=>str.length > 0).join(', ');
+};
+
+//# sourceMappingURL=get-projection-clause.js.map

package/src/get-wrapped-base-query-with-projections/get-projection-clause.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../meerkat-core/src/get-wrapped-base-query-with-projections/get-projection-clause.ts"],"sourcesContent":["import { getAllColumnUsedInMeasures } from '../cube-measure-transformer/cube-measure-transformer';\nimport { Query, TableSchema } from '../types/cube-types';\nimport { memberKeyToSafeKey } from '../utils/member-key-to-safe-key';\nimport { getDimensionProjection, getFilterMeasureProjection } from './get-aliased-columns-from-filters';\nimport { MODIFIERS } from './sql-expression-modifiers';\n\nconst aggregator = ({\n  member,\n  aliasedColumnSet,\n  acc,\n  sql,\n}: {\n  member: string;\n  aliasedColumnSet: Set<string>;\n  acc: string[];\n  sql?: string;\n  currentIndex: number;\n  members: string[];\n}) => {\n  if (aliasedColumnSet.has(member) || !sql) {\n    return acc;\n  }\n  aliasedColumnSet.add(member);\n  acc.push(sql);\n  return acc;\n};\n\nexport const getProjectionClause = (\n  query: Query,\n  tableSchema: TableSchema,\n  aliasedColumnSet: Set<string>\n) => {\n  const { measures, dimensions = [] } = query;\n  const filteredDimensions = dimensions.filter((dimension) => {\n    return dimension.split('.')[0] === tableSchema.name;\n  });\n  const filteredMeasures = measures.filter((measure) => {\n    return measure.split('.')[0] === tableSchema.name;\n  });\n  const dimensionsProjectionsArr = filteredDimensions.reduce(\n    (acc, member, currentIndex, members) => {\n      const { sql: memberSql } = getDimensionProjection({\n        key: member,\n        tableSchema,\n        modifiers: MODIFIERS,\n        query\n      });\n      return aggregator({\n        member,\n        aliasedColumnSet,\n        acc,\n        currentIndex,\n        members,\n        sql: memberSql,\n      });\n    },\n    [] as string[]\n  );\n  const dimensionsProjections = dimensionsProjectionsArr.join(', ');\n\n  const measureProjectionsArr = filteredMeasures.reduce(\n    (acc, member, currentIndex, members) => {\n      const { sql: memberSql } = getFilterMeasureProjection({\n        key: member,\n        tableSchema,\n        measures,\n      });\n      return aggregator({\n        member,\n        aliasedColumnSet,\n        acc,\n        currentIndex,\n        members,\n        sql: memberSql,\n      });\n    },\n    [] as string[]\n  );\n\n  const measureProjections = measureProjectionsArr.join(', ');\n\n  const usedMeasureObjects = tableSchema.measures.filter((measure) => {\n    return (\n      measures.findIndex((key) => {\n        const keyWithoutTable = key.split('.')[1];\n        return keyWithoutTable === measure.name;\n      }) !== -1\n    );\n  });\n  const columnsUsedInMeasures = getAllColumnUsedInMeasures(\n    usedMeasureObjects,\n    tableSchema\n  );\n\n  let columnsUsedInMeasuresInProjection = '';\n  columnsUsedInMeasures.forEach((column, index) => {\n    const safeKey = memberKeyToSafeKey(column);\n    columnsUsedInMeasuresInProjection += `${column} AS ${safeKey}`;\n    if (index !== columnsUsedInMeasures.length - 1) {\n      columnsUsedInMeasuresInProjection += ', ';\n    }\n  });\n\n  const combinedStr = [\n    dimensionsProjections,\n    measureProjections,\n    columnsUsedInMeasuresInProjection,\n  ];\n\n  return combinedStr.filter((str) => str.length > 0).join(', ');\n};\n"],"names":["getProjectionClause","aggregator","member","aliasedColumnSet","acc","sql","has","add","push","query","tableSchema","measures","dimensions","filteredDimensions","filter","dimension","split","name","filteredMeasures","measure","dimensionsProjectionsArr","reduce","currentIndex","members","memberSql","getDimensionProjection","key","modifiers","MODIFIERS","dimensionsProjections","join","measureProjectionsArr","getFilterMeasureProjection","measureProjections","usedMeasureObjects","findIndex","keyWithoutTable","columnsUsedInMeasures","getAllColumnUsedInMeasures","columnsUsedInMeasuresInProjection","forEach","column","index","safeKey","memberKeyToSafeKey","length","combinedStr","str"],"mappings":";+BA2BaA;;;eAAAA;;;wCA3B8B;oCAER;8CACgC;wCACzC;AAE1B,MAAMC,aAAa,CAAC,EAClBC,MAAM,EACNC,gBAAgB,EAChBC,GAAG,EACHC,GAAG,EAQJ;IACC,IAAIF,iBAAiBG,GAAG,CAACJ,WAAW,CAACG,KAAK;QACxC,OAAOD;IACT;IACAD,iBAAiBI,GAAG,CAACL;IACrBE,IAAII,IAAI,CAACH;IACT,OAAOD;AACT;AAEO,MAAMJ,sBAAsB,CACjCS,OACAC,aACAP;IAEA,MAAM,EAAEQ,QAAQ,EAAEC,aAAa,EAAE,EAAE,GAAGH;IACtC,MAAMI,qBAAqBD,WAAWE,MAAM,CAAC,CAACC;QAC5C,OAAOA,UAAUC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAKN,YAAYO,IAAI;IACrD;IACA,MAAMC,mBAAmBP,SAASG,MAAM,CAAC,CAACK;QACxC,OAAOA,QAAQH,KAAK,CAAC,IAAI,CAAC,EAAE,KAAKN,YAAYO,IAAI;IACnD;IACA,MAAMG,2BAA2BP,mBAAmBQ,MAAM,CACxD,CAACjB,KAAKF,QAAQoB,cAAcC;QAC1B,MAAM,EAAElB,KAAKmB,SAAS,EAAE,GAAGC,IAAAA,oDAAsB,EAAC;YAChDC,KAAKxB;YACLQ;YACAiB,WAAWC,iCAAS;YACpBnB;QACF;QACA,OAAOR,WAAW;YAChBC;YACAC;YACAC;YACAkB;YACAC;YACAlB,KAAKmB;QACP;IACF,GACA,EAAE;IAEJ,MAAMK,wBAAwBT,yBAAyBU,IAAI,CAAC;IAE5D,MAAMC,wBAAwBb,iBAAiBG,MAAM,CACnD,CAACjB,KAAKF,QAAQoB,cAAcC;QAC1B,MAAM,EAAElB,KAAKmB,SAAS,EAAE,GAAGQ,IAAAA,wDAA0B,EAAC;YACpDN,KAAKxB;YACLQ;YACAC;QACF;QACA,OAAOV,WAAW;YAChBC;YACAC;YACAC;YACAkB;YACAC;YACAlB,KAAKmB;QACP;IACF,GACA,EAAE;IAGJ,MAAMS,qBAAqBF,sBAAsBD,IAAI,CAAC;IAEtD,MAAMI,qBAAqBxB,YAAYC,QAAQ,CAACG,MAAM,CAAC,CAACK;QACtD,OACER,SAASwB,SAAS,CAAC,CAACT;YAClB,MAAMU,kBAAkBV,IAAIV,KAAK,CAAC,IAAI,CAAC,EAAE;YACzC,OAAOoB,oBAAoBjB,QAAQF,IAAI;QACzC,OAAO,CAAC;IAEZ;IACA,MAAMoB,wBAAwBC,IAAAA,kDAA0B,EACtDJ,oBACAxB;IAGF,IAAI6B,oCAAoC;IACxCF,sBAAsBG,OAAO,CAAC,CAACC,QAAQC;QACrC,MAAMC,UAAUC,IAAAA,sCAAkB,EAACH;QACnCF,qCAAqC,CAAC,EAAEE,OAAO,IAAI,EAAEE,QAAQ,CAAC;QAC9D,IAAID,UAAUL,sBAAsBQ,MAAM,GAAG,GAAG;YAC9CN,qCAAqC;QACvC;IACF;IAEA,MAAMO,cAAc;QAClBjB;QACAI;QACAM;KACD;IAED,OAAOO,YAAYhC,MAAM,CAAC,CAACiC,MAAQA,IAAIF,MAAM,GAAG,GAAGf,IAAI,CAAC;AAC1D"}

package/src/get-wrapped-base-query-with-projections/get-wrapped-base-query-with-projections.js

@@ -6,73 +6,8 @@ Object.defineProperty(exports, "getWrappedBaseQueryWithProjections", {
     }
 });
 const _cubemeasuretransformer = require("../cube-measure-transformer/cube-measure-transformer");
-const _getprojectionclause = require("../get-projection-clause/get-projection-clause");
-const _findintableschema = require("../utils/find-in-table-schema");
-const getFilterProjections = ({ member, tableSchema, measures })=>{
-    const memberWithoutTable = member.split('.')[1];
-    const isDimension = (0, _findintableschema.findInDimensionSchema)(memberWithoutTable, tableSchema);
-    if (isDimension) {
-        return (0, _getprojectionclause.getDimensionProjection)({
-            key: member,
-            tableSchema
-        });
-    }
-    const isMeasure = (0, _findintableschema.findInMeasureSchema)(memberWithoutTable, tableSchema);
-    if (isMeasure) {
-        return (0, _getprojectionclause.getFilterMeasureProjection)({
-            key: member,
-            tableSchema,
-            measures
-        });
-    }
-    return {
-        sql: undefined,
-        foundMember: undefined,
-        aliasKey: undefined
-    };
-};
-const getAliasedColumnsFromFilters = ({ baseSql, meerkatFilters, tableSchema, aliasedColumnSet, measures })=>{
-    let sql = baseSql;
-    meerkatFilters == null ? void 0 : meerkatFilters.forEach((filter)=>{
-        if ('and' in filter) {
-            // Traverse through the passed 'and' filters
-            sql += getAliasedColumnsFromFilters({
-                baseSql: '',
-                meerkatFilters: filter.and,
-                tableSchema,
-                aliasedColumnSet,
-                measures
-            });
-        }
-        if ('or' in filter) {
-            // Traverse through the passed 'or' filters
-            sql += getAliasedColumnsFromFilters({
-                baseSql: '',
-                tableSchema,
-                meerkatFilters: filter.or,
-                aliasedColumnSet,
-                measures
-            });
-        }
-        if ('member' in filter) {
-            const { aliasKey, foundMember, sql: memberSql } = getFilterProjections({
-                member: filter.member,
-                tableSchema,
-                measures
-            });
-            if (!foundMember || aliasedColumnSet.has(aliasKey)) {
-                // If the selected member is not found in the table schema or if it is already selected, continue.
-                return;
-            }
-            if (aliasKey) {
-                aliasedColumnSet.add(aliasKey);
-            }
-            // Add the alias key to the set. So we have a reference to all the previously selected members.
-            sql += `, ${memberSql}`;
-        }
-    });
-    return sql;
-};
+const _getaliasedcolumnsfromfilters = require("./get-aliased-columns-from-filters");
+const _getprojectionclause = require("./get-projection-clause");
 const getWrappedBaseQueryWithProjections = ({ baseQuery, tableSchema, query })=>{
     /*
    * Im order to be able to filter on computed metric from a query, we need to project the computed metric in the base query.
@@ -80,16 +15,15 @@ const getWrappedBaseQueryWithProjections = ({ baseQuery, tableSchema, query })=>
    */ // Wrap the query into another 'SELECT * FROM (baseQuery) AS baseTable'' in order to project everything in the base query, and other computed metrics to be able to filter on them
     const newBaseSql = `SELECT * FROM (${baseQuery}) AS ${tableSchema.name}`;
     const aliasedColumnSet = new Set();
-    const aliasFromFilters = getAliasedColumnsFromFilters({
+    const aliasFromFilters = (0, _getaliasedcolumnsfromfilters.getAliasedColumnsFromFilters)({
         aliasedColumnSet,
         baseSql: 'SELECT *',
         // setting measures to empty array, since we don't want to project measures present in the filters in the base query
         tableSchema: tableSchema,
-        meerkatFilters: query.filters,
-        measures: query.measures
+        query,
+        meerkatFilters: query.filters
     });
-    var _query_dimensions;
-    const memberProjections = (0, _getprojectionclause.getProjectionClause)(query.measures, (_query_dimensions = query.dimensions) != null ? _query_dimensions : [], tableSchema, aliasedColumnSet);
+    const memberProjections = (0, _getprojectionclause.getProjectionClause)(query, tableSchema, aliasedColumnSet);
     const formattedMemberProjection = memberProjections ? `, ${memberProjections}` : '';
     const finalAliasedColumnsClause = aliasFromFilters + formattedMemberProjection;
     const sqlWithFilterProjects = (0, _cubemeasuretransformer.getSelectReplacedSql)(newBaseSql, finalAliasedColumnsClause);

package/src/get-wrapped-base-query-with-projections/get-wrapped-base-query-with-projections.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../meerkat-core/src/get-wrapped-base-query-with-projections/get-wrapped-base-query-with-projections.ts"],"sourcesContent":["import { getSelectReplacedSql } from '../cube-measure-transformer/cube-measure-transformer';\nimport {\n  getDimensionProjection,\n  getFilterMeasureProjection as getFilterMeasureProjections,\n  getProjectionClause,\n} from '../get-projection-clause/get-projection-clause';\nimport { MeerkatQueryFilter, Query, TableSchema } from '../types/cube-types';\nimport {\n  findInDimensionSchema,\n  findInMeasureSchema,\n} from '../utils/find-in-table-schema';\n\ninterface GetWrappedBaseQueryWithProjectionsParams {\n  baseQuery: string;\n  tableSchema: TableSchema;\n  query: Query;\n}\n\nconst getFilterProjections = ({\n  member,\n  tableSchema,\n  measures,\n}: {\n  member: string;\n  tableSchema: TableSchema;\n  measures: string[];\n}) => {\n  const memberWithoutTable = member.split('.')[1];\n  const isDimension = findInDimensionSchema(memberWithoutTable, tableSchema);\n  if (isDimension) {\n    return getDimensionProjection({ key: member, tableSchema });\n  }\n  const isMeasure = findInMeasureSchema(memberWithoutTable, tableSchema);\n  if (isMeasure) {\n    return getFilterMeasureProjections({ key: member, tableSchema, measures });\n  }\n  return {\n    sql: undefined,\n    foundMember: undefined,\n    aliasKey: undefined,\n  };\n};\n\nconst getAliasedColumnsFromFilters = ({\n  baseSql,\n  meerkatFilters,\n  tableSchema,\n  aliasedColumnSet,\n  measures,\n}: {\n  meerkatFilters?: MeerkatQueryFilter[];\n  tableSchema: TableSchema;\n  baseSql: string;\n  aliasedColumnSet: Set<string>;\n  measures: string[];\n}) => {\n  let sql = baseSql;\n  meerkatFilters?.forEach((filter) => {\n    if ('and' in filter) {\n      // Traverse through the passed 'and' filters\n      sql += getAliasedColumnsFromFilters({\n        baseSql: '',\n        meerkatFilters: filter.and,\n        tableSchema,\n        aliasedColumnSet,\n        measures,\n      });\n    }\n    if ('or' in filter) {\n      // Traverse through the passed 'or' filters\n      sql += getAliasedColumnsFromFilters({\n        baseSql: '',\n        tableSchema,\n        meerkatFilters: filter.or,\n        aliasedColumnSet,\n        measures,\n      });\n    }\n    if ('member' in filter) {\n      const {\n        aliasKey,\n        foundMember,\n        sql: memberSql,\n      } = getFilterProjections({\n        member: filter.member,\n        tableSchema,\n        measures,\n      });\n      if (!foundMember || aliasedColumnSet.has(aliasKey)) {\n        // If the selected member is not found in the table schema or if it is already selected, continue.\n        return;\n      }\n      if (aliasKey) {\n        aliasedColumnSet.add(aliasKey);\n      }\n      // Add the alias key to the set. So we have a reference to all the previously selected members.\n      sql += `, ${memberSql}`;\n    }\n  });\n  return sql;\n};\n\nexport const getWrappedBaseQueryWithProjections = ({\n  baseQuery,\n  tableSchema,\n  query,\n}: GetWrappedBaseQueryWithProjectionsParams) => {\n  /*\n   * Im order to be able to filter on computed metric from a query, we need to project the computed metric in the base query.\n   * If theres filters supplied, we can safely return the original base query. Since nothing need to be projected and filtered in this case\n   */\n  // Wrap the query into another 'SELECT * FROM (baseQuery) AS baseTable'' in order to project everything in the base query, and other computed metrics to be able to filter on them\n  const newBaseSql = `SELECT * FROM (${baseQuery}) AS ${tableSchema.name}`;\n  const aliasedColumnSet = new Set<string>();\n\n  const aliasFromFilters = getAliasedColumnsFromFilters({\n    aliasedColumnSet,\n    baseSql: 'SELECT *',\n    // setting measures to empty array, since we don't want to project measures present in the filters in the base query\n    tableSchema: tableSchema,\n    meerkatFilters: query.filters,\n    measures: query.measures,\n  });\n\n  const memberProjections = getProjectionClause(\n    query.measures,\n    query.dimensions ?? [],\n    tableSchema,\n    aliasedColumnSet\n  );\n  const formattedMemberProjection = memberProjections\n    ? `, ${memberProjections}`\n    : '';\n\n  const finalAliasedColumnsClause =\n    aliasFromFilters + formattedMemberProjection;\n\n  const sqlWithFilterProjects = getSelectReplacedSql(\n    newBaseSql,\n    finalAliasedColumnsClause\n  );\n  return sqlWithFilterProjects;\n};\n"],"names":["getWrappedBaseQueryWithProjections","getFilterProjections","member","tableSchema","measures","memberWithoutTable","split","isDimension","findInDimensionSchema","getDimensionProjection","key","isMeasure","findInMeasureSchema","getFilterMeasureProjections","sql","undefined","foundMember","aliasKey","getAliasedColumnsFromFilters","baseSql","meerkatFilters","aliasedColumnSet","forEach","filter","and","or","memberSql","has","add","baseQuery","query","newBaseSql","name","Set","aliasFromFilters","filters","memberProjections","getProjectionClause","dimensions","formattedMemberProjection","finalAliasedColumnsClause","sqlWithFilterProjects","getSelectReplacedSql"],"mappings":";+BAsGaA;;;eAAAA;;;wCAtGwB;qCAK9B;mCAKA;AAQP,MAAMC,uBAAuB,CAAC,EAC5BC,MAAM,EACNC,WAAW,EACXC,QAAQ,EAKT;IACC,MAAMC,qBAAqBH,OAAOI,KAAK,CAAC,IAAI,CAAC,EAAE;IAC/C,MAAMC,cAAcC,IAAAA,wCAAqB,EAACH,oBAAoBF;IAC9D,IAAII,aAAa;QACf,OAAOE,IAAAA,2CAAsB,EAAC;YAAEC,KAAKR;YAAQC;QAAY;IAC3D;IACA,MAAMQ,YAAYC,IAAAA,sCAAmB,EAACP,oBAAoBF;IAC1D,IAAIQ,WAAW;QACb,OAAOE,IAAAA,+CAA2B,EAAC;YAAEH,KAAKR;YAAQC;YAAaC;QAAS;IAC1E;IACA,OAAO;QACLU,KAAKC;QACLC,aAAaD;QACbE,UAAUF;IACZ;AACF;AAEA,MAAMG,+BAA+B,CAAC,EACpCC,OAAO,EACPC,cAAc,EACdjB,WAAW,EACXkB,gBAAgB,EAChBjB,QAAQ,EAOT;IACC,IAAIU,MAAMK;IACVC,kCAAAA,eAAgBE,OAAO,CAAC,CAACC;QACvB,IAAI,SAASA,QAAQ;YACnB,4CAA4C;YAC5CT,OAAOI,6BAA6B;gBAClCC,SAAS;gBACTC,gBAAgBG,OAAOC,GAAG;gBAC1BrB;gBACAkB;gBACAjB;YACF;QACF;QACA,IAAI,QAAQmB,QAAQ;YAClB,2CAA2C;YAC3CT,OAAOI,6BAA6B;gBAClCC,SAAS;gBACThB;gBACAiB,gBAAgBG,OAAOE,EAAE;gBACzBJ;gBACAjB;YACF;QACF;QACA,IAAI,YAAYmB,QAAQ;YACtB,MAAM,EACJN,QAAQ,EACRD,WAAW,EACXF,KAAKY,SAAS,EACf,GAAGzB,qBAAqB;gBACvBC,QAAQqB,OAAOrB,MAAM;gBACrBC;gBACAC;YACF;YACA,IAAI,CAACY,eAAeK,iBAAiBM,GAAG,CAACV,WAAW;gBAClD,kGAAkG;gBAClG;YACF;YACA,IAAIA,UAAU;gBACZI,iBAAiBO,GAAG,CAACX;YACvB;YACA,+FAA+F;YAC/FH,OAAO,CAAC,EAAE,EAAEY,UAAU,CAAC;QACzB;IACF;IACA,OAAOZ;AACT;AAEO,MAAMd,qCAAqC,CAAC,EACjD6B,SAAS,EACT1B,WAAW,EACX2B,KAAK,EACoC;IACzC;;;GAGC,GACD,kLAAkL;IAClL,MAAMC,aAAa,CAAC,eAAe,EAAEF,UAAU,KAAK,EAAE1B,YAAY6B,IAAI,CAAC,CAAC;IACxE,MAAMX,mBAAmB,IAAIY;IAE7B,MAAMC,mBAAmBhB,6BAA6B;QACpDG;QACAF,SAAS;QACT,oHAAoH;QACpHhB,aAAaA;QACbiB,gBAAgBU,MAAMK,OAAO;QAC7B/B,UAAU0B,MAAM1B,QAAQ;IAC1B;QAIE0B;IAFF,MAAMM,oBAAoBC,IAAAA,wCAAmB,EAC3CP,MAAM1B,QAAQ,EACd0B,CAAAA,oBAAAA,MAAMQ,UAAU,YAAhBR,oBAAoB,EAAE,EACtB3B,aACAkB;IAEF,MAAMkB,4BAA4BH,oBAC9B,CAAC,EAAE,EAAEA,kBAAkB,CAAC,GACxB;IAEJ,MAAMI,4BACJN,mBAAmBK;IAErB,MAAME,wBAAwBC,IAAAA,4CAAoB,EAChDX,YACAS;IAEF,OAAOC;AACT"}
+{"version":3,"sources":["../../../../meerkat-core/src/get-wrapped-base-query-with-projections/get-wrapped-base-query-with-projections.ts"],"sourcesContent":["import { getSelectReplacedSql } from '../cube-measure-transformer/cube-measure-transformer';\nimport { Query, TableSchema } from '../types/cube-types';\nimport { getAliasedColumnsFromFilters } from './get-aliased-columns-from-filters';\nimport {\n  getProjectionClause\n} from './get-projection-clause';\n\ninterface GetWrappedBaseQueryWithProjectionsParams {\n  baseQuery: string;\n  tableSchema: TableSchema;\n  query: Query;\n}\n\nexport const getWrappedBaseQueryWithProjections = ({\n  baseQuery,\n  tableSchema,\n  query,\n}: GetWrappedBaseQueryWithProjectionsParams) => {\n  /*\n   * Im order to be able to filter on computed metric from a query, we need to project the computed metric in the base query.\n   * If theres filters supplied, we can safely return the original base query. Since nothing need to be projected and filtered in this case\n   */\n  // Wrap the query into another 'SELECT * FROM (baseQuery) AS baseTable'' in order to project everything in the base query, and other computed metrics to be able to filter on them\n  const newBaseSql = `SELECT * FROM (${baseQuery}) AS ${tableSchema.name}`;\n  const aliasedColumnSet = new Set<string>();\n\n  const aliasFromFilters = getAliasedColumnsFromFilters({\n    aliasedColumnSet,\n    baseSql: 'SELECT *',\n    // setting measures to empty array, since we don't want to project measures present in the filters in the base query\n    tableSchema: tableSchema,\n    query,\n    meerkatFilters: query.filters,\n  });\n\n  const memberProjections = getProjectionClause(\n    query,\n    tableSchema,\n    aliasedColumnSet\n  );\n  const formattedMemberProjection = memberProjections\n    ? `, ${memberProjections}`\n    : '';\n\n  const finalAliasedColumnsClause =\n    aliasFromFilters + formattedMemberProjection;\n\n  const sqlWithFilterProjects = getSelectReplacedSql(\n    newBaseSql,\n    finalAliasedColumnsClause\n  );\n  return sqlWithFilterProjects;\n};\n"],"names":["getWrappedBaseQueryWithProjections","baseQuery","tableSchema","query","newBaseSql","name","aliasedColumnSet","Set","aliasFromFilters","getAliasedColumnsFromFilters","baseSql","meerkatFilters","filters","memberProjections","getProjectionClause","formattedMemberProjection","finalAliasedColumnsClause","sqlWithFilterProjects","getSelectReplacedSql"],"mappings":";+BAaaA;;;eAAAA;;;wCAbwB;8CAEQ;qCAGtC;AAQA,MAAMA,qCAAqC,CAAC,EACjDC,SAAS,EACTC,WAAW,EACXC,KAAK,EACoC;IACzC;;;GAGC,GACD,kLAAkL;IAClL,MAAMC,aAAa,CAAC,eAAe,EAAEH,UAAU,KAAK,EAAEC,YAAYG,IAAI,CAAC,CAAC;IACxE,MAAMC,mBAAmB,IAAIC;IAE7B,MAAMC,mBAAmBC,IAAAA,0DAA4B,EAAC;QACpDH;QACAI,SAAS;QACT,oHAAoH;QACpHR,aAAaA;QACbC;QACAQ,gBAAgBR,MAAMS,OAAO;IAC/B;IAEA,MAAMC,oBAAoBC,IAAAA,wCAAmB,EAC3CX,OACAD,aACAI;IAEF,MAAMS,4BAA4BF,oBAC9B,CAAC,EAAE,EAAEA,kBAAkB,CAAC,GACxB;IAEJ,MAAMG,4BACJR,mBAAmBO;IAErB,MAAME,wBAAwBC,IAAAA,4CAAoB,EAChDd,YACAY;IAEF,OAAOC;AACT"}

package/src/get-wrapped-base-query-with-projections/sql-expression-modifiers.d.ts

@@ -0,0 +1,18 @@
+import { Dimension, Query } from "../types/cube-types";
+export interface DimensionModifier {
+    sqlExpression: string;
+    dimension: Dimension;
+    key: string;
+    query: Query;
+}
+export declare const arrayFieldUnNestModifier: ({ sqlExpression }: DimensionModifier) => string;
+export declare const shouldUnnest: ({ dimension, query }: DimensionModifier) => boolean;
+export type Modifier = {
+    name: string;
+    matcher: (modifier: DimensionModifier) => boolean;
+    modifier: (modifier: DimensionModifier) => string;
+};
+export declare const MODIFIERS: Modifier[];
+export declare const getModifiedSqlExpression: ({ sqlExpression, dimension, key, modifiers, query }: DimensionModifier & {
+    modifiers: Modifier[];
+}) => string;

package/src/get-wrapped-base-query-with-projections/sql-expression-modifiers.js

@@ -0,0 +1,60 @@
+"use strict";
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    arrayFieldUnNestModifier: function() {
+        return arrayFieldUnNestModifier;
+    },
+    shouldUnnest: function() {
+        return shouldUnnest;
+    },
+    MODIFIERS: function() {
+        return MODIFIERS;
+    },
+    getModifiedSqlExpression: function() {
+        return getModifiedSqlExpression;
+    }
+});
+const _isarraymembertype = require("../utils/is-array-member-type");
+const arrayFieldUnNestModifier = ({ sqlExpression })=>{
+    return `array[unnest(${sqlExpression})]`;
+};
+const shouldUnnest = ({ dimension, query })=>{
+    var _dimension_modifier;
+    const isArrayType = (0, _isarraymembertype.isArrayTypeMember)(dimension.type);
+    const hasUnNestedGroupBy = (_dimension_modifier = dimension.modifier) == null ? void 0 : _dimension_modifier.shouldUnnestGroupBy;
+    return !!(isArrayType && hasUnNestedGroupBy && query.measures.length > 0);
+};
+const MODIFIERS = [
+    {
+        name: 'shouldUnnestGroupBy',
+        matcher: shouldUnnest,
+        modifier: arrayFieldUnNestModifier
+    }
+];
+const getModifiedSqlExpression = ({ sqlExpression, dimension, key, modifiers, query })=>{
+    let finalDimension = sqlExpression;
+    modifiers.forEach(({ modifier, matcher })=>{
+        const shouldModify = matcher({
+            sqlExpression: finalDimension,
+            dimension,
+            key,
+            query
+        });
+        if (shouldModify) {
+            finalDimension = modifier({
+                sqlExpression: finalDimension,
+                dimension,
+                key,
+                query
+            });
+        }
+    });
+    return finalDimension;
+};
+
+//# sourceMappingURL=sql-expression-modifiers.js.map

package/src/get-wrapped-base-query-with-projections/sql-expression-modifiers.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../meerkat-core/src/get-wrapped-base-query-with-projections/sql-expression-modifiers.ts"],"sourcesContent":["import { Dimension, Query } from \"../types/cube-types\";\nimport { isArrayTypeMember } from \"../utils/is-array-member-type\";\n\nexport interface DimensionModifier {\n  sqlExpression: string,\n  dimension: Dimension,\n  key: string,\n  query: Query\n}\n\nexport const arrayFieldUnNestModifier = ({ sqlExpression }: DimensionModifier): string => {\n return `array[unnest(${sqlExpression})]`;\n}\n\nexport const shouldUnnest = ({ dimension, query }: DimensionModifier): boolean => {\n  const isArrayType =  isArrayTypeMember(dimension.type);\n  const hasUnNestedGroupBy = dimension.modifier?.shouldUnnestGroupBy;\n  return !!(isArrayType && hasUnNestedGroupBy && query.measures.length > 0);\n}\n\n\nexport type Modifier = {\n  name: string,\n  matcher: (modifier: DimensionModifier) => boolean,\n  modifier: (modifier: DimensionModifier) => string\n}\n\nexport const MODIFIERS: Modifier[] = [{\n  name: 'shouldUnnestGroupBy',\n  matcher: shouldUnnest,\n  modifier: arrayFieldUnNestModifier\n}]\n\n\nexport const getModifiedSqlExpression = ({ sqlExpression, dimension, key, modifiers, query }: DimensionModifier & {\n  modifiers: Modifier[]\n}) => {\n  let finalDimension: string = sqlExpression;\n  modifiers.forEach(({ modifier, matcher }) => {\n    const shouldModify = matcher({ sqlExpression: finalDimension, dimension, key, query });\n    if (shouldModify) {\n      finalDimension = modifier({ sqlExpression: finalDimension, dimension, key, query });\n    }\n  })\n  return finalDimension;\n} "],"names":["arrayFieldUnNestModifier","shouldUnnest","MODIFIERS","getModifiedSqlExpression","sqlExpression","dimension","query","isArrayType","isArrayTypeMember","type","hasUnNestedGroupBy","modifier","shouldUnnestGroupBy","measures","length","name","matcher","key","modifiers","finalDimension","forEach","shouldModify"],"mappings":";;;;;;;;IAUaA,wBAAwB;eAAxBA;;IAIAC,YAAY;eAAZA;;IAaAC,SAAS;eAATA;;IAOAC,wBAAwB;eAAxBA;;;mCAjCqB;AAS3B,MAAMH,2BAA2B,CAAC,EAAEI,aAAa,EAAqB;IAC5E,OAAO,CAAC,aAAa,EAAEA,cAAc,EAAE,CAAC;AACzC;AAEO,MAAMH,eAAe,CAAC,EAAEI,SAAS,EAAEC,KAAK,EAAqB;QAEvCD;IAD3B,MAAME,cAAeC,IAAAA,oCAAiB,EAACH,UAAUI,IAAI;IACrD,MAAMC,sBAAqBL,sBAAAA,UAAUM,QAAQ,qBAAlBN,oBAAoBO,mBAAmB;IAClE,OAAO,CAAC,CAAEL,CAAAA,eAAeG,sBAAsBJ,MAAMO,QAAQ,CAACC,MAAM,GAAG,CAAA;AACzE;AASO,MAAMZ,YAAwB;IAAC;QACpCa,MAAM;QACNC,SAASf;QACTU,UAAUX;IACZ;CAAE;AAGK,MAAMG,2BAA2B,CAAC,EAAEC,aAAa,EAAEC,SAAS,EAAEY,GAAG,EAAEC,SAAS,EAAEZ,KAAK,EAEzF;IACC,IAAIa,iBAAyBf;IAC7Bc,UAAUE,OAAO,CAAC,CAAC,EAAET,QAAQ,EAAEK,OAAO,EAAE;QACtC,MAAMK,eAAeL,QAAQ;YAAEZ,eAAee;YAAgBd;YAAWY;YAAKX;QAAM;QACpF,IAAIe,cAAc;YAChBF,iBAAiBR,SAAS;gBAAEP,eAAee;gBAAgBd;gBAAWY;gBAAKX;YAAM;QACnF;IACF;IACA,OAAOa;AACT"}

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

@@ -22,19 +22,10 @@ type MemberType = 'measures' | 'dimensions' | 'segments';
  * Member identifier. Should satisfy to the following regexp: /^[a-zA-Z0-9_]+\.[a-zA-Z0-9_]+$/
  */
 type Member = string;
-/**
- * Datetime member identifier. Should satisfy to the following
- * regexp: /^[a-zA-Z0-9_]+\.[a-zA-Z0-9_]+(\.(second|minute|hour|day|week|month|year))?$/
- */
-type TimeMember = string;
 /**
  * Filter operator string.
  */
 type FilterOperator = 'equals' | 'notEquals' | 'contains' | 'notContains' | 'in' | 'notIn' | 'gt' | 'gte' | 'lt' | 'lte' | 'set' | 'notSet' | 'inDateRange' | 'notInDateRange' | 'onTheDate' | 'beforeDate' | 'afterDate' | 'measureFilter';
-/**
- * Time dimension granularity data type.
- */
-type QueryTimeDimensionGranularity = 'quarter' | 'day' | 'month' | 'year' | 'week' | 'hour' | 'minute' | 'second';
 /**
  * Query order data type.
  */
@@ -63,14 +54,6 @@ type LogicalAndFilter = {
 type LogicalOrFilter = {
     or: (QueryFilter | LogicalAndFilter)[];
 };
-/**
- * Query datetime dimention interface.
- */
-interface QueryTimeDimension {
-    dimension: Member;
-    dateRange?: string[] | string;
-    granularity?: QueryTimeDimensionGranularity;
-}
 /**
  * Join Edge data type.
  */
@@ -106,36 +89,11 @@ export declare const isJoinNode: (node: JoinNode | SingleNode) => node is JoinNo
 type MeerkatQueryFilter = QueryFilter | LogicalAndFilter | LogicalOrFilter;
 interface Query {
     measures: Member[];
-    dimensions?: (Member | TimeMember)[];
+    dimensions?: Member[];
     filters?: MeerkatQueryFilter[];
-    timeDimensions?: QueryTimeDimension[];
     joinPaths?: JoinPath[];
-    segments?: Member[];
     limit?: null | number;
     offset?: number;
-    total?: boolean;
-    totalQuery?: boolean;
-    order?: any;
-    timezone?: string;
-    renewQuery?: boolean;
-    ungrouped?: boolean;
-    responseFormat?: ResultType;
-}
-/**
- * Normalized filter interface.
- */
-interface NormalizedQueryFilter extends QueryFilter {
-    dimension?: Member;
-}
-/**
- * Normalized query interface.
- */
-interface NormalizedQuery extends Query {
-    filters?: NormalizedQueryFilter[];
-    rowLimit?: null | number;
-    order?: [{
-        id: string;
-        desc: boolean;
-    }];
+    order?: Record<string, QueryOrderType>;
 }
-export { ApiScopes, ApiType, FilterOperator, JoinPath, LogicalAndFilter, LogicalOrFilter, MeerkatQueryFilter, Member, MemberType, NormalizedQuery, NormalizedQueryFilter, Query, QueryFilter, QueryOrderType, QueryTimeDimension, QueryTimeDimensionGranularity, QueryType, RequestType, ResultType, TimeMember, };
+export { ApiScopes, ApiType, FilterOperator, JoinPath, LogicalAndFilter, LogicalOrFilter, MeerkatQueryFilter, Member, MemberType, Query, QueryFilter, QueryOrderType, QueryType, RequestType, ResultType };

package/src/types/cube-types/query.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../meerkat-core/src/types/cube-types/query.ts"],"sourcesContent":["/**\n * Request type data type.\n */\ntype RequestType = 'multi';\n\n/**\n * Result type data type.\n */\ntype ResultType = 'default' | 'compact';\n\n/**\n * API type data type.\n */\ntype ApiType = 'sql' | 'graphql' | 'rest' | 'ws' | 'stream';\n\n/**\n * Parsed query type data type.\n */\ntype QueryType = 'regularQuery' | 'compareDateRangeQuery' | 'blendingQuery';\n\n/**\n * String that represent query member type.\n */\ntype MemberType = 'measures' | 'dimensions' | 'segments';\n\n/**\n * Member identifier. Should satisfy to the following regexp: /^[a-zA-Z0-9_]+\\.[a-zA-Z0-9_]+$/\n */\ntype Member = string;\n\n/**\n * Datetime member identifier. Should satisfy to the following\n * regexp: /^[a-zA-Z0-9_]+\\.[a-zA-Z0-9_]+(\\.(second|minute|hour|day|week|month|year))?$/\n */\ntype TimeMember = string;\n\n/**\n * Filter operator string.\n */\ntype FilterOperator =\n  | 'equals'\n  | 'notEquals'\n  | 'contains'\n  | 'notContains'\n  | 'in'\n  | 'notIn'\n  | 'gt'\n  | 'gte'\n  | 'lt'\n  | 'lte'\n  | 'set'\n  | 'notSet'\n  | 'inDateRange'\n  | 'notInDateRange'\n  | 'onTheDate'\n  | 'beforeDate'\n  | 'afterDate'\n  | 'measureFilter';\n\n/**\n * Time dimension granularity data type.\n */\ntype QueryTimeDimensionGranularity =\n  | 'quarter'\n  | 'day'\n  | 'month'\n  | 'year'\n  | 'week'\n  | 'hour'\n  | 'minute'\n  | 'second';\n\n/**\n * Query order data type.\n */\ntype QueryOrderType = 'asc' | 'desc';\n\n/**\n * ApiScopes data type.\n */\ntype ApiScopes = 'graphql' | 'meta' | 'data' | 'jobs';\n\nexport type FilterType = 'BASE_FILTER' | 'PROJECTION_FILTER';\n\ninterface QueryFilter {\n  member: Member;\n  operator: FilterOperator;\n  values?: string[];\n}\n\n/**\n * Query 'and'-filters type definition.\n */\ntype LogicalAndFilter = {\n  and: (QueryFilter | { or: (QueryFilter | LogicalAndFilter)[] })[];\n};\n\n/**\n * Query 'or'-filters type definition.\n */\ntype LogicalOrFilter = {\n  or: (QueryFilter | LogicalAndFilter)[];\n};\n\n/**\n * Query datetime dimention interface.\n */\ninterface QueryTimeDimension {\n  dimension: Member;\n  dateRange?: string[] | string;\n  granularity?: QueryTimeDimensionGranularity;\n}\n\n/**\n * Join Edge data type.\n */\n\ninterface JoinNode {\n  /**\n   * Left node.\n   */\n  left: Member;\n\n  /**\n   * Right node.\n   */\n  right: Member;\n\n  /**\n   * On condition.\n   */\n  on: string;\n\n  /**\n   * Example\n   * [\n   *  [\n   *    {\n   *      left:  dim_ticket,\n   *      right: dim_user\n   *      on: 'created_by_id'\n   *    },\n   *   {\n   *     left : dim_user,\n   *     right: dim_user_role,\n   *     on: 'role_id'\n   *   }\n   *  ]\n   * ]\n   *\n   *\n   */\n}\n\n/**\n * Single node data type.\n * This is the case when there is no join. Just a single node.\n */\ninterface SingleNode {\n  /**\n   * Left node.\n   */\n  left: Member;\n}\n\ntype JoinPath = [JoinNode | SingleNode, ...JoinNode[]];\n\nexport const isJoinNode = (node: JoinNode | SingleNode): node is JoinNode => {\n  return 'right' in node;\n};\n\n/**\n * Incoming network query data type.\n */\n\ntype MeerkatQueryFilter = QueryFilter | LogicalAndFilter | LogicalOrFilter;\n\ninterface Query {\n  measures: Member[];\n  dimensions?: (Member | TimeMember)[];\n  filters?: MeerkatQueryFilter[];\n  timeDimensions?: QueryTimeDimension[];\n  joinPaths?: JoinPath[];\n  segments?: Member[];\n  limit?: null | number;\n  offset?: number;\n  total?: boolean;\n  totalQuery?: boolean;\n  order?: any;\n  timezone?: string;\n  renewQuery?: boolean;\n  ungrouped?: boolean;\n  responseFormat?: ResultType;\n}\n\n/**\n * Normalized filter interface.\n */\ninterface NormalizedQueryFilter extends QueryFilter {\n  dimension?: Member;\n}\n\n/**\n * Normalized query interface.\n */\ninterface NormalizedQuery extends Query {\n  filters?: NormalizedQueryFilter[];\n  rowLimit?: null | number;\n  order?: [{ id: string; desc: boolean }];\n}\n\nexport {\n  ApiScopes,\n  ApiType,\n  FilterOperator,\n  JoinPath,\n  LogicalAndFilter,\n  LogicalOrFilter,\n  MeerkatQueryFilter,\n  Member,\n  MemberType,\n  NormalizedQuery,\n  NormalizedQueryFilter,\n  Query,\n  QueryFilter,\n  QueryOrderType,\n  QueryTimeDimension,\n  QueryTimeDimensionGranularity,\n  QueryType,\n  RequestType,\n  ResultType,\n  TimeMember,\n};\n"],"names":["isJoinNode","node"],"mappings":"AAAA;;CAEC;+BAqKYA;;;eAAAA;;;AAAN,MAAMA,aAAa,CAACC;IACzB,OAAO,WAAWA;AACpB"}
+{"version":3,"sources":["../../../../../meerkat-core/src/types/cube-types/query.ts"],"sourcesContent":["/**\n * Request type data type.\n */\ntype RequestType = 'multi';\n\n/**\n * Result type data type.\n */\ntype ResultType = 'default' | 'compact';\n\n/**\n * API type data type.\n */\ntype ApiType = 'sql' | 'graphql' | 'rest' | 'ws' | 'stream';\n\n/**\n * Parsed query type data type.\n */\ntype QueryType = 'regularQuery' | 'compareDateRangeQuery' | 'blendingQuery';\n\n/**\n * String that represent query member type.\n */\ntype MemberType = 'measures' | 'dimensions' | 'segments';\n\n/**\n * Member identifier. Should satisfy to the following regexp: /^[a-zA-Z0-9_]+\\.[a-zA-Z0-9_]+$/\n */\ntype Member = string;\n\n\n/**\n * Filter operator string.\n */\ntype FilterOperator =\n  | 'equals'\n  | 'notEquals'\n  | 'contains'\n  | 'notContains'\n  | 'in'\n  | 'notIn'\n  | 'gt'\n  | 'gte'\n  | 'lt'\n  | 'lte'\n  | 'set'\n  | 'notSet'\n  | 'inDateRange'\n  | 'notInDateRange'\n  | 'onTheDate'\n  | 'beforeDate'\n  | 'afterDate'\n  | 'measureFilter';\n\n/**\n * Query order data type.\n */\ntype QueryOrderType = 'asc' | 'desc';\n\n/**\n * ApiScopes data type.\n */\ntype ApiScopes = 'graphql' | 'meta' | 'data' | 'jobs';\n\nexport type FilterType = 'BASE_FILTER' | 'PROJECTION_FILTER';\n\ninterface QueryFilter {\n  member: Member;\n  operator: FilterOperator;\n  values?: string[];\n}\n\n/**\n * Query 'and'-filters type definition.\n */\ntype LogicalAndFilter = {\n  and: (QueryFilter | { or: (QueryFilter | LogicalAndFilter)[] })[];\n};\n\n/**\n * Query 'or'-filters type definition.\n */\ntype LogicalOrFilter = {\n  or: (QueryFilter | LogicalAndFilter)[];\n};\n\n\n/**\n * Join Edge data type.\n */\n\ninterface JoinNode {\n  /**\n   * Left node.\n   */\n  left: Member;\n\n  /**\n   * Right node.\n   */\n  right: Member;\n\n  /**\n   * On condition.\n   */\n  on: string;\n\n  /**\n   * Example\n   * [\n   *  [\n   *    {\n   *      left:  dim_ticket,\n   *      right: dim_user\n   *      on: 'created_by_id'\n   *    },\n   *   {\n   *     left : dim_user,\n   *     right: dim_user_role,\n   *     on: 'role_id'\n   *   }\n   *  ]\n   * ]\n   *\n   *\n   */\n}\n\n/**\n * Single node data type.\n * This is the case when there is no join. Just a single node.\n */\ninterface SingleNode {\n  /**\n   * Left node.\n   */\n  left: Member;\n}\n\ntype JoinPath = [JoinNode | SingleNode, ...JoinNode[]];\n\nexport const isJoinNode = (node: JoinNode | SingleNode): node is JoinNode => {\n  return 'right' in node;\n};\n\n/**\n * Incoming network query data type.\n */\n\ntype MeerkatQueryFilter = QueryFilter | LogicalAndFilter | LogicalOrFilter;\n\ninterface Query {\n  measures: Member[];\n  dimensions?: Member[];\n  filters?: MeerkatQueryFilter[];\n  joinPaths?: JoinPath[];\n  limit?: null | number;\n  offset?: number;\n  order?: Record<string, QueryOrderType>;\n}\n\n\nexport {\n  ApiScopes,\n  ApiType,\n  FilterOperator,\n  JoinPath,\n  LogicalAndFilter,\n  LogicalOrFilter,\n  MeerkatQueryFilter,\n  Member,\n  MemberType,\n  Query,\n  QueryFilter,\n  QueryOrderType,\n  QueryType,\n  RequestType,\n  ResultType\n};\n"],"names":["isJoinNode","node"],"mappings":"AAAA;;CAEC;+BA2IYA;;;eAAAA;;;AAAN,MAAMA,aAAa,CAACC;IACzB,OAAO,WAAWA;AACpB"}

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

@@ -9,6 +9,9 @@ export type Dimension = {
     name: string;
     sql: string;
     type: DimensionType;
+    modifier?: {
+        shouldUnnestGroupBy?: boolean;
+    };
 };
 export type Join = {
     sql: string;

package/src/get-projection-clause/get-projection-clause.js

@@ -1,135 +0,0 @@
-"use strict";
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    getFilterMeasureProjection: function() {
-        return getFilterMeasureProjection;
-    },
-    getDimensionProjection: function() {
-        return getDimensionProjection;
-    },
-    getProjectionClause: function() {
-        return getProjectionClause;
-    }
-});
-const _cubemeasuretransformer = require("../cube-measure-transformer/cube-measure-transformer");
-const _findintableschema = require("../utils/find-in-table-schema");
-const _memberkeytosafekey = require("../utils/member-key-to-safe-key");
-const getFilterMeasureProjection = ({ key, tableSchema, measures })=>{
-    const tableName = key.split('.')[0];
-    const measureWithoutTable = key.split('.')[1];
-    const foundMember = (0, _findintableschema.findInMeasureSchema)(measureWithoutTable, tableSchema);
-    const isMeasure = measures.includes(key);
-    if (!foundMember || isMeasure || tableName !== tableSchema.name) {
-        // If the selected member is not found in the table schema or if it is already selected, continue.
-        // If the selected member is a measure, don't create an alias. Since measure computation is done in the outermost level of the query
-        // If the selected member is not from the current table, don't create an alias.
-        return {
-            sql: undefined,
-            foundMember: undefined,
-            aliasKey: undefined
-        };
-    }
-    const aliasKey = (0, _memberkeytosafekey.memberKeyToSafeKey)(key);
-    return {
-        sql: `${key} AS ${aliasKey}`,
-        foundMember,
-        aliasKey
-    };
-};
-const getDimensionProjection = ({ key, tableSchema })=>{
-    // Find the table access key
-    const measureWithoutTable = key.split('.')[1];
-    const tableName = key.split('.')[0];
-    const foundMember = (0, _findintableschema.findInDimensionSchema)(measureWithoutTable, tableSchema);
-    if (!foundMember || tableName !== tableSchema.name) {
-        // If the selected member is not found in the table schema or if it is already selected, continue.
-        // If the selected member is not from the current table, don't create an alias.
-        return {
-            sql: undefined,
-            foundMember: undefined,
-            aliasKey: undefined
-        };
-    }
-    const aliasKey = (0, _memberkeytosafekey.memberKeyToSafeKey)(key);
-    // Add the alias key to the set. So we have a reference to all the previously selected members.
-    return {
-        sql: `${foundMember.sql} AS ${aliasKey}`,
-        foundMember,
-        aliasKey
-    };
-};
-const aggregator = ({ member, aliasedColumnSet, acc, sql })=>{
-    if (aliasedColumnSet.has(member) || !sql) {
-        return acc;
-    }
-    aliasedColumnSet.add(member);
-    acc.push(sql);
-    return acc;
-};
-const getProjectionClause = (measures, dimensions, tableSchema, aliasedColumnSet)=>{
-    const filteredDimensions = dimensions.filter((dimension)=>{
-        return dimension.split('.')[0] === tableSchema.name;
-    });
-    const filteredMeasures = measures.filter((measure)=>{
-        return measure.split('.')[0] === tableSchema.name;
-    });
-    const dimensionsProjectionsArr = filteredDimensions.reduce((acc, member, currentIndex, members)=>{
-        const { sql: memberSql } = getDimensionProjection({
-            key: member,
-            tableSchema
-        });
-        return aggregator({
-            member,
-            aliasedColumnSet,
-            acc,
-            currentIndex,
-            members,
-            sql: memberSql
-        });
-    }, []);
-    const dimensionsProjections = dimensionsProjectionsArr.join(', ');
-    const measureProjectionsArr = filteredMeasures.reduce((acc, member, currentIndex, members)=>{
-        const { sql: memberSql } = getFilterMeasureProjection({
-            key: member,
-            tableSchema,
-            measures
-        });
-        return aggregator({
-            member,
-            aliasedColumnSet,
-            acc,
-            currentIndex,
-            members,
-            sql: memberSql
-        });
-    }, []);
-    const measureProjections = measureProjectionsArr.join(', ');
-    const usedMeasureObjects = tableSchema.measures.filter((measure)=>{
-        return measures.findIndex((key)=>{
-            const keyWithoutTable = key.split('.')[1];
-            return keyWithoutTable === measure.name;
-        }) !== -1;
-    });
-    const columnsUsedInMeasures = (0, _cubemeasuretransformer.getAllColumnUsedInMeasures)(usedMeasureObjects, tableSchema);
-    let columnsUsedInMeasuresInProjection = '';
-    columnsUsedInMeasures.forEach((column, index)=>{
-        const safeKey = (0, _memberkeytosafekey.memberKeyToSafeKey)(column);
-        columnsUsedInMeasuresInProjection += `${column} AS ${safeKey}`;
-        if (index !== columnsUsedInMeasures.length - 1) {
-            columnsUsedInMeasuresInProjection += ', ';
-        }
-    });
-    const combinedStr = [
-        dimensionsProjections,
-        measureProjections,
-        columnsUsedInMeasuresInProjection
-    ];
-    return combinedStr.filter((str)=>str.length > 0).join(', ');
-};
-
-//# sourceMappingURL=get-projection-clause.js.map

package/src/get-projection-clause/get-projection-clause.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../meerkat-core/src/get-projection-clause/get-projection-clause.ts"],"sourcesContent":["import { getAllColumnUsedInMeasures } from '../cube-measure-transformer/cube-measure-transformer';\nimport { TableSchema } from '../types/cube-types';\nimport {\n  findInDimensionSchema,\n  findInMeasureSchema,\n} from '../utils/find-in-table-schema';\nimport { memberKeyToSafeKey } from '../utils/member-key-to-safe-key';\n\nexport const getFilterMeasureProjection = ({\n  key,\n  tableSchema,\n  measures,\n}: {\n  key: string;\n  tableSchema: TableSchema;\n  measures: string[];\n}) => {\n  const tableName = key.split('.')[0];\n  const measureWithoutTable = key.split('.')[1];\n  const foundMember = findInMeasureSchema(measureWithoutTable, tableSchema);\n  const isMeasure = measures.includes(key);\n  if (!foundMember || isMeasure || tableName !== tableSchema.name) {\n    // If the selected member is not found in the table schema or if it is already selected, continue.\n    // If the selected member is a measure, don't create an alias. Since measure computation is done in the outermost level of the query\n    // If the selected member is not from the current table, don't create an alias.\n    return {\n      sql: undefined,\n      foundMember: undefined,\n      aliasKey: undefined,\n    };\n  }\n  const aliasKey = memberKeyToSafeKey(key);\n  return { sql: `${key} AS ${aliasKey}`, foundMember, aliasKey };\n};\n\nexport const getDimensionProjection = ({\n  key,\n  tableSchema,\n}: {\n  key: string;\n  tableSchema: TableSchema;\n}) => {\n  // Find the table access key\n  const measureWithoutTable = key.split('.')[1];\n  const tableName = key.split('.')[0];\n\n  const foundMember = findInDimensionSchema(measureWithoutTable, tableSchema);\n  if (!foundMember || tableName !== tableSchema.name) {\n    // If the selected member is not found in the table schema or if it is already selected, continue.\n    // If the selected member is not from the current table, don't create an alias.\n    return {\n      sql: undefined,\n      foundMember: undefined,\n      aliasKey: undefined,\n    };\n  }\n  const aliasKey = memberKeyToSafeKey(key);\n  // Add the alias key to the set. So we have a reference to all the previously selected members.\n  return { sql: `${foundMember.sql} AS ${aliasKey}`, foundMember, aliasKey };\n};\n\nconst aggregator = ({\n  member,\n  aliasedColumnSet,\n  acc,\n  sql,\n}: {\n  member: string;\n  aliasedColumnSet: Set<string>;\n  acc: string[];\n  sql?: string;\n  currentIndex: number;\n  members: string[];\n}) => {\n  if (aliasedColumnSet.has(member) || !sql) {\n    return acc;\n  }\n  aliasedColumnSet.add(member);\n  acc.push(sql);\n  return acc;\n};\n\nexport const getProjectionClause = (\n  measures: string[],\n  dimensions: string[],\n  tableSchema: TableSchema,\n  aliasedColumnSet: Set<string>\n) => {\n  const filteredDimensions = dimensions.filter((dimension) => {\n    return dimension.split('.')[0] === tableSchema.name;\n  });\n  const filteredMeasures = measures.filter((measure) => {\n    return measure.split('.')[0] === tableSchema.name;\n  });\n  const dimensionsProjectionsArr = filteredDimensions.reduce(\n    (acc, member, currentIndex, members) => {\n      const { sql: memberSql } = getDimensionProjection({\n        key: member,\n        tableSchema,\n      });\n      return aggregator({\n        member,\n        aliasedColumnSet,\n        acc,\n        currentIndex,\n        members,\n        sql: memberSql,\n      });\n    },\n    [] as string[]\n  );\n  const dimensionsProjections = dimensionsProjectionsArr.join(', ');\n\n  const measureProjectionsArr = filteredMeasures.reduce(\n    (acc, member, currentIndex, members) => {\n      const { sql: memberSql } = getFilterMeasureProjection({\n        key: member,\n        tableSchema,\n        measures,\n      });\n      return aggregator({\n        member,\n        aliasedColumnSet,\n        acc,\n        currentIndex,\n        members,\n        sql: memberSql,\n      });\n    },\n    [] as string[]\n  );\n\n  const measureProjections = measureProjectionsArr.join(', ');\n\n  const usedMeasureObjects = tableSchema.measures.filter((measure) => {\n    return (\n      measures.findIndex((key) => {\n        const keyWithoutTable = key.split('.')[1];\n        return keyWithoutTable === measure.name;\n      }) !== -1\n    );\n  });\n  const columnsUsedInMeasures = getAllColumnUsedInMeasures(\n    usedMeasureObjects,\n    tableSchema\n  );\n\n  let columnsUsedInMeasuresInProjection = '';\n  columnsUsedInMeasures.forEach((column, index) => {\n    const safeKey = memberKeyToSafeKey(column);\n    columnsUsedInMeasuresInProjection += `${column} AS ${safeKey}`;\n    if (index !== columnsUsedInMeasures.length - 1) {\n      columnsUsedInMeasuresInProjection += ', ';\n    }\n  });\n\n  const combinedStr = [\n    dimensionsProjections,\n    measureProjections,\n    columnsUsedInMeasuresInProjection,\n  ];\n\n  return combinedStr.filter((str) => str.length > 0).join(', ');\n};\n"],"names":["getFilterMeasureProjection","getDimensionProjection","getProjectionClause","key","tableSchema","measures","tableName","split","measureWithoutTable","foundMember","findInMeasureSchema","isMeasure","includes","name","sql","undefined","aliasKey","memberKeyToSafeKey","findInDimensionSchema","aggregator","member","aliasedColumnSet","acc","has","add","push","dimensions","filteredDimensions","filter","dimension","filteredMeasures","measure","dimensionsProjectionsArr","reduce","currentIndex","members","memberSql","dimensionsProjections","join","measureProjectionsArr","measureProjections","usedMeasureObjects","findIndex","keyWithoutTable","columnsUsedInMeasures","getAllColumnUsedInMeasures","columnsUsedInMeasuresInProjection","forEach","column","index","safeKey","length","combinedStr","str"],"mappings":"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"}