drizzle-cube 0.4.28 → 0.4.29

package/dist/server/index.d.ts

@@ -857,8 +857,8 @@ export declare interface CubeDiscoveryResult {
  * Type-safe cube join definition with lazy loading support
  */
 export declare interface CubeJoin {
-    /** Target cube reference - lazy loaded to avoid circular dependencies */
-    targetCube: Cube | (() => Cube);
+    /** Target cube reference - lazy loaded to avoid circular dependencies, or string name resolved from registry */
+    targetCube: Cube | (() => Cube) | string;
     /** Semantic relationship - determines join behavior */
     relationship: CubeRelationship;
     /** Array of join conditions - supports multi-column joins */
@@ -4081,9 +4081,12 @@ export declare interface QueryWarning {
 export declare type QueryWarningSeverity = 'info' | 'warning' | 'error';
 
 /**
- * Resolve cube reference (handles both direct and lazy references)
+ * Resolve cube reference (handles direct, lazy, and string name references)
+ *
+ * String references are resolved from the optional `cubes` registry map.
+ * Returns `null` when a string ref cannot be resolved (logs a warning).
  */
-export declare function resolveCubeReference(ref: Cube | (() => Cube)): Cube;
+export declare function resolveCubeReference(ref: Cube | (() => Cube) | string, cubes?: Map<string, Cube>): Cube | null;
 
 /**
  * Resolved measure SQL builders
@@ -4414,6 +4417,12 @@ export declare class SemanticLayerCompiler {
      * Validates calculated measures during registration
      */
     registerCube(cube: Cube): void;
+    /**
+     * Validate that all string-based cube references in joins resolve to registered cubes.
+     * Call after all cubes are registered for strict startup validation.
+     * Throws an error listing all unresolved references.
+     */
+    validateCubeReferences(): void;
     /**
      * Validate calculated measures in a cube
      * Checks template syntax, dependency existence, and circular dependencies

package/dist/server/index.js

@@ -2007,7 +2007,17 @@ function Gt(i, e, t) {
     return gt(i, e);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
-function J(i) {
+function k(i, e) {
+  if (typeof i == "string") {
+    if (!e)
+      return console.warn(
+        `[drizzle-cube] Cannot resolve string cube reference '${i}': no cube registry provided. Join will be skipped.`
+      ), null;
+    const t = e.get(i);
+    return t || (console.warn(
+      `[drizzle-cube] Cannot resolve cube reference '${i}': no cube with that name is registered. Registered cubes: ${Array.from(e.keys()).join(", ") || "(none)"}. Join will be skipped.`
+    ), null);
+  }
   return typeof i == "function" ? i() : i;
 }
 function Ve(i) {
@@ -3848,7 +3858,9 @@ class De {
       if (s.joins)
         for (const [, n] of Object.entries(s.joins)) {
           if (n.relationship === "belongsToMany") continue;
-          const E = J(n.targetCube).name;
+          const r = k(n.targetCube, this.cubes);
+          if (!r) continue;
+          const E = r.name;
           let a = e.get(E);
           a || (a = [], e.set(E, a)), a.push({ definingCube: t, joinDef: n });
         }
@@ -3876,7 +3888,9 @@ class De {
       const { cube: A, path: o } = E.shift(), R = this.cubes.get(A);
       if (R?.joins)
         for (const [, l] of Object.entries(R.joins)) {
-          const I = J(l.targetCube).name;
+          const N = k(l.targetCube, this.cubes);
+          if (!N) continue;
+          const I = N.name;
           if (a.has(I))
             continue;
           const u = [
@@ -4011,7 +4025,9 @@ class De {
       const R = this.cubes.get(a);
       if (R?.joins)
         for (const [, l] of Object.entries(R.joins)) {
-          const I = J(l.targetCube).name;
+          const N = k(l.targetCube, this.cubes);
+          if (!N) continue;
+          const I = N.name;
           if (o.has(I))
             continue;
           const u = [
@@ -4081,7 +4097,9 @@ class De {
       const { cube: E, path: a } = n.shift(), A = this.cubes.get(E);
       if (A?.joins)
         for (const [, o] of Object.entries(A.joins)) {
-          const S = J(o.targetCube).name;
+          const R = k(o.targetCube, this.cubes);
+          if (!R) continue;
+          const S = R.name;
           if (r.has(S)) continue;
           const l = [
             ...a,
@@ -4122,7 +4140,9 @@ class De {
       const n = s.shift(), r = this.cubes.get(n);
       if (r?.joins)
         for (const [, a] of Object.entries(r.joins)) {
-          const o = J(a.targetCube).name;
+          const A = k(a.targetCube, this.cubes);
+          if (!A) continue;
+          const o = A.name;
           t.has(o) || (t.add(o), s.push(o));
         }
       const E = this.reverseIndex.get(n) || [];
@@ -4300,7 +4320,7 @@ class Un {
     const R = this.collectPathHintCubes(r), S = /* @__PURE__ */ new Set();
     for (const N of o) {
       if (N === t.name) continue;
-      this.findHasManyJoinDef(t, N) && S.add(N);
+      this.findHasManyJoinDef(t, N, e) && S.add(N);
     }
     const l = s.filter((N) => N !== t.name);
     for (const N of l) {
@@ -4470,11 +4490,12 @@ class Un {
    */
   findJoinInfoToCube(e, t) {
     for (const [, s] of e)
-      if (s.name !== t && s.joins) {
-        for (const [, n] of Object.entries(s.joins))
-          if (J(n.targetCube).name === t)
+      if (s.name !== t && s.joins)
+        for (const [, n] of Object.entries(s.joins)) {
+          const r = k(n.targetCube, e);
+          if (r && r.name === t)
             return { sourceCube: s, joinDef: n };
-      }
+        }
     return null;
   }
   /**
@@ -4575,23 +4596,26 @@ class Un {
    * and to search from any source cube, not just the primary
    */
   findJoinInfoForCube(e, t, s) {
-    if (t.joins) {
-      for (const [, r] of Object.entries(t.joins))
-        if (J(r.targetCube).name === s)
+    if (t.joins)
+      for (const [, r] of Object.entries(t.joins)) {
+        const E = k(r.targetCube, e);
+        if (E && E.name === s)
           return { sourceCube: t, joinDef: r };
-    }
+      }
     const n = e.get(s);
-    if (n?.joins) {
-      for (const [, r] of Object.entries(n.joins))
-        if (J(r.targetCube).name === t.name)
+    if (n?.joins)
+      for (const [, r] of Object.entries(n.joins)) {
+        const E = k(r.targetCube, e);
+        if (E && E.name === t.name)
           return { sourceCube: n, joinDef: r, reversed: !0 };
-    }
+      }
     for (const [, r] of e)
-      if (!(r.name === t.name || r.name === s) && r.joins) {
-        for (const [, E] of Object.entries(r.joins))
-          if (J(E.targetCube).name === s)
+      if (!(r.name === t.name || r.name === s) && r.joins)
+        for (const [, E] of Object.entries(r.joins)) {
+          const a = k(E.targetCube, e);
+          if (a && a.name === s)
             return { sourceCube: r, joinDef: E };
-      }
+        }
     return null;
   }
   /**
@@ -4626,7 +4650,9 @@ class Un {
     }
     if (e.joins)
       for (const [, E] of Object.entries(e.joins)) {
-        const A = J(E.targetCube).name;
+        const a = k(E.targetCube, s);
+        if (!a) continue;
+        const A = a.name;
         if (r.has(A)) {
           let o;
           E.relationship === "belongsToMany" && E.through ? o = E.through.sourceKey.map((R) => ({
@@ -4683,12 +4709,14 @@ class Un {
   /**
    * Find hasMany join definition from primary cube to target cube
    */
-  findHasManyJoinDef(e, t) {
+  findHasManyJoinDef(e, t, s) {
     if (!e.joins)
       return null;
-    for (const [, s] of Object.entries(e.joins))
-      if (J(s.targetCube).name === t && s.relationship === "hasMany")
-        return s;
+    for (const [, n] of Object.entries(e.joins)) {
+      const r = k(n.targetCube, s);
+      if (r && r.name === t && n.relationship === "hasMany")
+        return n;
+    }
     return null;
   }
   /**
@@ -4713,9 +4741,10 @@ class Un {
     for (const E of r) {
       if (E === t.name) continue;
       const a = s.get(E);
-      if (a?.joins) {
-        for (const [, A] of Object.entries(a.joins))
-          if (J(A.targetCube).name === t.name && A.relationship === "hasMany") {
+      if (a?.joins)
+        for (const [, A] of Object.entries(a.joins)) {
+          const o = k(A.targetCube, s);
+          if (o && o.name === t.name && A.relationship === "hasMany") {
             const R = this.extractFiltersForCube(e.filters, E), S = this.extractTimeDimensionFiltersForCube(e, E), l = [...R, ...S];
             l.length > 0 && A.on.length > 0 && n.push({
               sourceCube: a,
@@ -4729,7 +4758,7 @@ class Un {
               }))
             });
           }
-      }
+        }
     }
     return n;
   }
@@ -7248,7 +7277,7 @@ class Vn {
       return null;
     const A = Array.from(n);
     if (!A.every(
-      (I) => this.hasDirectJoinToSharedDimension(t.get(I), E)
+      (I) => this.hasDirectJoinToSharedDimension(t.get(I), E, t)
     ))
       return null;
     const R = this.buildDimensionRefs(e, t), S = this.buildTimeDimensionRefs(e, t), l = {
@@ -7277,12 +7306,12 @@ class Vn {
       mergeStrategy: "fullJoin"
     };
   }
-  hasDirectJoinToSharedDimension(e, t) {
+  hasDirectJoinToSharedDimension(e, t, s) {
     if (!e?.joins)
       return !1;
-    for (const [, s] of Object.entries(e.joins)) {
-      const n = s.targetCube, r = typeof n == "function" ? n() : n;
-      if (!(!r || r.name !== t) && (s.relationship === "belongsTo" || s.relationship === "hasOne"))
+    for (const [, n] of Object.entries(e.joins)) {
+      const r = k(n.targetCube, s);
+      if (!(!r || r.name !== t) && (n.relationship === "belongsTo" || n.relationship === "hasOne"))
         return !0;
     }
     return !1;
@@ -8220,19 +8249,19 @@ class Zn {
     const o = `${r.multipliedCubeName.toLowerCase()}_keys`, R = `${r.multipliedCubeName.toLowerCase()}_pk_agg`, S = {}, l = [];
     if (t.dimensions)
       for (const D of t.dimensions) {
-        const [U, B] = D.split("."), w = E.get(U), k = w?.dimensions?.[B];
-        if (!w || !k)
+        const [U, B] = D.split("."), w = E.get(U), J = w?.dimensions?.[B];
+        if (!w || !J)
           return null;
-        const v = H(k.sql, s);
+        const v = H(J.sql, s);
         S[D] = T`${v}`.as(D), l.push(v);
       }
     if (t.timeDimensions)
       for (const D of t.timeDimensions) {
-        const [U, B] = D.dimension.split("."), w = E.get(U), k = w?.dimensions?.[B];
-        if (!w || !k)
+        const [U, B] = D.dimension.split("."), w = E.get(U), J = w?.dimensions?.[B];
+        if (!w || !J)
           return null;
         const v = n.queryBuilder.buildTimeDimensionExpression(
-          k.sql,
+          J.sql,
           D.granularity,
           s
         );
@@ -8325,8 +8354,8 @@ class Zn {
       if (!y.has(U)) continue;
       const B = a.measures?.[U];
       if (!B?.sql) return null;
-      const w = H(B.sql, s), k = `__avg_sum__${U}`, v = `__avg_count__${U}`;
-      h[k] = T`sum(${w})`.as(k), h[v] = T`count(${w})`.as(v);
+      const w = H(B.sql, s), J = `__avg_sum__${U}`, v = `__avg_count__${U}`;
+      h[J] = T`sum(${w})`.as(J), h[v] = T`count(${w})`.as(v);
     }
     let b = s.db.select(h).from(m.from);
     const Y = [];
@@ -8350,9 +8379,9 @@ class Zn {
       );
     }
     for (const D of I) {
-      const [U, B] = D.split("."), k = E.get(U)?.measures?.[B], v = `__reg__${D.replace(".", "__")}`;
+      const [U, B] = D.split("."), J = E.get(U)?.measures?.[B], v = `__reg__${D.replace(".", "__")}`;
       z[D] = this.buildKeysOuterAggregation(
-        k?.type ?? "sum",
+        J?.type ?? "sum",
         o,
         v,
         D
@@ -29236,6 +29265,22 @@ class _t {
   registerCube(e) {
     this.validateCalculatedMeasures(e), new oe(this.cubes).populateDependencies(e), this.cubes.set(e.name, e), this.invalidateMetadataCache();
   }
+  /**
+   * Validate that all string-based cube references in joins resolve to registered cubes.
+   * Call after all cubes are registered for strict startup validation.
+   * Throws an error listing all unresolved references.
+   */
+  validateCubeReferences() {
+    const e = [];
+    for (const [t, s] of this.cubes)
+      if (s.joins)
+        for (const [n, r] of Object.entries(s.joins))
+          typeof r.targetCube == "string" && !this.cubes.has(r.targetCube) && e.push(`${t}.joins.${n}: target cube '${r.targetCube}' is not registered`);
+    if (e.length > 0)
+      throw new Error(`Unresolved cube references:
+${e.map((t) => `  - ${t}`).join(`
+`)}`);
+  }
   /**
    * Validate calculated measures in a cube
    * Checks template syntax, dependency existence, and circular dependencies
@@ -29399,8 +29444,8 @@ ${t.join(`
     const E = [];
     if (e.joins)
       for (const [, o] of Object.entries(e.joins)) {
-        const R = typeof o.targetCube == "function" ? o.targetCube() : o.targetCube;
-        E.push({
+        const R = k(o.targetCube, this.cubes);
+        R && E.push({
           targetCube: R.name,
           relationship: o.relationship,
           joinFields: o.on.map((S) => ({
@@ -33359,7 +33404,7 @@ ${i.systemContext}`);
           };
           continue;
         }
-        const k = Date.now();
+        const J = Date.now();
         try {
           const v = await w(U);
           v.sideEffect && (yield v.sideEffect), Ae.push({
@@ -33378,7 +33423,7 @@ ${i.systemContext}`);
               toolName: D,
               toolUseId: B,
               isError: !!v.isError,
-              durationMs: Date.now() - k
+              durationMs: Date.now() - J
             });
           } catch {
           }
@@ -33400,7 +33445,7 @@ ${i.systemContext}`);
               toolName: D,
               toolUseId: B,
               isError: !0,
-              durationMs: Date.now() - k
+              durationMs: Date.now() - J
             });
           } catch {
           }
@@ -34494,7 +34539,7 @@ export {
   $T as getToolDefinitions,
   OA as handleAgentChat,
   mn as normalizeQuery,
-  J as resolveCubeReference,
+  k as resolveCubeReference,
   H as resolveSqlExpression,
   cA as suggestQuery
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-cube",
-  "version": "0.4.28",
+  "version": "0.4.29",
   "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",