@zenstackhq/orm 3.4.3 → 3.4.5

package/dist/index.d.cts

@@ -604,8 +604,11 @@ type ClientOptions<Schema extends SchemaDef> = QueryOptions<Schema> & {
      */
     validateInput?: boolean;
     /**
-     * Whether to use compact alias names (e.g., "$t1", "$t2") when transforming ORM queries to SQL.
+     * Whether to use compact alias names (e.g., "$$t1", "$$t2") when transforming ORM queries to SQL.
      * Defaults to `true`.
+     *
+     * When set to `false`, original aliases are kept unless temporary aliases become too long for
+     * safe SQL identifier handling, in which case compact aliases are used as a fallback.
      */
     useCompactAliasNames?: boolean;
     /**
@@ -740,6 +743,12 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
     not(...args: Expression<SqlBool>[]): ExpressionWrapper<any, any, SqlBool>;
     fieldRef(model: string, field: string, modelAlias?: string, inlineComputedField?: boolean): any;
     protected canJoinWithoutNestedSelect(modelDef: ModelDef, payload: boolean | FindArgs<Schema, GetModels<Schema>, any, true>): boolean;
+    /**
+     * Builds an EXISTS expression from an inner SELECT query.
+     * Can be overridden by dialects that need special handling (e.g., MySQL wraps
+     * in a derived table to avoid "can't specify target table for update in FROM clause").
+     */
+    protected buildExistsExpression(innerQuery: SelectQueryBuilder<any, any, any>): Expression<SqlBool>;
     abstract get provider(): DataSourceProviderType;
     /**
      * Builds selection for a relation field.

package/dist/index.d.ts

@@ -604,8 +604,11 @@ type ClientOptions<Schema extends SchemaDef> = QueryOptions<Schema> & {
      */
     validateInput?: boolean;
     /**
-     * Whether to use compact alias names (e.g., "$t1", "$t2") when transforming ORM queries to SQL.
+     * Whether to use compact alias names (e.g., "$$t1", "$$t2") when transforming ORM queries to SQL.
      * Defaults to `true`.
+     *
+     * When set to `false`, original aliases are kept unless temporary aliases become too long for
+     * safe SQL identifier handling, in which case compact aliases are used as a fallback.
      */
     useCompactAliasNames?: boolean;
     /**
@@ -740,6 +743,12 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
     not(...args: Expression<SqlBool>[]): ExpressionWrapper<any, any, SqlBool>;
     fieldRef(model: string, field: string, modelAlias?: string, inlineComputedField?: boolean): any;
     protected canJoinWithoutNestedSelect(modelDef: ModelDef, payload: boolean | FindArgs<Schema, GetModels<Schema>, any, true>): boolean;
+    /**
+     * Builds an EXISTS expression from an inner SELECT query.
+     * Can be overridden by dialects that need special handling (e.g., MySQL wraps
+     * in a derived table to avoid "can't specify target table for update in FROM clause").
+     */
+    protected buildExistsExpression(innerQuery: SelectQueryBuilder<any, any, any>): Expression<SqlBool>;
     abstract get provider(): DataSourceProviderType;
     /**
      * Builds selection for a relation field.

package/dist/index.js

@@ -931,21 +931,22 @@ var BaseCrudDialect = class {
       if (!subPayload) {
         continue;
       }
-      const countSelect = /* @__PURE__ */ __name((negate) => {
+      const existsSelect = /* @__PURE__ */ __name((negate) => {
         const filter = this.buildFilter(relationModel, relationFilterSelectAlias, subPayload);
-        return this.eb.selectFrom(this.buildSelectModel(relationModel, relationFilterSelectAlias).select(() => this.eb.fn.count(this.eb.lit(1)).as("$count")).where(buildPkFkWhereRefs(this.eb)).where(() => negate ? this.eb.not(filter) : filter).as("$sub")).select("$count");
-      }, "countSelect");
+        const innerQuery = this.buildSelectModel(relationModel, relationFilterSelectAlias).select(this.eb.lit(1).as("_")).where(buildPkFkWhereRefs(this.eb)).where(() => negate ? this.eb.not(filter) : filter);
+        return this.buildExistsExpression(innerQuery);
+      }, "existsSelect");
       switch (key) {
         case "some": {
-          result = this.and(result, this.eb(countSelect(false), ">", 0));
+          result = this.and(result, existsSelect(false));
           break;
         }
         case "every": {
-          result = this.and(result, this.eb(countSelect(true), "=", 0));
+          result = this.and(result, this.eb.not(existsSelect(true)));
           break;
         }
         case "none": {
-          result = this.and(result, this.eb(countSelect(false), "=", 0));
+          result = this.and(result, this.eb.not(existsSelect(false)));
           break;
         }
       }
@@ -1562,6 +1563,15 @@ var BaseCrudDialect = class {
     }
     return true;
   }
