drizzle-cube 0.1.15 → 0.1.17

package/dist/server/index.js

@@ -1000,16 +1000,16 @@ class AR {
         const [e, s] = t.split("."), i = C.get(e);
         if (i && i.dimensions && i.dimensions[s])
           if ((r = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : r.some((M) => M.cube.name === e)) {
-            const M = S.preAggregationCTEs.find((G) => G.cube.name === e), P = M.joinKeys.find((G) => G.targetColumn === s);
-            if (P && P.sourceColumnObj)
-              I.push(P.sourceColumnObj);
+            const M = S.preAggregationCTEs.find((G) => G.cube.name === e), o = M.joinKeys.find((G) => G.targetColumn === s);
+            if (o && o.sourceColumnObj)
+              I.push(o.sourceColumnObj);
             else {
               const G = n`${n.identifier(M.cteAlias)}.${n.identifier(s)}`;
               I.push(G);
             }
           } else {
-            const M = i.dimensions[s], P = K(M.sql, A);
-            I.push(P);
+            const M = i.dimensions[s], o = K(M.sql, A);
+            I.push(o);
           }
       }
     if (R.timeDimensions)
@@ -1017,10 +1017,10 @@ class AR {
         const [e, s] = t.dimension.split("."), i = C.get(e);
         if (i && i.dimensions && i.dimensions[s])
           if ((O = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : O.some((M) => M.cube.name === e)) {
-            const M = S.preAggregationCTEs.find((G) => G.cube.name === e), P = M.joinKeys.find((G) => G.targetColumn === s);
-            if (P && P.sourceColumnObj) {
+            const M = S.preAggregationCTEs.find((G) => G.cube.name === e), o = M.joinKeys.find((G) => G.targetColumn === s);
+            if (o && o.sourceColumnObj) {
               const G = this.buildTimeDimensionExpression(
-                P.sourceColumnObj,
+                o.sourceColumnObj,
                 t.granularity,
                 A
               );
@@ -1030,12 +1030,12 @@ class AR {
               I.push(G);
             }
           } else {
-            const M = i.dimensions[s], P = this.buildTimeDimensionExpression(
+            const M = i.dimensions[s], o = this.buildTimeDimensionExpression(
               M.sql,
               t.granularity,
               A
             );
-            I.push(P);
+            I.push(o);
           }
       }
     return I;
@@ -1395,7 +1395,7 @@ class IE {
             if (a.dimension in i) {
               let M = i[a.dimension];
               if (typeof M == "string" && M.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-                const P = M.replace(" ", "T"), G = !P.endsWith("Z") && !P.includes("+") ? P + "Z" : P;
+                const o = M.replace(" ", "T"), G = !o.endsWith("Z") && !o.includes("+") ? o + "Z" : o;
                 M = new Date(G);
               }
               M = this.databaseAdapter.convertTimeDimensionResult(M), i[a.dimension] = M;
@@ -1424,34 +1424,34 @@ class IE {
   buildPreAggregationCTE(E, R, A, S) {
     var M;
     const I = E.cube, N = I.sql(A), C = {};
-    for (const P of E.joinKeys)
-      if (P.targetColumnObj) {
-        C[P.targetColumn] = P.targetColumnObj;
-        for (const [G, o] of Object.entries(I.dimensions || {}))
-          o.sql === P.targetColumnObj && G !== P.targetColumn && (C[G] = n`${P.targetColumnObj}`.as(G));
+    for (const o of E.joinKeys)
+      if (o.targetColumnObj) {
+        C[o.targetColumn] = o.targetColumnObj;
+        for (const [G, P] of Object.entries(I.dimensions || {}))
+          P.sql === o.targetColumnObj && G !== o.targetColumn && (C[G] = n`${o.targetColumnObj}`.as(G));
       }
-    for (const P of E.measures) {
-      const [, G] = P.split(".");
+    for (const o of E.measures) {
+      const [, G] = o.split(".");
       if (I.measures && I.measures[G]) {
-        const o = I.measures[G], l = this.queryBuilder.buildMeasureExpression(o, A);
-        C[G] = n`${l}`.as(G);
+        const P = I.measures[G], H = this.queryBuilder.buildMeasureExpression(P, A);
+        C[G] = n`${H}`.as(G);
       }
     }
     const r = I.name;
     if (R.dimensions)
-      for (const P of R.dimensions) {
-        const [G, o] = P.split(".");
-        if (G === r && I.dimensions && I.dimensions[o]) {
-          const l = I.dimensions[o], H = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A);
-          C[o] = n`${H}`.as(o);
+      for (const o of R.dimensions) {
+        const [G, P] = o.split(".");
+        if (G === r && I.dimensions && I.dimensions[P]) {
+          const H = I.dimensions[P], l = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A);
+          C[P] = n`${l}`.as(P);
         }
       }
     if (R.timeDimensions)
-      for (const P of R.timeDimensions) {
-        const [G, o] = P.dimension.split(".");
-        if (G === r && I.dimensions && I.dimensions[o]) {
-          const l = I.dimensions[o], H = this.queryBuilder.buildTimeDimensionExpression(l.sql, P.granularity, A);
-          C[o] = n`${H}`.as(o);
+      for (const o of R.timeDimensions) {
+        const [G, P] = o.dimension.split(".");
+        if (G === r && I.dimensions && I.dimensions[P]) {
+          const H = I.dimensions[P], l = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
+          C[P] = n`${l}`.as(P);
         }
       }
     if (Object.keys(C).length === 0)
@@ -1459,24 +1459,24 @@ class IE {
     let O = A.db.select(C).from(N.from);
     const t = S ? {
       ...S,
-      preAggregationCTEs: (M = S.preAggregationCTEs) == null ? void 0 : M.filter((P) => P.cube.name !== I.name)
+      preAggregationCTEs: (M = S.preAggregationCTEs) == null ? void 0 : M.filter((o) => o.cube.name !== I.name)
     } : void 0, e = this.queryBuilder.buildWhereConditions(I, R, A, t), s = [];
     if (R.timeDimensions)
-      for (const P of R.timeDimensions) {
-        const [G, o] = P.dimension.split(".");
-        if (G === r && I.dimensions && I.dimensions[o] && P.dateRange) {
-          const l = I.dimensions[o], H = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(H, P.dateRange);
+      for (const o of R.timeDimensions) {
+        const [G, P] = o.dimension.split(".");
+        if (G === r && I.dimensions && I.dimensions[P] && o.dateRange) {
+          const H = I.dimensions[P], l = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(l, o.dateRange);
           B && s.push(B);
         }
       }
     if (R.filters) {
-      for (const P of R.filters)
-        if (!("and" in P) && !("or" in P) && "member" in P && "operator" in P) {
-          const G = P, [o, l] = G.member.split(".");
-          if (o === r && I.dimensions && I.dimensions[l]) {
-            const H = I.dimensions[l];
+      for (const o of R.filters)
+        if (!("and" in o) && !("or" in o) && "member" in o && "operator" in o) {
+          const G = o, [P, H] = G.member.split(".");
+          if (P === r && I.dimensions && I.dimensions[H]) {
+            const l = I.dimensions[H];
             if (G.operator === "inDateRange") {
-              const B = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A), u = this.queryBuilder.buildDateRangeCondition(B, G.values);
+              const B = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A), u = this.queryBuilder.buildDateRangeCondition(B, G.values);
               u && s.push(u);
             }
           }
@@ -1484,26 +1484,26 @@ class IE {
     }
     const i = [];
     if (N.where && i.push(N.where), i.push(...e, ...s), i.length > 0) {
-      const P = i.length === 1 ? i[0] : d(...i);
-      O = O.where(P);
+      const o = i.length === 1 ? i[0] : d(...i);
+      O = O.where(o);
     }
     const a = [];
-    for (const P of E.joinKeys)
-      P.targetColumnObj && a.push(P.targetColumnObj);
+    for (const o of E.joinKeys)
+      o.targetColumnObj && a.push(o.targetColumnObj);
     if (R.dimensions)
-      for (const P of R.dimensions) {
-        const [G, o] = P.split(".");
-        if (G === r && I.dimensions && I.dimensions[o]) {
-          const l = I.dimensions[o], H = K(l.sql, A);
-          a.push(H);
+      for (const o of R.dimensions) {
+        const [G, P] = o.split(".");
+        if (G === r && I.dimensions && I.dimensions[P]) {
+          const H = I.dimensions[P], l = K(H.sql, A);
+          a.push(l);
         }
       }
     if (R.timeDimensions)
-      for (const P of R.timeDimensions) {
-        const [G, o] = P.dimension.split(".");
-        if (G === r && I.dimensions && I.dimensions[o]) {
-          const l = I.dimensions[o], H = this.queryBuilder.buildTimeDimensionExpression(l.sql, P.granularity, A);
-          a.push(H);
+      for (const o of R.timeDimensions) {
+        const [G, P] = o.dimension.split(".");
+        if (G === r && I.dimensions && I.dimensions[P]) {
+          const H = I.dimensions[P], l = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
+          a.push(l);
         }
       }
     return a.length > 0 && (O = O.groupBy(...a)), A.db.$with(E.cteAlias).as(O);
@@ -1528,12 +1528,12 @@ class IE {
    * Build unified query that works for both single and multi-cube queries
    */
   buildUnifiedQuery(E, R, A) {
-    var M, P, G;
+    var M, o, G;
     const S = [], I = /* @__PURE__ */ new Map();
     if (E.preAggregationCTEs && E.preAggregationCTEs.length > 0)
-      for (const o of E.preAggregationCTEs) {
-        const l = this.buildPreAggregationCTE(o, R, A, E);
-        l && (S.push(l), I.set(o.cube.name, o.cteAlias));
+      for (const P of E.preAggregationCTEs) {
+        const H = this.buildPreAggregationCTE(P, R, A, E);
+        H && (S.push(H), I.set(P.cube.name, P.cteAlias));
       }
     const N = E.primaryCube.sql(A), r = { ...this.queryBuilder.buildSelections(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -1542,13 +1542,13 @@ class IE {
       A
     ) };
     if (E.preAggregationCTEs)
-      for (const o of E.preAggregationCTEs) {
-        const l = o.cube.name;
-        for (const H of o.measures)
-          if (r[H]) {
-            const [, B] = H.split("."), u = this.getCubesFromPlan(E).get(l);
+      for (const P of E.preAggregationCTEs) {
+        const H = P.cube.name;
+        for (const l of P.measures)
+          if (r[l]) {
+            const [, B] = l.split("."), u = this.getCubesFromPlan(E).get(H);
             if (u && u.measures && u.measures[B]) {
-              const p = u.measures[B], W = n`${n.identifier(o.cteAlias)}.${n.identifier(B)}`;
+              const p = u.measures[B], W = n`${n.identifier(P.cteAlias)}.${n.identifier(B)}`;
               let h;
               switch (p.type) {
                 case "count":
@@ -1571,66 +1571,72 @@ class IE {
                 default:
                   h = y(W);
               }
-              r[H] = n`${h}`.as(H);
+              r[l] = n`${h}`.as(l);
             }
           }
-        for (const H in r) {
-          const [B, u] = H.split(".");
-          if (B === l) {
-            const p = this.getCubesFromPlan(E).get(l), W = p && ((M = p.dimensions) == null ? void 0 : M[u]), h = H.startsWith(l + ".");
+        for (const l in r) {
+          const [B, u] = l.split(".");
+          if (B === H) {
+            const p = this.getCubesFromPlan(E).get(H), W = p && ((M = p.dimensions) == null ? void 0 : M[u]), h = l.startsWith(H + ".");
             if (W || h) {
-              let RE = o.joinKeys.find((AE) => AE.targetColumn === u);
-              if (!RE && ((P = p == null ? void 0 : p.dimensions) != null && P[u])) {
+              let RE = P.joinKeys.find((AE) => AE.targetColumn === u);
+              if (!RE && ((o = p == null ? void 0 : p.dimensions) != null && o[u])) {
                 const AE = p.dimensions[u].sql;
-                RE = o.joinKeys.find((WT) => WT.targetColumnObj === AE);
+                RE = P.joinKeys.find((WT) => WT.targetColumnObj === AE);
               }
-              RE ? r[H] = n`${n.identifier(o.cteAlias)}.${n.identifier(u)}`.as(H) : h && ((G = p == null ? void 0 : p.dimensions) != null && G[u]) && (r[H] = n`${n.identifier(o.cteAlias)}.${n.identifier(u)}`.as(H));
+              RE ? r[l] = n`${n.identifier(P.cteAlias)}.${n.identifier(u)}`.as(l) : h && ((G = p == null ? void 0 : p.dimensions) != null && G[u]) && (r[l] = n`${n.identifier(P.cteAlias)}.${n.identifier(u)}`.as(l));
             }
           }
         }
       }
     let O = A.db.select(r).from(N.from);
     if (S.length > 0 && (O = A.db.with(...S).select(r).from(N.from)), N.joins)
-      for (const o of N.joins)
-        switch (o.type || "left") {
+      for (const P of N.joins)
+        switch (P.type || "left") {
           case "left":
-            O = O.leftJoin(o.table, o.on);
+            O = O.leftJoin(P.table, P.on);
             break;
           case "inner":
-            O = O.innerJoin(o.table, o.on);
+            O = O.innerJoin(P.table, P.on);
             break;
           case "right":
-            O = O.rightJoin(o.table, o.on);
+            O = O.rightJoin(P.table, P.on);
             break;
           case "full":
-            O = O.fullJoin(o.table, o.on);
+            O = O.fullJoin(P.table, P.on);
             break;
         }
     if (E.joinCubes && E.joinCubes.length > 0)
-      for (const o of E.joinCubes) {
-        const l = I.get(o.cube.name);
-        let H, B;
-        l ? (H = n`${n.identifier(l)}`, B = this.buildCTEJoinCondition(o, l, E)) : (H = o.cube.sql(A).from, B = o.joinCondition);
+      for (const P of E.joinCubes) {
+        const H = I.get(P.cube.name);
+        let l, B;
+        H ? (l = n`${n.identifier(H)}`, B = this.buildCTEJoinCondition(P, H, E)) : (l = P.cube.sql(A).from, B = P.joinCondition);
         try {
-          switch (o.joinType || "left") {
+          switch (P.joinType || "left") {
             case "left":
-              O = O.leftJoin(H, B);
+              O = O.leftJoin(l, B);
               break;
             case "inner":
-              O = O.innerJoin(H, B);
+              O = O.innerJoin(l, B);
               break;
             case "right":
-              O = O.rightJoin(H, B);
+              O = O.rightJoin(l, B);
               break;
             case "full":
-              O = O.fullJoin(H, B);
+              O = O.fullJoin(l, B);
               break;
           }
         } catch {
         }
       }
     const t = [];
-    N.where && t.push(N.where);
+    if (N.where && t.push(N.where), E.joinCubes && E.joinCubes.length > 0)
+      for (const P of E.joinCubes) {
+        if (I.get(P.cube.name))
+          continue;
+        const l = P.cube.sql(A);
+        l.where && t.push(l.where);
+      }
     const e = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
@@ -1640,8 +1646,8 @@ class IE {
       // Pass the queryPlan to handle CTE scenarios
     );
     if (e.length > 0 && t.push(...e), t.length > 0) {
-      const o = t.length === 1 ? t[0] : d(...t);
-      O = O.where(o);
+      const P = t.length === 1 ? t[0] : d(...t);
+      O = O.where(P);
     }
     const s = this.queryBuilder.buildGroupByFields(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -1661,8 +1667,8 @@ class IE {
       // Pass the queryPlan to handle CTE scenarios
     );
     if (i.length > 0) {
-      const o = i.length === 1 ? i[0] : d(...i);
-      O = O.having(o);
+      const P = i.length === 1 ? i[0] : d(...i);
+      O = O.having(P);
     }
     const a = this.queryBuilder.buildOrderBy(R);
     return a.length > 0 && (O = O.orderBy(...a)), O = this.queryBuilder.applyLimitAndOffset(O, R), O;
@@ -17710,29 +17716,29 @@ var uT = { exports: {} };
         var a = t[i];
         if (a.isComplete) {
           if (a.finish(), a.data !== N.fail) {
-            for (var M = a.wantedBy, P = M.length; P--; ) {
-              var G = M[P];
+            for (var M = a.wantedBy, o = M.length; o--; ) {
+              var G = M[o];
               this.complete(G, a);
             }
             if (a.reference === this.index) {
-              var o = a.rule.name;
-              (this.completed[o] = this.completed[o] || []).push(a);
+              var P = a.rule.name;
+              (this.completed[P] = this.completed[P] || []).push(a);
             }
           }
         } else {
-          var o = a.rule.symbols[a.dot];
-          if (typeof o != "string") {
+          var P = a.rule.symbols[a.dot];
+          if (typeof P != "string") {
             this.scannable.push(a);
             continue;
           }
-          if (e[o]) {
-            if (e[o].push(a), s.hasOwnProperty(o))
-              for (var l = s[o], P = 0; P < l.length; P++) {
-                var H = l[P];
-                this.complete(a, H);
+          if (e[P]) {
+            if (e[P].push(a), s.hasOwnProperty(P))
+              for (var H = s[P], o = 0; o < H.length; o++) {
+                var l = H[o];
+                this.complete(a, l);
               }
           } else
-            e[o] = [a], this.predict(o);
+            e[P] = [a], this.predict(P);
         }
       }
     }, A.prototype.predict = function(O) {
@@ -17788,17 +17794,17 @@ var uT = { exports: {} };
         var a = this.index - this.lastLineBreak, M = String(this.line).length;
         return t += " at line " + this.line + " col " + a + `:
 
-`, t += s.map(function(G, o) {
-          return P(this.line - s.length + o + 1, M) + " " + G;
+`, t += s.map(function(G, P) {
+          return o(this.line - s.length + P + 1, M) + " " + G;
         }, this).join(`
 `), t += `
-` + P("", M + a) + `^
+` + o("", M + a) + `^
 `, t;
       } else
         return t + " at index " + (this.index - 1);
-      function P(G, o) {
-        var l = String(G);
-        return Array(o - l.length + 1).join(" ") + l;
+      function o(G, P) {
+        var H = String(G);
+        return Array(P - H.length + 1).join(" ") + H;
       }
     };
     function N(O, t, e) {
@@ -17833,10 +17839,10 @@ var uT = { exports: {} };
         this.options.keepHistory || delete this.table[this.current - 1];
         var a = this.current + 1, M = new A(this.grammar, a);
         this.table.push(M);
-        for (var P = e.text !== void 0 ? e.text : e.value, G = t.constructor === I ? e.value : e, o = i.scannable, l = o.length; l--; ) {
-          var H = o[l], B = H.rule.symbols[H.dot];
-          if (B.test ? B.test(G) : B.type ? B.type === e.type : B.literal === P) {
-            var u = H.nextState({ data: G, token: e, isToken: !0, reference: a - 1 });
+        for (var o = e.text !== void 0 ? e.text : e.value, G = t.constructor === I ? e.value : e, P = i.scannable, H = P.length; H--; ) {
+          var l = P[H], B = l.rule.symbols[l.dot];
+          if (B.test ? B.test(G) : B.type ? B.type === e.type : B.literal === o) {
+            var u = l.nextState({ data: G, token: e, isToken: !0, reference: a - 1 });
             M.states.push(u);
           }
         }
@@ -17856,8 +17862,8 @@ var uT = { exports: {} };
     }, N.prototype.reportErrorCommon = function(O, t) {
       var e = [];
       e.push(O);
-      var s = this.table.length - 2, i = this.table[s], a = i.states.filter(function(P) {
-        var G = P.rule.symbols[P.dot];
+      var s = this.table.length - 2, i = this.table[s], a = i.states.filter(function(o) {
+        var G = o.rule.symbols[o.dot];
         return G && typeof G != "string";
       });
       if (a.length === 0)
@@ -17866,12 +17872,12 @@ var uT = { exports: {} };
       else {
         e.push("Unexpected " + t + `. Instead, I was expecting to see one of the following:
 `);
-        var M = a.map(function(P) {
-          return this.buildFirstStateStack(P, []) || [P];
+        var M = a.map(function(o) {
+          return this.buildFirstStateStack(o, []) || [o];
         }, this);
-        M.forEach(function(P) {
-          var G = P[0], o = G.rule.symbols[G.dot], l = this.getSymbolDisplay(o);
-          e.push("A " + l + " based on:"), this.displayStateStack(P, e);
+        M.forEach(function(o) {
+          var G = o[0], P = G.rule.symbols[G.dot], H = this.getSymbolDisplay(P);
+          e.push("A " + H + " based on:"), this.displayStateStack(o, e);
         }, this);
       }
       return e.push(""), e.join(`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-cube",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Drizzle ORM-first semantic layer with Cube.js compatibility. Type-safe analytics and dashboards with SQL injection protection.",
   "main": "./dist/server/index.js",
   "types": "./dist/server/index.d.ts",
@@ -58,17 +58,17 @@
     "LICENSE"
   ],
   "scripts": {
-    "dev": "concurrently \"npm run dev:server\" \"npm run dev:client\" \"npm run dev:examples\" \"npm run dev:help\"",
-    "dev:server": "vite build src/server --watch --mode development",
-    "dev:client": "vite build src/client --watch --mode development",
-    "dev:examples": "cd examples/hono-app && npm run dev",
-    "dev:help": "cd help-site && npm run dev",
-    "build": "npm run build:server && npm run build:client && npm run build:adapters && npm run build:help",
+    "dev": "concurrently \"npm run dev:server\" \"npm run dev:client\"",
+    "dev:server": "tsx watch dev/server/index.ts",
+    "dev:client": "cd dev/client && vite",
+    "dev:build": "concurrently \"npm run dev:build-server\" \"npm run dev:build-client\"",
+    "dev:build-server": "vite build src/server --watch --mode development",
+    "dev:build-client": "vite build src/client --watch --mode development",
+    "build": "npm run build:server && npm run build:client && npm run build:adapters",
     "build:server": "vite build --config vite.config.server.ts",
     "build:client": "vite build --config vite.config.client.ts",
     "analyze:client": "vite build --config vite.config.client.ts && open dist/client-bundle-stats.html",
     "build:adapters": "vite build --config vite.config.adapters.ts",
-    "build:help": "cd help-site && npm run build",
     "test": "vitest run",
     "test:watch": "vitest --watch",
     "test:postgres": "vitest run",
@@ -80,7 +80,12 @@
     "typecheck": "tsc --noEmit",
     "lint": "eslint src/**/*.ts",
     "lint:fix": "eslint src/**/*.ts --fix",
-    "prepublishOnly": "npm run build && npm run test && npm run typecheck"
+    "prepublishOnly": "npm run build && npm run test && npm run typecheck",
+    "dev:db:up": "cd dev && docker-compose up -d",
+    "dev:db:down": "cd dev && docker-compose down",
+    "dev:db:migrate": "cd dev && tsx scripts/migrate.ts",
+    "dev:db:seed": "cd dev && tsx scripts/seed.ts",
+    "dev:setup": "npm run dev:db:up && sleep 5 && npm run dev:db:migrate && npm run dev:db:seed"
   },
   "keywords": [
     "drizzle-orm",
@@ -112,22 +117,28 @@
   "peerDependencies": {
     "@neondatabase/serverless": "^1.0.1",
     "cors": "^2.8.5",
+    "d3": "^7.9.0",
     "drizzle-orm": "^0.44.4",
     "express": "^5.0.0",
     "fastify": "^5.0.0",
     "hono": "^4.0.0",
     "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react-dom": "^18.0.0",
+    "react-grid-layout": "^1.4.0",
+    "recharts": "^2.8.0"
   },
   "peerDependenciesMeta": {
     "react": {
-      "optional": false
+      "optional": true
     },
     "react-dom": {
-      "optional": false
+      "optional": true
+    },
+    "react-grid-layout": {
+      "optional": true
     },
     "drizzle-orm": {
-      "optional": false
+      "optional": true
     },
     "hono": {
       "optional": true
@@ -150,8 +161,13 @@
   },
   "devDependencies": {
     "@fastify/cors": "^11.1.0",
+    "@heroicons/react": "^2.2.0",
+    "@hono/node-server": "^1.19.0",
+    "@iconify-icons/tabler": "^1.2.95",
+    "@iconify/react": "^6.0.0",
     "@types/better-sqlite3": "^7.6.0",
     "@types/cors": "^2.8.17",
+    "@types/d3": "^7.4.3",
     "@types/express": "^5.0.0",
     "@types/node": "^20.0.0",
     "@types/react": "^18.0.0",
@@ -175,25 +191,20 @@
     "next": "^15.0.0",
     "postcss": "^8.5.6",
     "postgres": "^3.4.7",
+    "react-hook-form": "^7.47.0",
     "rollup-plugin-visualizer": "^6.0.3",
+    "sql-formatter": "^15.6.6",
     "supertest": "^7.0.0",
     "tailwindcss": "^3.4.15",
+    "tsx": "^4.20.5",
     "typescript": "^5.0.0",
     "vite": "^5.0.0",
     "vite-plugin-dts": "^4.0.0",
-    "vitest": "^2.0.0"
+    "vitest": "^2.0.0",
+    "zod": "^3.22.0"
   },
   "dependencies": {
-    "@heroicons/react": "^2.2.0",
-    "@iconify-icons/tabler": "^1.2.95",
-    "@iconify/react": "^6.0.0",
-    "@types/d3": "^7.4.3",
-    "d3": "^7.9.0",
-    "react-grid-layout": "^1.4.0",
-    "react-hook-form": "^7.47.0",
-    "recharts": "^2.8.0",
-    "sql-formatter": "^15.6.6",
-    "yaml": "^2.8.1",
-    "zod": "^3.22.0"
+    "@tanstack/react-query": "^5.85.5",
+    "react-router-dom": "^7.8.2"
   }
 }