fix: simplify queryBuilder zod schema

Dimensions and metrics are now validated with refine, instead of being exposed as enum
VeryBigThings · Apr 15, 2024 · c5d9fa1 · c5d9fa1
1 parent 05ad23d
commit c5d9fa1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 26 deletions.
diff --git a/src/__tests__/index.test.ts b/src/__tests__/index.test.ts
@@ -918,22 +918,12 @@ await describe("semantic layer", async () => {
       assert.deepEqual(jsonSchema, {
         type: "object",
         properties: {
-          dimensions: {
-            type: "array",
-            items: {
-              type: "string",
-              enum: [
-                "customers.customer_id",
-                "invoices.invoice_id",
-                "invoices.customer_id",
-              ],
-            },
-          },
+          dimensions: { type: "array", items: { type: "string" } },
           metrics: {
             type: "array",
             items: {
               anyOf: [
-                { type: "string", enum: ["invoices.total"] },
+                { type: "string" },
                 {
                   type: "object",
                   properties: {

diff --git a/src/lib/query-builder.ts b/src/lib/query-builder.ts
@@ -23,16 +23,10 @@ import { findOptimalJoinGraph } from "./query-builder/optimal-join-graph.js";
 import { processQueryAndExpandToSegments } from "./query-builder/process-query-and-expand-to-segments.js";
 import type { AnyRepository } from "./repository.js";
 
-function isNonEmptyArray<T>(arr: T[]): arr is [T, ...T[]] {
-  return arr.length > 0;
-}
-
 function getDimensionNamesSchema(dimensionPaths: string[]) {
-  if (isNonEmptyArray(dimensionPaths)) {
-    const [first, ...rest] = dimensionPaths;
-    return z.array(z.enum([first, ...rest])).optional();
-  }
-  return z.array(z.string()).max(0).optional();
+  return z
+    .array(z.string().refine((arg) => dimensionPaths.includes(arg)))
+    .optional();
 }
 
 function getMetricNamesSchema(metricPaths: string[]) {
@@ -41,11 +35,14 @@ function getMetricNamesSchema(metricPaths: string[]) {
     dimension: z.string(),
   });
 
-  if (isNonEmptyArray(metricPaths)) {
-    const [first, ...rest] = metricPaths;
-    return z.array(z.enum([first, ...rest]).or(adHocMetricSchema)).optional();
-  }
-  return z.array(adHocMetricSchema).optional();
+  return z
+    .array(
+      z
+        .string()
+        .refine((arg) => metricPaths.includes(arg))
+        .or(adHocMetricSchema),
+    )
+    .optional();
 }
 
 export function buildQuerySchema(repository: AnyRepository) {