+  // #endregion
+  /**
+   * Builds an EXISTS expression from an inner SELECT query.
+   * Can be overridden by dialects that need special handling (e.g., MySQL wraps
+   * in a derived table to avoid "can't specify target table for update in FROM clause").
+   */
+  buildExistsExpression(innerQuery) {
+    return this.eb.exists(innerQuery);
+  }
 };
 
 // src/client/crud/dialects/lateral-join-dialect-base.ts
@@ -1784,6 +1794,9 @@ var MySqlCrudDialect = class extends LateralJoinDialectBase {
   }
   // #endregion
   // #region other overrides
+  buildExistsExpression(innerQuery) {
+    return this.eb.exists(this.eb.selectFrom(innerQuery.as("$exists_sub")).select(this.eb.lit(1).as("_")));
+  }
   buildArrayAgg(arg) {
     return this.eb.fn.coalesce(sql2`JSON_ARRAYAGG(${arg})`, sql2`JSON_ARRAY()`);
   }
@@ -7439,20 +7452,45 @@ var TempAliasTransformer = class extends OperationNodeTransformer2 {
     __name(this, "TempAliasTransformer");
   }
   aliasMap = /* @__PURE__ */ new Map();
+  textEncoder = new TextEncoder();
+  mode;
+  maxIdentifierLength;
+  constructor(options = {}) {
+    super();
+    this.mode = options.mode ?? "alwaysCompact";
+    const maxIdentifierLength = options.maxIdentifierLength ?? 63;
+    if (!Number.isFinite(maxIdentifierLength) || !Number.isInteger(maxIdentifierLength) || maxIdentifierLength <= 0) {
+      throw new RangeError("maxIdentifierLength must be a positive integer");
+    }
+    this.maxIdentifierLength = maxIdentifierLength;
+  }
   run(node) {
     this.aliasMap.clear();
     return this.transformNode(node);
   }
   transformIdentifier(node, queryId) {
-    if (node.name.startsWith(TEMP_ALIAS_PREFIX)) {
+    if (!node.name.startsWith(TEMP_ALIAS_PREFIX)) {
+      return super.transformIdentifier(node, queryId);
+    }
+    let shouldCompact = false;
+    if (this.mode === "alwaysCompact") {
+      shouldCompact = true;
+    } else {
+      const aliasByteLength = this.textEncoder.encode(node.name).length;
+      if (aliasByteLength > this.maxIdentifierLength) {
+        shouldCompact = true;
+      }
+    }
+    if (shouldCompact) {
       let mapped = this.aliasMap.get(node.name);
       if (!mapped) {
         mapped = `$$t${this.aliasMap.size + 1}`;
         this.aliasMap.set(node.name, mapped);
       }
       return IdentifierNode2.create(mapped);
+    } else {
+      return super.transformIdentifier(node, queryId);
     }
-    return super.transformIdentifier(node, queryId);
   }
 };
 
@@ -7842,10 +7880,9 @@ In such cases, ZenStack cannot reliably determine the IDs of the mutated entitie
     return this.nameMapper?.transformNode(query) ?? query;
   }
   processTempAlias(query) {
-    if (this.options.useCompactAliasNames === false) {
-      return query;
-    }
-    return new TempAliasTransformer().run(query);
+    return new TempAliasTransformer({
+      mode: this.options.useCompactAliasNames === false ? "compactLongNames" : "alwaysCompact"
+    }).run(query);
   }
   createClientForConnection(connection, inTx) {
     const innerExecutor = this.withConnectionProvider(new SingleConnectionProvider(connection));
@@ -8128,6 +8165,9 @@ var SchemaDbPusher = class {
       }
       for (const field of Object.values(model.fields)) {
         if (field.relation && field.relation.fields && field.relation.references) {
+          if (field.type === model.name) {
+            continue;
+          }
           const targetModel = requireModel(this.schema, field.type);
           graph.push([
             model,