drizzle-cube 0.2.23 → 0.2.25

package/dist/adapters/express/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("express"),v=require("cors"),o=require("../compiler-S2NEGW7Q.cjs");function E(d){const{cubes:y,drizzle:p,schema:g,extractSecurityContext:l,engineType:h,cors:R,basePath:c="/cubejs-api/v1",jsonLimit:b="10mb"}=d;if(!y||y.length===0)throw new Error("At least one cube must be provided in the cubes array");const i=m.Router();R&&i.use(v(R)),i.use(m.json({limit:b})),i.use(m.urlencoded({extended:!0,limit:b}));const a=new o.SemanticLayerCompiler({drizzle:p,schema:g,engineType:h});return y.forEach(t=>{a.registerCube(t)}),i.post(`${c}/load`,async(t,r)=>{try{const e=t.body.query||t.body,s=await l(t,r),n=a.validateQuery(e);if(!n.isValid)return r.status(400).json(o.formatErrorResponse(`Query validation failed: ${n.errors.join(", ")}`,400));const u=await a.executeMultiCubeQuery(e,s);r.json(o.formatCubeResponse(e,u,a))}catch(e){console.error("Query execution error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"Query execution failed",500))}}),i.get(`${c}/load`,async(t,r)=>{try{const e=t.query.query;if(!e)return r.status(400).json(o.formatErrorResponse("Query parameter is required",400));let s;try{s=JSON.parse(e)}catch{return r.status(400).json(o.formatErrorResponse("Invalid JSON in query parameter",400))}const n=await l(t,r),u=a.validateQuery(s);if(!u.isValid)return r.status(400).json(o.formatErrorResponse(`Query validation failed: ${u.errors.join(", ")}`,400));const f=await a.executeMultiCubeQuery(s,n);r.json(o.formatCubeResponse(s,f,a))}catch(e){console.error("Query execution error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"Query execution failed",500))}}),i.post(`${c}/batch`,async(t,r)=>{try{const{queries:e}=t.body;if(!e||!Array.isArray(e))return r.status(400).json(o.formatErrorResponse('Request body must contain a "queries" array',400));if(e.length===0)return r.status(400).json(o.formatErrorResponse("Queries array cannot be empty",400));const s=await l(t,r),n=await o.handleBatchRequest(e,s,a);r.json(n)}catch(e){console.error("Batch execution error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"Batch execution failed",500))}}),i.get(`${c}/meta`,(t,r)=>{try{const e=a.getMetadata();r.json(o.formatMetaResponse(e))}catch(e){console.error("Metadata error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"Failed to fetch metadata",500))}}),i.post(`${c}/sql`,async(t,r)=>{try{const e=t.body,s=await l(t,r),n=a.validateQuery(e);if(!n.isValid)return r.status(400).json(o.formatErrorResponse(`Query validation failed: ${n.errors.join(", ")}`,400));const u=e.measures?.[0]||e.dimensions?.[0];if(!u)return r.status(400).json(o.formatErrorResponse("No measures or dimensions specified",400));const f=u.split(".")[0],j=await a.generateSQL(f,e,s);r.json(o.formatSqlResponse(e,j))}catch(e){console.error("SQL generation error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"SQL generation failed",500))}}),i.get(`${c}/sql`,async(t,r)=>{try{const e=t.query.query;if(!e)return r.status(400).json(o.formatErrorResponse("Query parameter is required",400));const s=JSON.parse(e),n=await l(t,r),u=a.validateQuery(s);if(!u.isValid)return r.status(400).json(o.formatErrorResponse(`Query validation failed: ${u.errors.join(", ")}`,400));const f=s.measures?.[0]||s.dimensions?.[0];if(!f)return r.status(400).json(o.formatErrorResponse("No measures or dimensions specified",400));const j=f.split(".")[0],Q=await a.generateSQL(j,s,n);r.json(o.formatSqlResponse(s,Q))}catch(e){console.error("SQL generation error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"SQL generation failed",500))}}),i.post(`${c}/dry-run`,async(t,r)=>{try{const e=t.body.query||t.body,s=await l(t,r),n=await o.handleDryRun(e,s,a);r.json(n)}catch(e){console.error("Dry-run error:",e),r.status(400).json({error:e instanceof Error?e.message:"Dry-run validation failed",valid:!1})}}),i.get(`${c}/dry-run`,async(t,r)=>{try{const e=t.query.query;if(!e)return r.status(400).json({error:"Query parameter is required",valid:!1});const s=JSON.parse(e),n=await l(t,r),u=await o.handleDryRun(s,n,a);r.json(u)}catch(e){console.error("Dry-run error:",e),r.status(400).json({error:e instanceof Error?e.message:"Dry-run validation failed",valid:!1})}}),i.use((t,r,e,s)=>{console.error("Express adapter error:",t),e.headersSent||e.status(500).json(o.formatErrorResponse(t,500))}),i}function q(d,y){const p=E(y);return d.use("/",p),d}function x(d){const y=m();return q(y,d)}exports.createCubeApp=x;exports.createCubeRouter=E;exports.mountCubeRoutes=q;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("express"),x=require("cors"),o=require("../compiler-C6JQHGrF.cjs");function E(d){const{cubes:y,drizzle:p,schema:q,extractSecurityContext:l,engineType:g,cors:R,basePath:c="/cubejs-api/v1",jsonLimit:b="10mb",cache:Q}=d;if(!y||y.length===0)throw new Error("At least one cube must be provided in the cubes array");const i=m.Router();R&&i.use(x(R)),i.use(m.json({limit:b})),i.use(m.urlencoded({extended:!0,limit:b}));const a=new o.SemanticLayerCompiler({drizzle:p,schema:q,engineType:g,cache:Q});return y.forEach(t=>{a.registerCube(t)}),i.post(`${c}/load`,async(t,r)=>{try{const e=t.body.query||t.body,s=await l(t,r),n=a.validateQuery(e);if(!n.isValid)return r.status(400).json(o.formatErrorResponse(`Query validation failed: ${n.errors.join(", ")}`,400));const u=await a.executeMultiCubeQuery(e,s);r.json(o.formatCubeResponse(e,u,a))}catch(e){console.error("Query execution error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"Query execution failed",500))}}),i.get(`${c}/load`,async(t,r)=>{try{const e=t.query.query;if(!e)return r.status(400).json(o.formatErrorResponse("Query parameter is required",400));let s;try{s=JSON.parse(e)}catch{return r.status(400).json(o.formatErrorResponse("Invalid JSON in query parameter",400))}const n=await l(t,r),u=a.validateQuery(s);if(!u.isValid)return r.status(400).json(o.formatErrorResponse(`Query validation failed: ${u.errors.join(", ")}`,400));const f=await a.executeMultiCubeQuery(s,n);r.json(o.formatCubeResponse(s,f,a))}catch(e){console.error("Query execution error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"Query execution failed",500))}}),i.post(`${c}/batch`,async(t,r)=>{try{const{queries:e}=t.body;if(!e||!Array.isArray(e))return r.status(400).json(o.formatErrorResponse('Request body must contain a "queries" array',400));if(e.length===0)return r.status(400).json(o.formatErrorResponse("Queries array cannot be empty",400));const s=await l(t,r),n=await o.handleBatchRequest(e,s,a);r.json(n)}catch(e){console.error("Batch execution error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"Batch execution failed",500))}}),i.get(`${c}/meta`,(t,r)=>{try{const e=a.getMetadata();r.json(o.formatMetaResponse(e))}catch(e){console.error("Metadata error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"Failed to fetch metadata",500))}}),i.post(`${c}/sql`,async(t,r)=>{try{const e=t.body,s=await l(t,r),n=a.validateQuery(e);if(!n.isValid)return r.status(400).json(o.formatErrorResponse(`Query validation failed: ${n.errors.join(", ")}`,400));const u=e.measures?.[0]||e.dimensions?.[0];if(!u)return r.status(400).json(o.formatErrorResponse("No measures or dimensions specified",400));const f=u.split(".")[0],j=await a.generateSQL(f,e,s);r.json(o.formatSqlResponse(e,j))}catch(e){console.error("SQL generation error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"SQL generation failed",500))}}),i.get(`${c}/sql`,async(t,r)=>{try{const e=t.query.query;if(!e)return r.status(400).json(o.formatErrorResponse("Query parameter is required",400));const s=JSON.parse(e),n=await l(t,r),u=a.validateQuery(s);if(!u.isValid)return r.status(400).json(o.formatErrorResponse(`Query validation failed: ${u.errors.join(", ")}`,400));const f=s.measures?.[0]||s.dimensions?.[0];if(!f)return r.status(400).json(o.formatErrorResponse("No measures or dimensions specified",400));const j=f.split(".")[0],v=await a.generateSQL(j,s,n);r.json(o.formatSqlResponse(s,v))}catch(e){console.error("SQL generation error:",e),r.status(500).json(o.formatErrorResponse(e instanceof Error?e.message:"SQL generation failed",500))}}),i.post(`${c}/dry-run`,async(t,r)=>{try{const e=t.body.query||t.body,s=await l(t,r),n=await o.handleDryRun(e,s,a);r.json(n)}catch(e){console.error("Dry-run error:",e),r.status(400).json({error:e instanceof Error?e.message:"Dry-run validation failed",valid:!1})}}),i.get(`${c}/dry-run`,async(t,r)=>{try{const e=t.query.query;if(!e)return r.status(400).json({error:"Query parameter is required",valid:!1});const s=JSON.parse(e),n=await l(t,r),u=await o.handleDryRun(s,n,a);r.json(u)}catch(e){console.error("Dry-run error:",e),r.status(400).json({error:e instanceof Error?e.message:"Dry-run validation failed",valid:!1})}}),i.use((t,r,e,s)=>{console.error("Express adapter error:",t),e.headersSent||e.status(500).json(o.formatErrorResponse(t,500))}),i}function h(d,y){const p=E(y);return d.use("/",p),d}function C(d){const y=m();return h(y,d)}exports.createCubeApp=C;exports.createCubeRouter=E;exports.mountCubeRoutes=h;

package/dist/adapters/express/index.d.ts

@@ -1,6 +1,6 @@
 import { Router, Request, Response, Express } from 'express';
 import { CorsOptions } from 'cors';
-import { SemanticQuery, SecurityContext, DatabaseExecutor, DrizzleDatabase, Cube } from '../../server';
+import { SemanticQuery, SecurityContext, DatabaseExecutor, DrizzleDatabase, Cube, CacheConfig } from '../../server';
 import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
 import { MySql2Database } from 'drizzle-orm/mysql2';
 import { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
@@ -61,6 +61,11 @@ export interface ExpressAdapterOptions {
      * JSON body parser limit (default: '10mb')
      */
     jsonLimit?: string;
+    /**
+     * Cache configuration for query result caching
+     * When provided, query results will be cached using the specified provider
+     */
+    cache?: CacheConfig;
 }
 /**
  * Create Express router for Cube.js-compatible API

package/dist/adapters/express/index.js

@@ -1,7 +1,7 @@
-import p, { Router as C } from "express";
-import S from "cors";
-import { S as R, d as o, f as g, h as E, a as $, b as Q, c as q } from "../compiler-DDXMrb9d.js";
-function L(d) {
+import p, { Router as S } from "express";
+import R from "cors";
+import { S as E, d as o, f as g, h as $, a as L, b as Q, c as q } from "../compiler-Ddwn99Ja.js";
+function N(d) {
   const {
     cubes: y,
     drizzle: m,
@@ -10,16 +10,18 @@ function L(d) {
     engineType: v,
     cors: b,
     basePath: c = "/cubejs-api/v1",
-    jsonLimit: h = "10mb"
+    jsonLimit: h = "10mb",
+    cache: w
   } = d;
   if (!y || y.length === 0)
     throw new Error("At least one cube must be provided in the cubes array");
-  const i = C();
-  b && i.use(S(b)), i.use(p.json({ limit: h })), i.use(p.urlencoded({ extended: !0, limit: h }));
-  const a = new R({
+  const i = S();
+  b && i.use(R(b)), i.use(p.json({ limit: h })), i.use(p.urlencoded({ extended: !0, limit: h }));
+  const a = new E({
     drizzle: m,
     schema: x,
-    engineType: v
+    engineType: v,
+    cache: w
   });
   return y.forEach((t) => {
     a.registerCube(t);
@@ -83,7 +85,7 @@ function L(d) {
           "Queries array cannot be empty",
           400
         ));
-      const s = await l(t, r), n = await E(e, s, a);
+      const s = await l(t, r), n = await $(e, s, a);
       r.json(n);
     } catch (e) {
       console.error("Batch execution error:", e), r.status(500).json(o(
@@ -94,7 +96,7 @@ function L(d) {
   }), i.get(`${c}/meta`, (t, r) => {
     try {
       const e = a.getMetadata();
-      r.json($(e));
+      r.json(L(e));
     } catch (e) {
       console.error("Metadata error:", e), r.status(500).json(o(
         e instanceof Error ? e.message : "Failed to fetch metadata",
@@ -143,8 +145,8 @@ function L(d) {
           "No measures or dimensions specified",
           400
         ));
-      const j = f.split(".")[0], w = await a.generateSQL(j, s, n);
-      r.json(Q(s, w));
+      const j = f.split(".")[0], C = await a.generateSQL(j, s, n);
+      r.json(Q(s, C));
     } catch (e) {
       console.error("SQL generation error:", e), r.status(500).json(o(
         e instanceof Error ? e.message : "SQL generation failed",
@@ -181,16 +183,16 @@ function L(d) {
     console.error("Express adapter error:", t), e.headersSent || e.status(500).json(o(t, 500));
   }), i;
 }
-function N(d, y) {
-  const m = L(y);
+function M(d, y) {
+  const m = N(y);
   return d.use("/", m), d;
 }
-function J(d) {
+function O(d) {
   const y = p();
-  return N(y, d);
+  return M(y, d);
 }
 export {
-  J as createCubeApp,
-  L as createCubeRouter,
-  N as mountCubeRoutes
+  O as createCubeApp,
+  N as createCubeRouter,
+  M as mountCubeRoutes
 };

package/dist/adapters/fastify/index.cjs

@@ -1 +1 @@
-"use strict";var S=Object.create;var q=Object.defineProperty;var w=Object.getOwnPropertyDescriptor;var x=Object.getOwnPropertyNames;var j=Object.getPrototypeOf,P=Object.prototype.hasOwnProperty;var $=(n,s,m,g)=>{if(s&&typeof s=="object"||typeof s=="function")for(let d of x(s))!P.call(n,d)&&d!==m&&q(n,d,{get:()=>s[d],enumerable:!(g=w(s,d))||g.enumerable});return n};var L=(n,s,m)=>(m=n!=null?S(j(n)):{},$(s||!n||!n.__esModule?q(m,"default",{value:n,enumerable:!0}):m,n));Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../compiler-S2NEGW7Q.cjs"),h=function(s,m,g){const{cubes:d,drizzle:E,schema:v,extractSecurityContext:p,engineType:C,cors:R,basePath:y="/cubejs-api/v1",bodyLimit:b=10485760}=m;if(!d||d.length===0)return g(new Error("At least one cube must be provided in the cubes array"));R&&s.register(import("@fastify/cors"),R),s.addHook("onRequest",async(e,t)=>{e.method==="POST"&&(e.body=void 0)});const i=new o.SemanticLayerCompiler({drizzle:E,schema:v,engineType:C});d.forEach(e=>{i.registerCube(e)}),s.post(`${y}/load`,{bodyLimit:b,schema:{body:{type:"object",additionalProperties:!0}}},async(e,t)=>{try{const r=e.body,a=r.query||r,u=await p(e),c=i.validateQuery(a);if(!c.isValid)return t.status(400).send(o.formatErrorResponse(`Query validation failed: ${c.errors.join(", ")}`,400));const l=await i.executeMultiCubeQuery(a,u);return o.formatCubeResponse(a,l,i)}catch(r){return e.log.error(r,"Query execution error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"Query execution failed",500))}}),s.get(`${y}/load`,{schema:{querystring:{type:"object",properties:{query:{type:"string"}},required:["query"]}}},async(e,t)=>{try{const{query:r}=e.query;let a;try{a=JSON.parse(r)}catch{return t.status(400).send(o.formatErrorResponse("Invalid JSON in query parameter",400))}const u=await p(e),c=i.validateQuery(a);if(!c.isValid)return t.status(400).send(o.formatErrorResponse(`Query validation failed: ${c.errors.join(", ")}`,400));const l=await i.executeMultiCubeQuery(a,u);return o.formatCubeResponse(a,l,i)}catch(r){return e.log.error(r,"Query execution error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"Query execution failed",500))}}),s.post(`${y}/batch`,{bodyLimit:b,schema:{body:{type:"object",required:["queries"],properties:{queries:{type:"array",items:{type:"object"}}}}}},async(e,t)=>{try{const{queries:r}=e.body;if(!r||!Array.isArray(r))return t.status(400).send(o.formatErrorResponse('Request body must contain a "queries" array',400));if(r.length===0)return t.status(400).send(o.formatErrorResponse("Queries array cannot be empty",400));const a=await p(e);return await o.handleBatchRequest(r,a,i)}catch(r){return e.log.error(r,"Batch execution error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"Batch execution failed",500))}}),s.get(`${y}/meta`,async(e,t)=>{try{const r=i.getMetadata();return o.formatMetaResponse(r)}catch(r){return e.log.error(r,"Metadata error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"Failed to fetch metadata",500))}}),s.post(`${y}/sql`,{bodyLimit:b,schema:{body:{type:"object",additionalProperties:!0}}},async(e,t)=>{try{const r=e.body,a=await p(e),u=i.validateQuery(r);if(!u.isValid)return t.status(400).send(o.formatErrorResponse(`Query validation failed: ${u.errors.join(", ")}`,400));const c=r.measures?.[0]||r.dimensions?.[0];if(!c)return t.status(400).send(o.formatErrorResponse("No measures or dimensions specified",400));const l=c.split(".")[0],f=await i.generateSQL(l,r,a);return o.formatSqlResponse(r,f)}catch(r){return e.log.error(r,"SQL generation error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"SQL generation failed",500))}}),s.get(`${y}/sql`,{schema:{querystring:{type:"object",properties:{query:{type:"string"}},required:["query"]}}},async(e,t)=>{try{const{query:r}=e.query,a=JSON.parse(r),u=await p(e),c=i.validateQuery(a);if(!c.isValid)return t.status(400).send(o.formatErrorResponse(`Query validation failed: ${c.errors.join(", ")}`,400));const l=a.measures?.[0]||a.dimensions?.[0];if(!l)return t.status(400).send(o.formatErrorResponse("No measures or dimensions specified",400));const f=l.split(".")[0],Q=await i.generateSQL(f,a,u);return o.formatSqlResponse(a,Q)}catch(r){return e.log.error(r,"SQL generation error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"SQL generation failed",500))}}),s.post(`${y}/dry-run`,{bodyLimit:b,schema:{body:{type:"object",additionalProperties:!0}}},async(e,t)=>{try{const r=e.body,a=r.query||r,u=await p(e);return await o.handleDryRun(a,u,i)}catch(r){return e.log.error(r,"Dry-run error"),t.status(400).send({error:r instanceof Error?r.message:"Dry-run validation failed",valid:!1})}}),s.get(`${y}/dry-run`,{schema:{querystring:{type:"object",properties:{query:{type:"string"}},required:["query"]}}},async(e,t)=>{try{const{query:r}=e.query,a=JSON.parse(r),u=await p(e);return await o.handleDryRun(a,u,i)}catch(r){return e.log.error(r,"Dry-run error"),t.status(400).send({error:r instanceof Error?r.message:"Dry-run validation failed",valid:!1})}}),s.setErrorHandler(async(e,t,r)=>{t.log.error(e,"Fastify cube adapter error"),r.statusCode<400&&r.status(500);const a=e instanceof Error?e:String(e);return o.formatErrorResponse(a,r.statusCode)}),g()};async function M(n,s){await n.register(h,s)}function N(n){const s=require("fastify")({logger:!0});return s.register(h,n),s}exports.createCubeApp=N;exports.cubePlugin=h;exports.registerCubeRoutes=M;
+"use strict";var w=Object.create;var q=Object.defineProperty;var x=Object.getOwnPropertyDescriptor;var j=Object.getOwnPropertyNames;var P=Object.getPrototypeOf,$=Object.prototype.hasOwnProperty;var L=(n,s,m,g)=>{if(s&&typeof s=="object"||typeof s=="function")for(let d of j(s))!$.call(n,d)&&d!==m&&q(n,d,{get:()=>s[d],enumerable:!(g=x(s,d))||g.enumerable});return n};var M=(n,s,m)=>(m=n!=null?w(P(n)):{},L(s||!n||!n.__esModule?q(m,"default",{value:n,enumerable:!0}):m,n));Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../compiler-C6JQHGrF.cjs"),h=function(s,m,g){const{cubes:d,drizzle:E,schema:v,extractSecurityContext:p,engineType:C,cors:R,basePath:y="/cubejs-api/v1",bodyLimit:b=10485760,cache:Q}=m;if(!d||d.length===0)return g(new Error("At least one cube must be provided in the cubes array"));R&&s.register(import("@fastify/cors"),R),s.addHook("onRequest",async(e,t)=>{e.method==="POST"&&(e.body=void 0)});const i=new o.SemanticLayerCompiler({drizzle:E,schema:v,engineType:C,cache:Q});d.forEach(e=>{i.registerCube(e)}),s.post(`${y}/load`,{bodyLimit:b,schema:{body:{type:"object",additionalProperties:!0}}},async(e,t)=>{try{const r=e.body,a=r.query||r,u=await p(e),c=i.validateQuery(a);if(!c.isValid)return t.status(400).send(o.formatErrorResponse(`Query validation failed: ${c.errors.join(", ")}`,400));const l=await i.executeMultiCubeQuery(a,u);return o.formatCubeResponse(a,l,i)}catch(r){return e.log.error(r,"Query execution error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"Query execution failed",500))}}),s.get(`${y}/load`,{schema:{querystring:{type:"object",properties:{query:{type:"string"}},required:["query"]}}},async(e,t)=>{try{const{query:r}=e.query;let a;try{a=JSON.parse(r)}catch{return t.status(400).send(o.formatErrorResponse("Invalid JSON in query parameter",400))}const u=await p(e),c=i.validateQuery(a);if(!c.isValid)return t.status(400).send(o.formatErrorResponse(`Query validation failed: ${c.errors.join(", ")}`,400));const l=await i.executeMultiCubeQuery(a,u);return o.formatCubeResponse(a,l,i)}catch(r){return e.log.error(r,"Query execution error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"Query execution failed",500))}}),s.post(`${y}/batch`,{bodyLimit:b,schema:{body:{type:"object",required:["queries"],properties:{queries:{type:"array",items:{type:"object"}}}}}},async(e,t)=>{try{const{queries:r}=e.body;if(!r||!Array.isArray(r))return t.status(400).send(o.formatErrorResponse('Request body must contain a "queries" array',400));if(r.length===0)return t.status(400).send(o.formatErrorResponse("Queries array cannot be empty",400));const a=await p(e);return await o.handleBatchRequest(r,a,i)}catch(r){return e.log.error(r,"Batch execution error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"Batch execution failed",500))}}),s.get(`${y}/meta`,async(e,t)=>{try{const r=i.getMetadata();return o.formatMetaResponse(r)}catch(r){return e.log.error(r,"Metadata error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"Failed to fetch metadata",500))}}),s.post(`${y}/sql`,{bodyLimit:b,schema:{body:{type:"object",additionalProperties:!0}}},async(e,t)=>{try{const r=e.body,a=await p(e),u=i.validateQuery(r);if(!u.isValid)return t.status(400).send(o.formatErrorResponse(`Query validation failed: ${u.errors.join(", ")}`,400));const c=r.measures?.[0]||r.dimensions?.[0];if(!c)return t.status(400).send(o.formatErrorResponse("No measures or dimensions specified",400));const l=c.split(".")[0],f=await i.generateSQL(l,r,a);return o.formatSqlResponse(r,f)}catch(r){return e.log.error(r,"SQL generation error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"SQL generation failed",500))}}),s.get(`${y}/sql`,{schema:{querystring:{type:"object",properties:{query:{type:"string"}},required:["query"]}}},async(e,t)=>{try{const{query:r}=e.query,a=JSON.parse(r),u=await p(e),c=i.validateQuery(a);if(!c.isValid)return t.status(400).send(o.formatErrorResponse(`Query validation failed: ${c.errors.join(", ")}`,400));const l=a.measures?.[0]||a.dimensions?.[0];if(!l)return t.status(400).send(o.formatErrorResponse("No measures or dimensions specified",400));const f=l.split(".")[0],S=await i.generateSQL(f,a,u);return o.formatSqlResponse(a,S)}catch(r){return e.log.error(r,"SQL generation error"),t.status(500).send(o.formatErrorResponse(r instanceof Error?r.message:"SQL generation failed",500))}}),s.post(`${y}/dry-run`,{bodyLimit:b,schema:{body:{type:"object",additionalProperties:!0}}},async(e,t)=>{try{const r=e.body,a=r.query||r,u=await p(e);return await o.handleDryRun(a,u,i)}catch(r){return e.log.error(r,"Dry-run error"),t.status(400).send({error:r instanceof Error?r.message:"Dry-run validation failed",valid:!1})}}),s.get(`${y}/dry-run`,{schema:{querystring:{type:"object",properties:{query:{type:"string"}},required:["query"]}}},async(e,t)=>{try{const{query:r}=e.query,a=JSON.parse(r),u=await p(e);return await o.handleDryRun(a,u,i)}catch(r){return e.log.error(r,"Dry-run error"),t.status(400).send({error:r instanceof Error?r.message:"Dry-run validation failed",valid:!1})}}),s.setErrorHandler(async(e,t,r)=>{t.log.error(e,"Fastify cube adapter error"),r.statusCode<400&&r.status(500);const a=e instanceof Error?e:String(e);return o.formatErrorResponse(a,r.statusCode)}),g()};async function N(n,s){await n.register(h,s)}function A(n){const s=require("fastify")({logger:!0});return s.register(h,n),s}exports.createCubeApp=A;exports.cubePlugin=h;exports.registerCubeRoutes=N;

package/dist/adapters/fastify/index.d.ts

@@ -1,6 +1,6 @@
 import { FastifyPluginCallback, FastifyRequest, FastifyInstance } from 'fastify';
 import { FastifyCorsOptions } from '@fastify/cors';
-import { SemanticQuery, SecurityContext, DatabaseExecutor, DrizzleDatabase, Cube } from '../../server';
+import { SemanticQuery, SecurityContext, DatabaseExecutor, DrizzleDatabase, Cube, CacheConfig } from '../../server';
 import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
 import { MySql2Database } from 'drizzle-orm/mysql2';
 import { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
@@ -60,6 +60,11 @@ export interface FastifyAdapterOptions {
      * JSON body parser limit (default: 10485760 - 10MB)
      */
     bodyLimit?: number;
+    /**
+     * Cache configuration for query result caching
+     * When provided, query results will be cached using the specified provider
+     */
+    cache?: CacheConfig;
 }
 /**
  * Fastify plugin for Cube.js-compatible API

package/dist/adapters/fastify/index.js

@@ -1,4 +1,4 @@
-import { S as E, d as o, f as h, h as R, a as $, b as q, c as Q } from "../compiler-DDXMrb9d.js";
+import { S as R, d as o, f, h as $, a as P, b as q, c as Q } from "../compiler-Ddwn99Ja.js";
 const v = function(a, x, p) {
   const {
     cubes: g,
@@ -6,20 +6,22 @@ const v = function(a, x, p) {
     schema: w,
     extractSecurityContext: y,
     engineType: S,
-    cors: f,
+    cors: h,
     basePath: c = "/cubejs-api/v1",
-    bodyLimit: m = 10485760
+    bodyLimit: m = 10485760,
     // 10MB
+    cache: j
   } = x;
   if (!g || g.length === 0)
     return p(new Error("At least one cube must be provided in the cubes array"));
-  f && a.register(import("@fastify/cors"), f), a.addHook("onRequest", async (r, t) => {
+  h && a.register(import("@fastify/cors"), h), a.addHook("onRequest", async (r, t) => {
     r.method === "POST" && (r.body = void 0);
   });
-  const n = new E({
+  const n = new R({
     drizzle: C,
     schema: w,
-    engineType: S
+    engineType: S,
+    cache: j
   });
   g.forEach((r) => {
     n.registerCube(r);
@@ -40,7 +42,7 @@ const v = function(a, x, p) {
           400
         ));
       const d = await n.executeMultiCubeQuery(s, i);
-      return h(s, d, n);
+      return f(s, d, n);
     } catch (e) {
       return r.log.error(e, "Query execution error"), t.status(500).send(o(
         e instanceof Error ? e.message : "Query execution failed",
@@ -76,7 +78,7 @@ const v = function(a, x, p) {
           400
         ));
       const d = await n.executeMultiCubeQuery(s, i);
-      return h(s, d, n);
+      return f(s, d, n);
     } catch (e) {
       return r.log.error(e, "Query execution error"), t.status(500).send(o(
         e instanceof Error ? e.message : "Query execution failed",
@@ -111,7 +113,7 @@ const v = function(a, x, p) {
           400
         ));
       const s = await y(r);
-      return await R(e, s, n);
+      return await $(e, s, n);
     } catch (e) {
       return r.log.error(e, "Batch execution error"), t.status(500).send(o(
         e instanceof Error ? e.message : "Batch execution failed",
@@ -121,7 +123,7 @@ const v = function(a, x, p) {
   }), a.get(`${c}/meta`, async (r, t) => {
     try {
       const e = n.getMetadata();
-      return $(e);
+      return P(e);
     } catch (e) {
       return r.log.error(e, "Metadata error"), t.status(500).send(o(
         e instanceof Error ? e.message : "Failed to fetch metadata",
@@ -182,8 +184,8 @@ const v = function(a, x, p) {
           "No measures or dimensions specified",
           400
         ));
-      const b = d.split(".")[0], j = await n.generateSQL(b, s, i);
-      return q(s, j);
+      const b = d.split(".")[0], E = await n.generateSQL(b, s, i);
+      return q(s, E);
     } catch (e) {
       return r.log.error(e, "SQL generation error"), t.status(500).send(o(
         e instanceof Error ? e.message : "SQL generation failed",
@@ -234,17 +236,17 @@ const v = function(a, x, p) {
     return o(s, e.statusCode);
   }), p();
 };
-async function L(l, a) {
+async function N(l, a) {
   await l.register(v, a);
 }
-function N(l) {
+function M(l) {
   const a = require("fastify")({
     logger: !0
   });
   return a.register(v, l), a;
 }
 export {
-  N as createCubeApp,
+  M as createCubeApp,
   v as cubePlugin,
-  L as registerCubeRoutes
+  N as registerCubeRoutes
 };

package/dist/adapters/hono/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=require("hono"),y=require("../compiler-S2NEGW7Q.cjs");var b=f=>{const u={...{origin:"*",allowMethods:["GET","HEAD","PUT","POST","DELETE","PATCH"],allowHeaders:[],exposeHeaders:[]},...f},h=(i=>typeof i=="string"?i==="*"?()=>i:o=>i===o?o:null:typeof i=="function"?i:o=>i.includes(o)?o:null)(u.origin),d=(i=>typeof i=="function"?i:Array.isArray(i)?()=>i:()=>[])(u.allowMethods);return async function(o,c){function n(r,e){o.res.headers.set(r,e)}const s=await h(o.req.header("origin")||"",o);if(s&&n("Access-Control-Allow-Origin",s),u.credentials&&n("Access-Control-Allow-Credentials","true"),u.exposeHeaders?.length&&n("Access-Control-Expose-Headers",u.exposeHeaders.join(",")),o.req.method==="OPTIONS"){u.origin!=="*"&&n("Vary","Origin"),u.maxAge!=null&&n("Access-Control-Max-Age",u.maxAge.toString());const r=await d(o.req.header("origin")||"",o);r.length&&n("Access-Control-Allow-Methods",r.join(","));let e=u.allowHeaders;if(!e?.length){const t=o.req.header("Access-Control-Request-Headers");t&&(e=t.split(/\s*,\s*/))}return e?.length&&(n("Access-Control-Allow-Headers",e.join(",")),o.res.headers.append("Vary","Access-Control-Request-Headers")),o.res.headers.delete("Content-Length"),o.res.headers.delete("Content-Type"),new Response(null,{headers:o.res.headers,status:204,statusText:"No Content"})}await c(),u.origin!=="*"&&o.header("Vary","Origin",{append:!0})}};function p(f){const{cubes:q,drizzle:u,schema:h,extractSecurityContext:d,engineType:i,cors:o,basePath:c="/cubejs-api/v1"}=f;if(!q||q.length===0)throw new Error("At least one cube must be provided in the cubes array");const n=new g.Hono;o&&n.use("/*",b(o));const s=new y.SemanticLayerCompiler({drizzle:u,schema:h,engineType:i});return q.forEach(r=>{s.registerCube(r)}),n.post(`${c}/load`,async r=>{try{const e=await r.req.json(),t=e.query||e,l=await d(r),a=s.validateQuery(t);if(!a.isValid)return r.json({error:`Query validation failed: ${a.errors.join(", ")}`},400);const m=await s.executeMultiCubeQuery(t,l);return r.json(y.formatCubeResponse(t,m,s))}catch(e){return console.error("Query execution error:",e),r.json({error:e instanceof Error?e.message:"Query execution failed"},500)}}),n.get(`${c}/load`,async r=>{try{const e=r.req.query("query");if(!e)return r.json({error:"Query parameter is required"},400);let t;try{t=JSON.parse(e)}catch{return r.json({error:"Invalid JSON in query parameter"},400)}const l=await d(r),a=s.validateQuery(t);if(!a.isValid)return r.json({error:`Query validation failed: ${a.errors.join(", ")}`},400);const m=await s.executeMultiCubeQuery(t,l);return r.json(y.formatCubeResponse(t,m,s))}catch(e){return console.error("Query execution error:",e),r.json({error:e instanceof Error?e.message:"Query execution failed"},500)}}),n.post(`${c}/batch`,async r=>{try{const e=await r.req.json(),{queries:t}=e;if(!t||!Array.isArray(t))return r.json({error:'Request body must contain a "queries" array'},400);if(t.length===0)return r.json({error:"Queries array cannot be empty"},400);const l=await d(r),a=await y.handleBatchRequest(t,l,s);return r.json(a)}catch(e){return console.error("Batch execution error:",e),r.json({error:e instanceof Error?e.message:"Batch execution failed"},500)}}),n.get(`${c}/meta`,r=>{try{const e=s.getMetadata();return r.json(y.formatMetaResponse(e))}catch(e){return console.error("Metadata error:",e),r.json({error:e instanceof Error?e.message:"Failed to fetch metadata"},500)}}),n.post(`${c}/sql`,async r=>{try{const e=await r.req.json(),t=await d(r),l=s.validateQuery(e);if(!l.isValid)return r.json({error:`Query validation failed: ${l.errors.join(", ")}`},400);const a=e.measures?.[0]||e.dimensions?.[0];if(!a)return r.json({error:"No measures or dimensions specified"},400);const m=a.split(".")[0],j=await s.generateSQL(m,e,t);return r.json(y.formatSqlResponse(e,j))}catch(e){return console.error("SQL generation error:",e),r.json({error:e instanceof Error?e.message:"SQL generation failed"},500)}}),n.get(`${c}/sql`,async r=>{try{const e=r.req.query("query");if(!e)return r.json({error:"Query parameter is required"},400);const t=JSON.parse(e),l=await d(r),a=s.validateQuery(t);if(!a.isValid)return r.json({error:`Query validation failed: ${a.errors.join(", ")}`},400);const m=t.measures?.[0]||t.dimensions?.[0];if(!m)return r.json({error:"No measures or dimensions specified"},400);const j=m.split(".")[0],C=await s.generateSQL(j,t,l);return r.json(y.formatSqlResponse(t,C))}catch(e){return console.error("SQL generation error:",e),r.json({error:e instanceof Error?e.message:"SQL generation failed"},500)}}),n.post(`${c}/dry-run`,async r=>{try{const e=await r.req.json(),t=e.query||e,l=await d(r),a=await y.handleDryRun(t,l,s);return r.json(a)}catch(e){return console.error("Dry-run error:",e),r.json({error:e instanceof Error?e.message:"Dry-run validation failed",valid:!1},400)}}),n.get(`${c}/dry-run`,async r=>{try{const e=r.req.query("query");if(!e)return r.json({error:"Query parameter is required",valid:!1},400);const t=JSON.parse(e),l=await d(r),a=await y.handleDryRun(t,l,s);return r.json(a)}catch(e){return console.error("Dry-run error:",e),r.json({error:e instanceof Error?e.message:"Dry-run validation failed",valid:!1},400)}}),n}function w(f,q){const u=p(q);return f.route("/",u),f}function x(f){const q=new g.Hono;return w(q,f)}exports.createCubeApp=x;exports.createCubeRoutes=p;exports.mountCubeRoutes=w;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("hono"),f=require("../compiler-C6JQHGrF.cjs");var x=q=>{const i={...{origin:"*",allowMethods:["GET","HEAD","PUT","POST","DELETE","PATCH"],allowHeaders:[],exposeHeaders:[]},...q},j=(a=>typeof a=="string"?a==="*"?()=>a:o=>a===o?o:null:typeof a=="function"?a:o=>a.includes(o)?o:null)(i.origin),d=(a=>typeof a=="function"?a:Array.isArray(a)?()=>a:()=>[])(i.allowMethods);return async function(o,c){function y(n,r){o.res.headers.set(n,r)}const l=await j(o.req.header("origin")||"",o);if(l&&y("Access-Control-Allow-Origin",l),i.credentials&&y("Access-Control-Allow-Credentials","true"),i.exposeHeaders?.length&&y("Access-Control-Expose-Headers",i.exposeHeaders.join(",")),o.req.method==="OPTIONS"){i.origin!=="*"&&y("Vary","Origin"),i.maxAge!=null&&y("Access-Control-Max-Age",i.maxAge.toString());const n=await d(o.req.header("origin")||"",o);n.length&&y("Access-Control-Allow-Methods",n.join(","));let r=i.allowHeaders;if(!r?.length){const e=o.req.header("Access-Control-Request-Headers");e&&(r=e.split(/\s*,\s*/))}return r?.length&&(y("Access-Control-Allow-Headers",r.join(",")),o.res.headers.append("Vary","Access-Control-Request-Headers")),o.res.headers.delete("Content-Length"),o.res.headers.delete("Content-Type"),new Response(null,{headers:o.res.headers,status:204,statusText:"No Content"})}await c(),i.origin!=="*"&&o.header("Vary","Origin",{append:!0})}};function w(q){const{cubes:m,drizzle:i,schema:j,extractSecurityContext:d,engineType:a,cors:o,basePath:c="/cubejs-api/v1",cache:y}=q;if(!m||m.length===0)throw new Error("At least one cube must be provided in the cubes array");const l=new p.Hono;o&&l.use("/*",x(o));const n=new f.SemanticLayerCompiler({drizzle:i,schema:j,engineType:a,cache:y});return m.forEach(r=>{n.registerCube(r)}),l.post(`${c}/load`,async r=>{try{const e=await r.req.json(),t=e.query||e,u=await d(r),s=n.validateQuery(t);if(!s.isValid)return r.json({error:`Query validation failed: ${s.errors.join(", ")}`},400);const h=await n.executeMultiCubeQuery(t,u);return r.json(f.formatCubeResponse(t,h,n))}catch(e){return console.error("Query execution error:",e),r.json({error:e instanceof Error?e.message:"Query execution failed"},500)}}),l.get(`${c}/load`,async r=>{try{const e=r.req.query("query");if(!e)return r.json({error:"Query parameter is required"},400);let t;try{t=JSON.parse(e)}catch{return r.json({error:"Invalid JSON in query parameter"},400)}const u=await d(r),s=n.validateQuery(t);if(!s.isValid)return r.json({error:`Query validation failed: ${s.errors.join(", ")}`},400);const h=await n.executeMultiCubeQuery(t,u);return r.json(f.formatCubeResponse(t,h,n))}catch(e){return console.error("Query execution error:",e),r.json({error:e instanceof Error?e.message:"Query execution failed"},500)}}),l.post(`${c}/batch`,async r=>{try{const e=await r.req.json(),{queries:t}=e;if(!t||!Array.isArray(t))return r.json({error:'Request body must contain a "queries" array'},400);if(t.length===0)return r.json({error:"Queries array cannot be empty"},400);const u=await d(r),s=await f.handleBatchRequest(t,u,n);return r.json(s)}catch(e){return console.error("Batch execution error:",e),r.json({error:e instanceof Error?e.message:"Batch execution failed"},500)}}),l.get(`${c}/meta`,r=>{try{const e=n.getMetadata();return r.json(f.formatMetaResponse(e))}catch(e){return console.error("Metadata error:",e),r.json({error:e instanceof Error?e.message:"Failed to fetch metadata"},500)}}),l.post(`${c}/sql`,async r=>{try{const e=await r.req.json(),t=await d(r),u=n.validateQuery(e);if(!u.isValid)return r.json({error:`Query validation failed: ${u.errors.join(", ")}`},400);const s=e.measures?.[0]||e.dimensions?.[0];if(!s)return r.json({error:"No measures or dimensions specified"},400);const h=s.split(".")[0],g=await n.generateSQL(h,e,t);return r.json(f.formatSqlResponse(e,g))}catch(e){return console.error("SQL generation error:",e),r.json({error:e instanceof Error?e.message:"SQL generation failed"},500)}}),l.get(`${c}/sql`,async r=>{try{const e=r.req.query("query");if(!e)return r.json({error:"Query parameter is required"},400);const t=JSON.parse(e),u=await d(r),s=n.validateQuery(t);if(!s.isValid)return r.json({error:`Query validation failed: ${s.errors.join(", ")}`},400);const h=t.measures?.[0]||t.dimensions?.[0];if(!h)return r.json({error:"No measures or dimensions specified"},400);const g=h.split(".")[0],b=await n.generateSQL(g,t,u);return r.json(f.formatSqlResponse(t,b))}catch(e){return console.error("SQL generation error:",e),r.json({error:e instanceof Error?e.message:"SQL generation failed"},500)}}),l.post(`${c}/dry-run`,async r=>{try{const e=await r.req.json(),t=e.query||e,u=await d(r),s=await f.handleDryRun(t,u,n);return r.json(s)}catch(e){return console.error("Dry-run error:",e),r.json({error:e instanceof Error?e.message:"Dry-run validation failed",valid:!1},400)}}),l.get(`${c}/dry-run`,async r=>{try{const e=r.req.query("query");if(!e)return r.json({error:"Query parameter is required",valid:!1},400);const t=JSON.parse(e),u=await d(r),s=await f.handleDryRun(t,u,n);return r.json(s)}catch(e){return console.error("Dry-run error:",e),r.json({error:e instanceof Error?e.message:"Dry-run validation failed",valid:!1},400)}}),l}function C(q,m){const i=w(m);return q.route("/",i),q}function Q(q){const m=new p.Hono;return C(m,q)}exports.createCubeApp=Q;exports.createCubeRoutes=w;exports.mountCubeRoutes=C;

