drizzle-cube 0.2.17 → 0.2.18

package/dist/server/index.js

@@ -1,4 +1,4 @@
-import { sql as n, eq as g, and as B, SQL as qT, gte as x, lte as v, arrayContained as zT, arrayOverlaps as Ee, arrayContains as Te, isNotNull as JE, ne as xE, or as k, isNull as vE, notInArray as QE, inArray as IE, lt as sE, gt as nE, StringChunk as ee, sum as V, max as q, min as z, count as VE, countDistinct as Re, desc as Ae, asc as ZE } from "drizzle-orm";
+import { sql as n, eq as g, and as B, SQL as qT, gte as v, lte as x, arrayContained as zT, arrayOverlaps as Ee, arrayContains as Te, isNotNull as JE, ne as vE, or as k, isNull as xE, notInArray as QE, inArray as IE, lt as sE, gt as nE, StringChunk as ee, sum as V, max as q, min as z, count as VE, countDistinct as Re, desc as Ae, asc as ZE } from "drizzle-orm";
 class yE {
   /**
    * Default implementation returns template unchanged
@@ -1061,8 +1061,8 @@ class ie {
         t.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? A = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(t.getTime() / 1e3) : t.getTime() : A = t.toISOString();
       }
       return B(
-        x(E, R),
-        v(E, A)
+        v(E, R),
+        x(E, A)
       );
     }
     if (typeof T == "string") {
@@ -1070,8 +1070,8 @@ class ie {
       if (R) {
         let s, O;
         return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (s = Math.floor(R.start.getTime() / 1e3), O = Math.floor(R.end.getTime() / 1e3)) : (s = R.start.getTime(), O = R.end.getTime()) : (s = R.start.toISOString(), O = R.end.toISOString()), B(
-          x(E, s),
-          v(E, O)
+          v(E, s),
+          x(E, O)
         );
       }
       const A = this.normalizeDate(T);
@@ -1082,8 +1082,8 @@ class ie {
       I.setUTCHours(23, 59, 59, 999);
       let C, N;
       return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (C = Math.floor(t.getTime() / 1e3), N = Math.floor(I.getTime() / 1e3)) : (C = t.getTime(), N = I.getTime()) : (C = t.toISOString(), N = I.toISOString()), B(
-        x(E, C),
-        v(E, N)
+        v(E, C),
+        x(E, N)
       );
     }
     return null;
@@ -1236,7 +1236,7 @@ class ae {
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return t.length > 1 ? QE(E, t) : t.length === 1 ? xE(E, I) : null;
+        return t.length > 1 ? QE(E, t) : t.length === 1 ? vE(E, I) : null;
       case "contains":
         return this.databaseAdapter.buildStringCondition(E, "contains", I);
       case "notContains":
@@ -1248,15 +1248,15 @@ class ae {
       case "gt":
         return nE(E, I);
       case "gte":
-        return x(E, I);
+        return v(E, I);
       case "lt":
         return sE(E, I);
       case "lte":
-        return v(E, I);
+        return x(E, I);
       case "set":
         return JE(E);
       case "notSet":
-        return vE(E);
+        return xE(E);
       case "inDateRange":
         if (t.length >= 2) {
           const C = this.dateTimeBuilder.normalizeDate(t[0]);
@@ -1268,8 +1268,8 @@ class ae {
               r.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? N = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(r.getTime() / 1e3) : r.getTime() : N = r.toISOString();
             }
             return B(
-              x(E, C),
-              v(E, N)
+              v(E, C),
+              x(E, N)
             );
           }
         }
@@ -1284,8 +1284,8 @@ class ae {
       }
       case "between":
         return t.length >= 2 ? B(
-          x(E, t[0]),
-          v(E, t[1])
+          v(E, t[0]),
+          x(E, t[1])
         ) : null;
       case "notBetween":
         return t.length >= 2 ? k(
@@ -1308,13 +1308,13 @@ class ae {
         return this.databaseAdapter.buildStringCondition(E, "notRegex", I);
       case "isEmpty":
         return k(
-          vE(E),
+          xE(E),
           g(E, "")
         );
       case "isNotEmpty":
         return B(
           JE(E),
-          xE(E, "")
+          vE(E, "")
         );
       // PostgreSQL array operators - silent no-op for other databases
       // These use Drizzle's built-in array operator functions
@@ -3483,20 +3483,21 @@ class CE {
    * detect cubes that may leak data across tenants.
    */
   validateSecurityContext(E, T) {
-    if (process.env.NODE_ENV !== "development" && !process.env.DRIZZLE_CUBE_WARN_SECURITY)
+    const R = typeof process < "u" ? process.env?.NODE_ENV : void 0, A = typeof process < "u" ? process.env?.DRIZZLE_CUBE_WARN_SECURITY : void 0;
+    if (R !== "development" && !A)
       return;
-    const R = [E.primaryCube];
-    for (const S of E.joinCubes || [])
-      R.push(S.cube);
-    for (const S of E.preAggregationCTEs || [])
-      R.push(S.cube);
-    const A = /* @__PURE__ */ new Set();
-    for (const S of R)
-      if (!A.has(S.name)) {
-        A.add(S.name);
+    const S = [E.primaryCube];
+    for (const I of E.joinCubes || [])
+      S.push(I.cube);
+    for (const I of E.preAggregationCTEs || [])
+      S.push(I.cube);
+    const t = /* @__PURE__ */ new Set();
+    for (const I of S)
+      if (!t.has(I.name)) {
+        t.add(I.name);
         try {
-          S.sql(T).where || console.warn(
-            `[drizzle-cube] WARNING: Cube '${S.name}' may not have proper security filtering. The sql() function returned no 'where' clause. Ensure it returns a filter like: { from: table, where: eq(table.organisationId, ctx.securityContext.organisationId) }`
+          I.sql(T).where || console.warn(
+            `[drizzle-cube] WARNING: Cube '${I.name}' may not have proper security filtering. The sql() function returned no 'where' clause. Ensure it returns a filter like: { from: table, where: eq(table.organisationId, ctx.securityContext.organisationId) }`
           );
         } catch {
         }
@@ -4713,11 +4714,11 @@ const VT = (e) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), xe = i([
+]), ve = i([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), ve = i([
+]), xe = i([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
@@ -4737,8 +4738,8 @@ const VT = (e) => ({
   tokenizerOptions: {
     reservedSelect: we,
     reservedClauses: [...Je, ...LE, ...ET],
-    reservedSetOperations: xe,
-    reservedJoins: ve,
+    reservedSetOperations: ve,
+    reservedJoins: xe,
     reservedKeywordPhrases: Qe,
     reservedDataTypePhrases: Ze,
     reservedKeywords: $e,
@@ -9055,7 +9056,7 @@ const $R = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], JR = i(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), xR = i([
+], JR = i(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), vR = i([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -9286,7 +9287,7 @@ const $R = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), vR = i([
+]), xR = i([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]",
@@ -9308,8 +9309,8 @@ const $R = [
   name: "mariadb",
   tokenizerOptions: {
     reservedSelect: JR,
-    reservedClauses: [...xR, ...tT, ...DE],
-    reservedSetOperations: vR,
+    reservedClauses: [...vR, ...tT, ...DE],
+    reservedSetOperations: xR,
     reservedJoins: QR,
     reservedKeywordPhrases: ZR,
     reservedDataTypePhrases: jR,
@@ -13430,7 +13431,7 @@ const XA = [
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), xA = i([
+]), vA = i([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
@@ -13441,7 +13442,7 @@ const XA = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), vA = i([
+]), xA = i([
   // https://www.postgresql.org/docs/current/datatype-datetime.html
   "[TIMESTAMP | TIME] {WITH | WITHOUT} TIME ZONE"
 ]), QA = {
@@ -13451,8 +13452,8 @@ const XA = [
     reservedClauses: [...KA, ...nT, ...cE],
     reservedSetOperations: wA,
     reservedJoins: JA,
-    reservedKeywordPhrases: xA,
-    reservedDataTypePhrases: vA,
+    reservedKeywordPhrases: vA,
+    reservedDataTypePhrases: xA,
     reservedKeywords: gA,
     reservedDataTypes: yA,
     reservedFunctionNames: XA,
@@ -16687,7 +16688,7 @@ const iS = [
     onelineClauses: [...iT, ...mE],
     tabularOnelineClauses: mE
   }
-}, xS = [
+}, vS = [
   // https://docs.microsoft.com/en-us/sql/t-sql/functions/functions?view=sql-server-ver15
   // aggregate
   "APPROX_COUNT_DISTINCT",
@@ -16992,7 +16993,7 @@ const iS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], vS = [
+], xS = [
   // https://docs.microsoft.com/en-us/sql/t-sql/language-elements/reserved-keywords-transact-sql?view=sql-server-ver15
   // standard
   "ADD",
@@ -17423,9 +17424,9 @@ const iS = [
     reservedJoins: qS,
     reservedKeywordPhrases: zS,
     reservedDataTypePhrases: Et,
-    reservedKeywords: vS,
+    reservedKeywords: xS,
     reservedDataTypes: QS,
-    reservedFunctionNames: xS,
+    reservedFunctionNames: vS,
     nestedBlockComments: !0,
     stringTypes: [{ quote: "''-qq", prefixes: ["N"] }, "{}"],
     identTypes: ['""-qq', "[]"],
@@ -20065,10 +20066,10 @@ function Kt() {
 }
 var wt = Kt();
 const Jt = /* @__PURE__ */ yt(wt);
-function xt(e) {
-  return e.map(vt).map(Qt).map(Zt).map(jt).map(kt);
+function vt(e) {
+  return e.map(xt).map(Qt).map(Zt).map(jt).map(kt);
 }
-const vt = (e, E, T) => {
+const xt = (e, E, T) => {
   if (bT(e.type)) {
     const R = qt(T, E);
     if (R && R.type === o.PROPERTY_ACCESS_OPERATOR)
@@ -20559,7 +20560,7 @@ const G = new JT((e) => []), W = ([[e]]) => e, F = (e) => ({
 function AN(e) {
   let E = {};
   const T = new JT((A) => [
-    ...xt(e.tokenize(A, E)),
+    ...vt(e.tokenize(A, E)),
     VT(A.length)
   ]), R = new eN(RN.fromCompiled(TN), { lexer: T });
   return {
@@ -20577,7 +20578,7 @@ var a;
 (function(e) {
   e[e.SPACE = 0] = "SPACE", e[e.NO_SPACE = 1] = "NO_SPACE", e[e.NO_NEWLINE = 2] = "NO_NEWLINE", e[e.NEWLINE = 3] = "NEWLINE", e[e.MANDATORY_NEWLINE = 4] = "MANDATORY_NEWLINE", e[e.INDENT = 5] = "INDENT", e[e.SINGLE_INDENT = 6] = "SINGLE_INDENT";
 })(a = a || (a = {}));
-class xT {
+class vT {
   constructor(E) {
     this.indentation = E, this.items = [];
   }
@@ -20675,7 +20676,7 @@ function HT(e) {
   return ge(e) || e === o.RESERVED_CLAUSE || e === o.RESERVED_SELECT || e === o.RESERVED_SET_OPERATION || e === o.RESERVED_JOIN || e === o.LIMIT;
 }
 const YE = "top-level", NN = "block-level";
-class vT {
+class xT {
   /**
    * @param {string} indent A string to indent with
    */
@@ -20723,9 +20724,9 @@ class vT {
       ;
   }
 }
-class ON extends xT {
+class ON extends vT {
   constructor(E) {
-    super(new vT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
+    super(new xT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
   }
   add(...E) {
     if (E.forEach((T) => this.addToLength(T)), this.length > this.expressionWidth)
@@ -21078,7 +21079,7 @@ class IN {
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new xT(new vT(Xt(this.cfg)))
+      layout: new vT(new xT(Xt(this.cfg)))
     }).format(E.children);
     return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? T.add(a.NEWLINE, ";") : T.add(a.NO_NEWLINE, ";")), T.toString();
   }

package/package.json

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