@zenstackhq/orm 3.4.4 → 3.4.6

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import * as _zenstackhq_schema from '@zenstackhq/schema';
 import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, GetModel, ProcedureDef, BuiltinType, FieldDef, ModelDef, DataSourceProviderType, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, GetTypeDefFieldType, TypeDefFieldIsArray, UpdatedAtInfo, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, IsDelegateModel, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, BindingExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
 import * as kysely from 'kysely';
-import { Kysely, OperationNodeVisitor, OperationNode, SelectQueryNode, SelectionNode, ColumnNode, AliasNode, TableNode, FromNode, ReferenceNode, AndNode, OrNode, ValueListNode, ParensNode, JoinNode, RawNode, WhereNode, InsertQueryNode, DeleteQueryNode, ReturningNode, CreateTableNode, AddColumnNode, ColumnDefinitionNode, DropTableNode, OrderByNode, OrderByItemNode, GroupByNode, GroupByItemNode, UpdateQueryNode, ColumnUpdateNode, LimitNode, OffsetNode, OnConflictNode, OnDuplicateKeyNode, CheckConstraintNode, DataTypeNode, SelectAllNode, IdentifierNode, SchemableIdentifierNode, ValueNode, PrimitiveValueListNode, OperatorNode, CreateIndexNode, DropIndexNode, ListNode, PrimaryKeyConstraintNode, UniqueConstraintNode, ReferencesNode, WithNode, CommonTableExpressionNode, CommonTableExpressionNameNode, HavingNode, CreateSchemaNode, DropSchemaNode, AlterTableNode, DropColumnNode, RenameColumnNode, AlterColumnNode, ModifyColumnNode, AddConstraintNode, DropConstraintNode, ForeignKeyConstraintNode, CreateViewNode, DropViewNode, GeneratedNode, DefaultValueNode, OnNode, ValuesNode, SelectModifierNode, CreateTypeNode, DropTypeNode, ExplainNode, DefaultInsertValueNode, AggregateFunctionNode, OverNode, PartitionByNode, PartitionByItemNode, SetOperationNode, BinaryOperationNode, UnaryOperationNode, UsingNode, FunctionNode, CaseNode, WhenNode, JSONReferenceNode, JSONPathNode, JSONPathLegNode, JSONOperatorChainNode, TupleNode, MergeQueryNode, MatchedNode, AddIndexNode, CastNode, FetchNode, TopNode, OutputNode, RenameConstraintNode, RefreshMaterializedViewNode, OrActionNode, CollateNode, Generated, QueryId, RootOperationNode, QueryResult, UnknownRow, Dialect, ExpressionBuilder, Expression, KyselyConfig, OperandExpression, SelectQueryBuilder, SqlBool, ExpressionWrapper, AliasableExpression } from 'kysely';
+import { Kysely, OperationNodeVisitor, OperationNode, SelectQueryNode, SelectionNode, ColumnNode, AliasNode, TableNode, FromNode, ReferenceNode, AndNode, OrNode, ValueListNode, ParensNode, JoinNode, RawNode, WhereNode, InsertQueryNode, DeleteQueryNode, ReturningNode, CreateTableNode, AddColumnNode, ColumnDefinitionNode, DropTableNode, OrderByNode, OrderByItemNode, GroupByNode, GroupByItemNode, UpdateQueryNode, ColumnUpdateNode, LimitNode, OffsetNode, OnConflictNode, OnDuplicateKeyNode, CheckConstraintNode, DataTypeNode, SelectAllNode, IdentifierNode, SchemableIdentifierNode, ValueNode, PrimitiveValueListNode, OperatorNode, CreateIndexNode, DropIndexNode, ListNode, PrimaryKeyConstraintNode, UniqueConstraintNode, ReferencesNode, WithNode, CommonTableExpressionNode, CommonTableExpressionNameNode, HavingNode, CreateSchemaNode, DropSchemaNode, AlterTableNode, DropColumnNode, RenameColumnNode, AlterColumnNode, ModifyColumnNode, AddConstraintNode, DropConstraintNode, ForeignKeyConstraintNode, CreateViewNode, DropViewNode, GeneratedNode, DefaultValueNode, OnNode, ValuesNode, SelectModifierNode, CreateTypeNode, DropTypeNode, ExplainNode, DefaultInsertValueNode, AggregateFunctionNode, OverNode, PartitionByNode, PartitionByItemNode, SetOperationNode, BinaryOperationNode, UnaryOperationNode, UsingNode, FunctionNode, CaseNode, WhenNode, JSONReferenceNode, JSONPathNode, JSONPathLegNode, JSONOperatorChainNode, TupleNode, MergeQueryNode, MatchedNode, AddIndexNode, CastNode, FetchNode, TopNode, OutputNode, RenameConstraintNode, RefreshMaterializedViewNode, OrActionNode, CollateNode, Generated, QueryId, RootOperationNode, QueryResult, UnknownRow, Dialect, ExpressionBuilder, Expression, KyselyConfig, OperandExpression, SelectQueryBuilder, SqlBool, AliasableExpression, ExpressionWrapper } from 'kysely';
 import Decimal from 'decimal.js';
 import { ZodType } from 'zod';
 