package/dist/adapters/hono/index.d.ts

@@ -1,5 +1,5 @@
 import { Hono } from 'hono';
-import { SemanticQuery, SecurityContext, DatabaseExecutor, DrizzleDatabase, Cube } from '../../server';
+import { SemanticQuery, SecurityContext, DatabaseExecutor, DrizzleDatabase, Cube, CacheConfig } from '../../server';
 import { PostgresJsDatabase } from 'drizzle-orm/postgres-js';
 import { MySql2Database } from 'drizzle-orm/mysql2';
 import { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3';
@@ -60,6 +60,11 @@ export interface HonoAdapterOptions {
      * API base path (default: '/cubejs-api/v1')
      */
     basePath?: string;
+    /**
+     * Cache configuration for query result caching
+     * When provided, query results will be cached using the specified provider
+     */
+    cache?: CacheConfig;
 }
 /**
  * Create Hono routes for Cube.js-compatible API

package/dist/adapters/hono/index.js

@@ -1,74 +1,76 @@
-import { Hono as w } from "hono";
-import { S as x, f as j, h as Q, a as b, b as g, c as p } from "../compiler-DDXMrb9d.js";
-var A = (y) => {
-  const u = {
+import { Hono as C } from "hono";
+import { S as Q, f as g, h as b, a as A, b as p, c as w } from "../compiler-Ddwn99Ja.js";
+var v = (f) => {
+  const i = {
     ...{
       origin: "*",
       allowMethods: ["GET", "HEAD", "PUT", "POST", "DELETE", "PATCH"],
       allowHeaders: [],
       exposeHeaders: []
     },
-    ...y
-  }, q = /* @__PURE__ */ ((i) => typeof i == "string" ? i === "*" ? () => i : (o) => i === o ? o : null : typeof i == "function" ? i : (o) => i.includes(o) ? o : null)(u.origin), d = ((i) => typeof i == "function" ? i : Array.isArray(i) ? () => i : () => [])(u.allowMethods);
+    ...f
+  }, h = /* @__PURE__ */ ((a) => typeof a == "string" ? a === "*" ? () => a : (o) => a === o ? o : null : typeof a == "function" ? a : (o) => a.includes(o) ? o : null)(i.origin), d = ((a) => typeof a == "function" ? a : Array.isArray(a) ? () => a : () => [])(i.allowMethods);
   return async function(o, c) {
-    function n(r, e) {
-      o.res.headers.set(r, e);
+    function y(n, r) {
+      o.res.headers.set(n, r);
     }
-    const s = await q(o.req.header("origin") || "", o);
-    if (s && n("Access-Control-Allow-Origin", s), u.credentials && n("Access-Control-Allow-Credentials", "true"), u.exposeHeaders?.length && n("Access-Control-Expose-Headers", u.exposeHeaders.join(",")), o.req.method === "OPTIONS") {
-      u.origin !== "*" && n("Vary", "Origin"), u.maxAge != null && n("Access-Control-Max-Age", u.maxAge.toString());
-      const r = await d(o.req.header("origin") || "", o);
-      r.length && n("Access-Control-Allow-Methods", r.join(","));
-      let e = u.allowHeaders;
-      if (!e?.length) {
-        const t = o.req.header("Access-Control-Request-Headers");
-        t && (e = t.split(/\s*,\s*/));
+    const l = await h(o.req.header("origin") || "", o);
+    if (l && y("Access-Control-Allow-Origin", l), i.credentials && y("Access-Control-Allow-Credentials", "true"), i.exposeHeaders?.length && y("Access-Control-Expose-Headers", i.exposeHeaders.join(",")), o.req.method === "OPTIONS") {
+      i.origin !== "*" && y("Vary", "Origin"), i.maxAge != null && y("Access-Control-Max-Age", i.maxAge.toString());
+      const n = await d(o.req.header("origin") || "", o);
+      n.length && y("Access-Control-Allow-Methods", n.join(","));
+      let r = i.allowHeaders;
+      if (!r?.length) {
+        const e = o.req.header("Access-Control-Request-Headers");
+        e && (r = e.split(/\s*,\s*/));
       }
-      return e?.length && (n("Access-Control-Allow-Headers", e.join(",")), o.res.headers.append("Vary", "Access-Control-Request-Headers")), o.res.headers.delete("Content-Length"), o.res.headers.delete("Content-Type"), new Response(null, {
+      return r?.length && (y("Access-Control-Allow-Headers", r.join(",")), o.res.headers.append("Vary", "Access-Control-Request-Headers")), o.res.headers.delete("Content-Length"), o.res.headers.delete("Content-Type"), new Response(null, {
         headers: o.res.headers,
         status: 204,
         statusText: "No Content"
       });
     }
-    await c(), u.origin !== "*" && o.header("Vary", "Origin", { append: !0 });
+    await c(), i.origin !== "*" && o.header("Vary", "Origin", { append: !0 });
   };
 };
-function v(y) {
+function S(f) {
   const {
-    cubes: f,
-    drizzle: u,
-    schema: q,
+    cubes: m,
+    drizzle: i,
+    schema: h,
     extractSecurityContext: d,
-    engineType: i,
+    engineType: a,
     cors: o,
-    basePath: c = "/cubejs-api/v1"
-  } = y;
-  if (!f || f.length === 0)
+    basePath: c = "/cubejs-api/v1",
+    cache: y
+  } = f;
+  if (!m || m.length === 0)
     throw new Error("At least one cube must be provided in the cubes array");
-  const n = new w();
-  o && n.use("/*", A(o));
-  const s = new x({
-    drizzle: u,
-    schema: q,
-    engineType: i
+  const l = new C();
+  o && l.use("/*", v(o));
+  const n = new Q({
+    drizzle: i,
+    schema: h,
+    engineType: a,
+    cache: y
   });
-  return f.forEach((r) => {
-    s.registerCube(r);
-  }), n.post(`${c}/load`, async (r) => {
+  return m.forEach((r) => {
+    n.registerCube(r);
+  }), l.post(`${c}/load`, async (r) => {
     try {
-      const e = await r.req.json(), t = e.query || e, l = await d(r), a = s.validateQuery(t);
-      if (!a.isValid)
+      const e = await r.req.json(), t = e.query || e, u = await d(r), s = n.validateQuery(t);
+      if (!s.isValid)
         return r.json({
-          error: `Query validation failed: ${a.errors.join(", ")}`
+          error: `Query validation failed: ${s.errors.join(", ")}`
         }, 400);
-      const m = await s.executeMultiCubeQuery(t, l);
-      return r.json(j(t, m, s));
+      const q = await n.executeMultiCubeQuery(t, u);
+      return r.json(g(t, q, n));
     } catch (e) {
       return console.error("Query execution error:", e), r.json({
         error: e instanceof Error ? e.message : "Query execution failed"
       }, 500);
     }
-  }), n.get(`${c}/load`, async (r) => {
+  }), l.get(`${c}/load`, async (r) => {
     try {
       const e = r.req.query("query");
       if (!e)
@@ -83,19 +85,19 @@ function v(y) {
           error: "Invalid JSON in query parameter"
         }, 400);
       }
-      const l = await d(r), a = s.validateQuery(t);
-      if (!a.isValid)
+      const u = await d(r), s = n.validateQuery(t);
+      if (!s.isValid)
         return r.json({
-          error: `Query validation failed: ${a.errors.join(", ")}`
+          error: `Query validation failed: ${s.errors.join(", ")}`
         }, 400);
-      const m = await s.executeMultiCubeQuery(t, l);
-      return r.json(j(t, m, s));
+      const q = await n.executeMultiCubeQuery(t, u);
+      return r.json(g(t, q, n));
     } catch (e) {
       return console.error("Query execution error:", e), r.json({
         error: e instanceof Error ? e.message : "Query execution failed"
       }, 500);
     }
-  }), n.post(`${c}/batch`, async (r) => {
+  }), l.post(`${c}/batch`, async (r) => {
     try {
       const e = await r.req.json(), { queries: t } = e;
       if (!t || !Array.isArray(t))
@@ -106,76 +108,76 @@ function v(y) {
         return r.json({
           error: "Queries array cannot be empty"
         }, 400);
-      const l = await d(r), a = await Q(t, l, s);
-      return r.json(a);
+      const u = await d(r), s = await b(t, u, n);
+      return r.json(s);
     } catch (e) {
       return console.error("Batch execution error:", e), r.json({
         error: e instanceof Error ? e.message : "Batch execution failed"
       }, 500);
     }
-  }), n.get(`${c}/meta`, (r) => {
+  }), l.get(`${c}/meta`, (r) => {
     try {
-      const e = s.getMetadata();
-      return r.json(b(e));
+      const e = n.getMetadata();
+      return r.json(A(e));
     } catch (e) {
       return console.error("Metadata error:", e), r.json({
         error: e instanceof Error ? e.message : "Failed to fetch metadata"
       }, 500);
     }
-  }), n.post(`${c}/sql`, async (r) => {
+  }), l.post(`${c}/sql`, async (r) => {
     try {
-      const e = await r.req.json(), t = await d(r), l = s.validateQuery(e);
-      if (!l.isValid)
+      const e = await r.req.json(), t = await d(r), u = n.validateQuery(e);
+      if (!u.isValid)
         return r.json({
-          error: `Query validation failed: ${l.errors.join(", ")}`
+          error: `Query validation failed: ${u.errors.join(", ")}`
         }, 400);
-      const a = e.measures?.[0] || e.dimensions?.[0];
-      if (!a)
+      const s = e.measures?.[0] || e.dimensions?.[0];
+      if (!s)
         return r.json({
           error: "No measures or dimensions specified"
         }, 400);
-      const m = a.split(".")[0], h = await s.generateSQL(m, e, t);
-      return r.json(g(e, h));
+      const q = s.split(".")[0], j = await n.generateSQL(q, e, t);
+      return r.json(p(e, j));
     } catch (e) {
       return console.error("SQL generation error:", e), r.json({
         error: e instanceof Error ? e.message : "SQL generation failed"
       }, 500);
     }
-  }), n.get(`${c}/sql`, async (r) => {
+  }), l.get(`${c}/sql`, async (r) => {
     try {
       const e = r.req.query("query");
       if (!e)
         return r.json({
           error: "Query parameter is required"
         }, 400);
-      const t = JSON.parse(e), l = await d(r), a = s.validateQuery(t);
-      if (!a.isValid)
+      const t = JSON.parse(e), u = await d(r), s = n.validateQuery(t);
+      if (!s.isValid)
         return r.json({
-          error: `Query validation failed: ${a.errors.join(", ")}`
+          error: `Query validation failed: ${s.errors.join(", ")}`
         }, 400);
-      const m = t.measures?.[0] || t.dimensions?.[0];
-      if (!m)
+      const q = t.measures?.[0] || t.dimensions?.[0];
+      if (!q)
         return r.json({
           error: "No measures or dimensions specified"
         }, 400);
-      const h = m.split(".")[0], C = await s.generateSQL(h, t, l);
-      return r.json(g(t, C));
+      const j = q.split(".")[0], x = await n.generateSQL(j, t, u);
+      return r.json(p(t, x));
     } catch (e) {
       return console.error("SQL generation error:", e), r.json({
         error: e instanceof Error ? e.message : "SQL generation failed"
       }, 500);
     }
-  }), n.post(`${c}/dry-run`, async (r) => {
+  }), l.post(`${c}/dry-run`, async (r) => {
     try {
-      const e = await r.req.json(), t = e.query || e, l = await d(r), a = await p(t, l, s);
-      return r.json(a);
+      const e = await r.req.json(), t = e.query || e, u = await d(r), s = await w(t, u, n);
+      return r.json(s);
     } catch (e) {
       return console.error("Dry-run error:", e), r.json({
         error: e instanceof Error ? e.message : "Dry-run validation failed",
         valid: !1
       }, 400);
     }
-  }), n.get(`${c}/dry-run`, async (r) => {
+  }), l.get(`${c}/dry-run`, async (r) => {
     try {
       const e = r.req.query("query");
       if (!e)
@@ -183,26 +185,26 @@ function v(y) {
           error: "Query parameter is required",
           valid: !1
         }, 400);
-      const t = JSON.parse(e), l = await d(r), a = await p(t, l, s);
-      return r.json(a);
+      const t = JSON.parse(e), u = await d(r), s = await w(t, u, n);
+      return r.json(s);
     } catch (e) {
       return console.error("Dry-run error:", e), r.json({
         error: e instanceof Error ? e.message : "Dry-run validation failed",
         valid: !1
       }, 400);
     }
-  }), n;
+  }), l;
 }
-function S(y, f) {
-  const u = v(f);
-  return y.route("/", u), y;
+function E(f, m) {
+  const i = S(m);
+  return f.route("/", i), f;
 }
-function H(y) {
-  const f = new w();
-  return S(f, y);
+function $(f) {
+  const m = new C();
+  return E(m, f);
 }
 export {
-  H as createCubeApp,
-  v as createCubeRoutes,
-  S as mountCubeRoutes
+  $ as createCubeApp,
+  S as createCubeRoutes,
+  E as mountCubeRoutes
 };