add sql generation with resolution (#143)

* add sql generation with resolution

* revert

* better

* review comments

* refactor

* bump package version

* fix build

* lint

* lint

---------

Co-authored-by: Eric Gan <[email protected]>

Author: egan8888

meerkat-browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/meerkat-browser",
-  "version": "0.0.94",
+  "version": "0.0.95",
   "dependencies": {
     "@swc/helpers": "~0.5.0",
     "@devrev/meerkat-core": "*",

meerkat-browser/src/browser-cube-to-sql-with-resolution/browser-cube-to-sql-with-resolution.ts

@@ -0,0 +1,68 @@
+import {
+  ContextParams,
+  createBaseTableSchema,
+  generateResolutionJoinPaths,
+  generateResolutionSchemas,
+  generateResolvedDimensions,
+  Query,
+  ResolutionConfig,
+  TableSchema,
+} from '@devrev/meerkat-core';
+import { AsyncDuckDBConnection } from '@duckdb/duckdb-wasm';
+import {
+  cubeQueryToSQL,
+  CubeQueryToSQLParams,
+} from '../browser-cube-to-sql/browser-cube-to-sql';
+
+export interface CubeQueryToSQLWithResolutionParams {
+  connection: AsyncDuckDBConnection;
+  query: Query;
+  tableSchemas: TableSchema[];
+  resolutionConfig: ResolutionConfig;
+  contextParams?: ContextParams;
+}
+
+export const cubeQueryToSQLWithResolution = async ({
+  connection,
+  query,
+  tableSchemas,
+  resolutionConfig,
+  contextParams,
+}: CubeQueryToSQLWithResolutionParams) => {
+  const baseSql = await cubeQueryToSQL({
+    connection,
+    query,
+    tableSchemas,
+    contextParams,
+  });
+
+  if (resolutionConfig.columnConfigs.length === 0) {
+    // If no resolution is needed, return the base SQL.
+    return baseSql;
+  }
+
+  // Create a table schema for the base query.
+  const baseTable: TableSchema = createBaseTableSchema(
+    baseSql,
+    tableSchemas,
+    resolutionConfig,
+    query.measures,
+    query.dimensions
+  );
+
+  const resolutionSchemas: TableSchema[] =
+    generateResolutionSchemas(resolutionConfig);
+
+  const resolveParams: CubeQueryToSQLParams = {
+    connection: connection,
+    query: {
+      measures: [],
+      dimensions: generateResolvedDimensions(query, resolutionConfig),
+      joinPaths: generateResolutionJoinPaths(resolutionConfig),
+    },
+    tableSchemas: [baseTable, ...resolutionSchemas],
+  };
+  const sql = await cubeQueryToSQL(resolveParams);
+
+  return sql;
+};

meerkat-browser/src/browser-cube-to-sql/browser-cube-to-sql.ts

@@ -11,37 +11,38 @@ import {
   detectApplyContextParamsToBaseSQL,
   getCombinedTableSchema,
   getFilterParamsSQL,
-  getFinalBaseSQL
+  getFinalBaseSQL,
 } from '@devrev/meerkat-core';
 import { AsyncDuckDBConnection } from '@duckdb/duckdb-wasm';
 
-
-const getQueryOutput = async (query: string, connection: AsyncDuckDBConnection) => {
+const getQueryOutput = async (
+  query: string,
+  connection: AsyncDuckDBConnection
+) => {
   const queryOutput = await connection.query(query);
   const parsedOutputQuery = queryOutput.toArray().map((row) => row.toJSON());
   return parsedOutputQuery;
-}
-
+};
 
-interface CubeQueryToSQLParams {
-  connection: AsyncDuckDBConnection,
-  query: Query,
-  tableSchemas: TableSchema[],
-  contextParams?: ContextParams,
+export interface CubeQueryToSQLParams {
+  connection: AsyncDuckDBConnection;
+  query: Query;
+  tableSchemas: TableSchema[];
+  contextParams?: ContextParams;
 }
 
 export const cubeQueryToSQL = async ({
   connection,
   query,
   tableSchemas,
-  contextParams
+  contextParams,
 }: CubeQueryToSQLParams) => {
   const updatedTableSchemas: TableSchema[] = await Promise.all(
     tableSchemas.map(async (schema: TableSchema) => {
       const baseFilterParamsSQL = await getFinalBaseSQL({
         query,
         tableSchema: schema,
-        getQueryOutput: (query) => getQueryOutput(query, connection)
+        getQueryOutput: (query) => getQueryOutput(query, connection),
       });
       return {
         ...schema,

meerkat-core/package.json

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

meerkat-core/src/index.ts

@@ -15,6 +15,8 @@ export { getFinalBaseSQL } from './get-final-base-sql/get-final-base-sql';
 export { getWrappedBaseQueryWithProjections } from './get-wrapped-base-query-with-projections/get-wrapped-base-query-with-projections';
 export * from './joins/joins';
 export * from './member-formatters';
+export * from './resolution/resolution';
+export * from './resolution/types';
 export { FilterType } from './types/cube-types';
 export * from './types/cube-types/index';
 export * from './types/duckdb-serialization-types/index';