@@ -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;
     /**
@@ -710,8 +713,8 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
     private buildTypedJsonArrayFilter;
     private buildTypeJsonNonArrayFilter;
     private buildJsonValueFilterClause;
-    protected buildJsonEqualityFilter(lhs: Expression<any>, rhs: unknown): ExpressionWrapper<any, any, SqlBool>;
-    private buildLiteralFilter;
+    protected buildJsonEqualityFilter(lhs: Expression<any>, rhs: unknown): Expression<SqlBool>;
+    private buildValueFilter;
     private buildStandardFilter;
     private buildStringFilter;
     private buildJsonStringFilter;
@@ -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

@@ -1,7 +1,7 @@
 import * as _zenstackhq_schema from '@zenstackhq/schema';
 import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, GetModel, ProcedureDef, BuiltinType, FieldDef, ModelDef, DataSourceProviderType, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, GetTypeDefFieldType, TypeDefFieldIsArray, UpdatedAtInfo, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, IsDelegateModel, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, BindingExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
 import * as kysely from 'kysely';
-import { Kysely, OperationNodeVisitor, OperationNode, SelectQueryNode, SelectionNode, ColumnNode, AliasNode, TableNode, FromNode, ReferenceNode, AndNode, OrNode, ValueListNode, ParensNode, JoinNode, RawNode, WhereNode, InsertQueryNode, DeleteQueryNode, ReturningNode, CreateTableNode, AddColumnNode, ColumnDefinitionNode, DropTableNode, OrderByNode, OrderByItemNode, GroupByNode, GroupByItemNode, UpdateQueryNode, ColumnUpdateNode, LimitNode, OffsetNode, OnConflictNode, OnDuplicateKeyNode, CheckConstraintNode, DataTypeNode, SelectAllNode, IdentifierNode, SchemableIdentifierNode, ValueNode, PrimitiveValueListNode, OperatorNode, CreateIndexNode, DropIndexNode, ListNode, PrimaryKeyConstraintNode, UniqueConstraintNode, ReferencesNode, WithNode, CommonTableExpressionNode, CommonTableExpressionNameNode, HavingNode, CreateSchemaNode, DropSchemaNode, AlterTableNode, DropColumnNode, RenameColumnNode, AlterColumnNode, ModifyColumnNode, AddConstraintNode, DropConstraintNode, ForeignKeyConstraintNode, CreateViewNode, DropViewNode, GeneratedNode, DefaultValueNode, OnNode, ValuesNode, SelectModifierNode, CreateTypeNode, DropTypeNode, ExplainNode, DefaultInsertValueNode, AggregateFunctionNode, OverNode, PartitionByNode, PartitionByItemNode, SetOperationNode, BinaryOperationNode, UnaryOperationNode, UsingNode, FunctionNode, CaseNode, WhenNode, JSONReferenceNode, JSONPathNode, JSONPathLegNode, JSONOperatorChainNode, TupleNode, MergeQueryNode, MatchedNode, AddIndexNode, CastNode, FetchNode, TopNode, OutputNode, RenameConstraintNode, RefreshMaterializedViewNode, OrActionNode, CollateNode, Generated, QueryId, RootOperationNode, QueryResult, UnknownRow, Dialect, ExpressionBuilder, Expression, KyselyConfig, OperandExpression, SelectQueryBuilder, SqlBool, ExpressionWrapper, AliasableExpression } from 'kysely';
+import { Kysely, OperationNodeVisitor, OperationNode, SelectQueryNode, SelectionNode, ColumnNode, AliasNode, TableNode, FromNode, ReferenceNode, AndNode, OrNode, ValueListNode, ParensNode, JoinNode, RawNode, WhereNode, InsertQueryNode, DeleteQueryNode, ReturningNode, CreateTableNode, AddColumnNode, ColumnDefinitionNode, DropTableNode, OrderByNode, OrderByItemNode, GroupByNode, GroupByItemNode, UpdateQueryNode, ColumnUpdateNode, LimitNode, OffsetNode, OnConflictNode, OnDuplicateKeyNode, CheckConstraintNode, DataTypeNode, SelectAllNode, IdentifierNode, SchemableIdentifierNode, ValueNode, PrimitiveValueListNode, OperatorNode, CreateIndexNode, DropIndexNode, ListNode, PrimaryKeyConstraintNode, UniqueConstraintNode, ReferencesNode, WithNode, CommonTableExpressionNode, CommonTableExpressionNameNode, HavingNode, CreateSchemaNode, DropSchemaNode, AlterTableNode, DropColumnNode, RenameColumnNode, AlterColumnNode, ModifyColumnNode, AddConstraintNode, DropConstraintNode, ForeignKeyConstraintNode, CreateViewNode, DropViewNode, GeneratedNode, DefaultValueNode, OnNode, ValuesNode, SelectModifierNode, CreateTypeNode, DropTypeNode, ExplainNode, DefaultInsertValueNode, AggregateFunctionNode, OverNode, PartitionByNode, PartitionByItemNode, SetOperationNode, BinaryOperationNode, UnaryOperationNode, UsingNode, FunctionNode, CaseNode, WhenNode, JSONReferenceNode, JSONPathNode, JSONPathLegNode, JSONOperatorChainNode, TupleNode, MergeQueryNode, MatchedNode, AddIndexNode, CastNode, FetchNode, TopNode, OutputNode, RenameConstraintNode, RefreshMaterializedViewNode, OrActionNode, CollateNode, Generated, QueryId, RootOperationNode, QueryResult, UnknownRow, Dialect, ExpressionBuilder, Expression, KyselyConfig, OperandExpression, SelectQueryBuilder, SqlBool, AliasableExpression, ExpressionWrapper } from 'kysely';
 import Decimal from 'decimal.js';
 import { ZodType } from 'zod';
 
@@ -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;
     /**
@@ -710,8 +713,8 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
     private buildTypedJsonArrayFilter;
     private buildTypeJsonNonArrayFilter;
     private buildJsonValueFilterClause;
-    protected buildJsonEqualityFilter(lhs: Expression<any>, rhs: unknown): ExpressionWrapper<any, any, SqlBool>;
-    private buildLiteralFilter;
+    protected buildJsonEqualityFilter(lhs: Expression<any>, rhs: unknown): Expression<SqlBool>;
+    private buildValueFilter;
     private buildStandardFilter;
     private buildStringFilter;
     private buildJsonStringFilter;
@@ -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;
         }
       }
@@ -1170,16 +1171,22 @@ var BaseCrudDialect = class {
     }
   }
   buildJsonEqualityFilter(lhs, rhs) {
-    return this.buildLiteralFilter(lhs, "Json", rhs);
+    return this.buildValueFilter(lhs, "Json", rhs);
   }
-  buildLiteralFilter(lhs, type, rhs) {
-    return this.eb(lhs, "=", rhs !== null && rhs !== void 0 ? this.transformInput(rhs, type, false) : rhs);
+  buildValueFilter(lhs, type, rhs) {
+    if (rhs === void 0) {
+      return this.true();
+    }
+    if (rhs === null) {
+      return this.eb(lhs, "is", null);
+    }
+    return this.eb(lhs, "=", this.transformInput(rhs, type, false));
   }
   buildStandardFilter(type, payload, lhs, getRhs, recurse, throwIfInvalid = false, onlyForKeys = void 0, excludeKeys = []) {
     if (payload === null || !isPlainObject(payload)) {
       return {
         conditions: [
-          this.buildLiteralFilter(lhs, type, payload)
+          this.buildValueFilter(lhs, type, payload)
         ],
         consumedKeys: []
       };
@@ -1562,6 +1569,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 +1800,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()`);
   }
@@ -1921,7 +1940,10 @@ var PostgresCrudDialect = class _PostgresCrudDialect extends LateralJoinDialectB
   overrideTypeParsers() {
     if (this.options.fixPostgresTimezone !== false && !_PostgresCrudDialect.typeParserOverrideApplied) {
       _PostgresCrudDialect.typeParserOverrideApplied = true;
-      import("pg").then((pg) => {
+      import(
+        /* webpackIgnore: true */
+        "pg"
+      ).then((pg) => {
         pg.types.setTypeParser(pg.types.builtins.TIMESTAMP, (value) => {
           if (typeof value !== "string") {
             return value;
@@ -3124,7 +3146,7 @@ var BaseOperationHandler = class {
         const length = firstArgVal;
         const generated = typeof length === "number" ? nanoid(length) : nanoid();
         return this.formatGeneratedValue(generated, defaultValue.args?.[1]);
-      }).with("ulid", () => this.formatGeneratedValue(ulid(), defaultValue.args?.[0])).otherwise(() => void 0);
+      }).with("ulid", () => this.formatGeneratedValue(ulid(), defaultValue.args?.[0])).with("now", () => /* @__PURE__ */ new Date()).otherwise(() => void 0);
     } else if (schema_exports.ExpressionUtils.isMember(defaultValue) && schema_exports.ExpressionUtils.isCall(defaultValue.receiver) && defaultValue.receiver.function === "auth") {
       let val = this.client.$auth;
       for (const member of defaultValue.members) {
@@ -7439,20 +7461,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 +7889,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));
@@ -8027,7 +8073,7 @@ var isEmpty = /* @__PURE__ */ __name((eb, args, { dialect }) => {
   }
   return eb(dialect.buildArrayLength(field), "=", sql6.lit(0));
 }, "isEmpty");
-var now = /* @__PURE__ */ __name(() => sql6.raw("CURRENT_TIMESTAMP"), "now");
+var now = /* @__PURE__ */ __name((_eb, _args, context) => match16(context.dialect.provider).with("sqlite", () => sql6.raw("strftime('%Y-%m-%dT%H:%M:%fZ')")).with("mysql", () => sql6.raw("CONCAT(SUBSTRING(DATE_FORMAT(UTC_TIMESTAMP(3), '%Y-%m-%dT%H:%i:%s.%f'), 1, 23), '+00:00')")).with("postgresql", () => sql6.raw("CURRENT_TIMESTAMP")).exhaustive(), "now");
 var currentModel = /* @__PURE__ */ __name((_eb, args, { model }) => {
   let result = model;
   const [casing] = args;