fix measure validator aggregation (#126)

* fix: add has aggregation

* bump version

Author: vpbs2

meerkat-browser/package.json

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

meerkat-browser/src/ast/query-to-ast.ts

@@ -15,15 +15,11 @@ export const parseQueryToAST = async (
   query: string,
   connection: AsyncDuckDBConnection
 ): Promise<ParsedSerialization> => {
-  try {
-    const serializedQuery = astSerializerQuery(query);
-    const arrowResult = await connection.query(serializedQuery);
+  const serializedQuery = astSerializerQuery(query);
+  const arrowResult = await connection.query(serializedQuery);
 
-    const parsedOutputQuery = arrowResult.toArray().map((row) => row.toJSON());
-    const deserializedQuery = deserializeQuery(parsedOutputQuery);
+  const parsedOutputQuery = arrowResult.toArray().map((row) => row.toJSON());
+  const deserializedQuery = deserializeQuery(parsedOutputQuery);
 
-    return JSON.parse(deserializedQuery);
-  } catch (error) {
-    throw new Error('Failed to parse query to AST');
-  }
+  return JSON.parse(deserializedQuery);
 };

meerkat-core/package.json

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

meerkat-core/src/ast-validator/measure-validator.ts

@@ -45,9 +45,11 @@ export const validateExpressionNode = ({
           validFunctions,
           parentNode: node,
           validScalarFunctions,
+          hasAggregation: true,
         })
       );
     }
+
     // For non-aggregation functions
     if (validScalarFunctions.has(node.function_name)) {
       return node.children.some((child) => {

meerkat-core/src/ast-validator/tests/test-data.ts

@@ -1126,6 +1126,80 @@ export const MEASURE_TEST_CASES = [
     validScalarFunctions: new Set(['/']),
     expected: true,
   },
+  {
+    description: 'node type FUNCTION - AVG with nested scalar function',
+    query: "AVG(DATE_DIFF('minute', created_date, first_response_time))",
+    columnNames: ['created_date', 'first_response_time'],
+    node: {
+      class: 'FUNCTION',
+      type: 'FUNCTION',
+      alias: '',
+      query_location: 7,
+      function_name: 'avg',
+      schema: '',
+      children: [
+        {
+          class: 'FUNCTION',
+          type: 'FUNCTION',
+          alias: '',
+          query_location: 11,
+          function_name: 'date_diff',
+          schema: '',
+          children: [
+            {
+              class: 'CONSTANT',
+              type: 'VALUE_CONSTANT',
+              alias: '',
+              query_location: 21,
+              value: {
+                type: {
+                  id: 'VARCHAR',
+                  type_info: null,
+                },
+                is_null: false,
+                value: 'minute',
+              },
+            },
+            {
+              class: 'COLUMN_REF',
+              type: 'COLUMN_REF',
+              alias: '',
+              query_location: 31,
+              column_names: ['created_date'],
+            },
+            {
+              class: 'COLUMN_REF',
+              type: 'COLUMN_REF',
+              alias: '',
+              query_location: 45,
+              column_names: ['first_response_time'],
+            },
+          ],
+          filter: null,
+          order_bys: {
+            type: 'ORDER_MODIFIER',
+            orders: [],
+          },
+          distinct: false,
+          is_operator: false,
+          export_state: false,
+          catalog: '',
+        },
+      ],
+      filter: null,
+      order_bys: {
+        type: 'ORDER_MODIFIER',
+        orders: [],
+      },
+      distinct: false,
+      is_operator: false,
+      export_state: false,
+      catalog: '',
+    },
+    validFunctions: new Set(['avg', 'count']),
+    validScalarFunctions: new Set(['date_diff']),
+    expected: true,
+  },
   {
     description: 'node type SUBQUERY',
     columnNames: [

meerkat-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrev/meerkat-node",
-  "version": "0.0.84",
+  "version": "0.0.88",
   "dependencies": {
     "@swc/helpers": "~0.5.0",
     "@devrev/meerkat-core": "*",