@zenstackhq/runtime 3.0.0-beta.10 → 3.0.0-beta.11

package/dist/index.d.cts

@@ -9,7 +9,7 @@ import { ExpressionBuilder, SelectQueryBuilder, Expression, SqlBool, ExpressionW
 /**
  * Client API methods that are not supported in transactions.
  */
-declare const TRANSACTION_UNSUPPORTED_METHODS: readonly ["$transaction", "$disconnect", "$use"];
+declare const TRANSACTION_UNSUPPORTED_METHODS: readonly ["$transaction", "$connect", "$disconnect", "$use"];
 /**
  * Logical combinators used in filters.
  */
@@ -47,7 +47,7 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
     private buildDateTimeFilter;
     private buildBytesFilter;
     private buildEnumFilter;
-    buildOrderBy(query: SelectQueryBuilder<any, any, any>, model: string, modelAlias: string, orderBy: OrArray<OrderBy<Schema, GetModels<Schema>, boolean, boolean>> | undefined, useDefaultIfEmpty: boolean, negated: boolean): SelectQueryBuilder<any, any, any>;
+    buildOrderBy(query: SelectQueryBuilder<any, any, any>, model: string, modelAlias: string, orderBy: OrArray<OrderBy<Schema, GetModels<Schema>, boolean, boolean>> | undefined, negated: boolean): SelectQueryBuilder<any, any, any>;
     buildSelectAllFields(model: string, query: SelectQueryBuilder<any, any, any>, omit: Record<string, boolean | undefined> | undefined, modelAlias: string): SelectQueryBuilder<any, any, any>;
     protected buildModelSelect(model: GetModels<Schema>, subQueryAlias: string, payload: true | FindArgs<Schema, GetModels<Schema>, true>, selectAllFields: boolean): SelectQueryBuilder<any, any, {}>;
     buildSelectField(query: SelectQueryBuilder<any, any, any>, model: string, modelAlias: string, field: string): SelectQueryBuilder<any, any, any>;
@@ -61,7 +61,7 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
     and(...args: Expression<SqlBool>[]): Expression<SqlBool>;
     or(...args: Expression<SqlBool>[]): Expression<SqlBool>;
     not(...args: Expression<SqlBool>[]): ExpressionWrapper<any, any, SqlBool>;
-    fieldRef(model: string, field: string, modelAlias?: string, inlineComputedField?: boolean): ExpressionWrapper<any, any, unknown>;
+    fieldRef(model: string, field: string, modelAlias?: string, inlineComputedField?: boolean): any;
     protected canJoinWithoutNestedSelect(modelDef: ModelDef, payload: boolean | FindArgs<Schema, GetModels<Schema>, true>): boolean;
     abstract get provider(): DataSourceProviderType;
     /**
@@ -452,7 +452,11 @@ type ClientContract<Schema extends SchemaDef> = {
      */
     $unuseAll(): ClientContract<Schema>;
     /**
-     * Disconnects the underlying Kysely instance from the database.
+     * Eagerly connects to the database.
+     */
+    $connect(): Promise<void>;
+    /**
+     * Explicitly disconnects from the database.
      */
     $disconnect(): Promise<void>;
     /**
@@ -1106,7 +1110,6 @@ declare function getUniqueFields(schema: SchemaDef, model: string): ({
     defs: Record<string, FieldDef>;
 })[];
 declare function getIdValues(schema: SchemaDef, model: string, data: any): Record<string, any>;
-declare function buildFieldRef<Schema extends SchemaDef>(schema: Schema, model: string, field: string, options: ClientOptions<Schema>, eb: ExpressionBuilder<any, any>, modelAlias?: string, inlineComputedField?: boolean): ExpressionWrapper<any, any, unknown>;
 declare function fieldHasDefaultValue(fieldDef: FieldDef): boolean | undefined;
 declare function isEnum(schema: SchemaDef, type: string): boolean;
 declare function getEnum(schema: SchemaDef, type: string): _zenstackhq_sdk_schema.EnumDef | undefined;
@@ -1153,7 +1156,6 @@ declare function extractModelName(node: OperationNode): string | undefined;
 declare function extractFieldName(node: OperationNode): string | undefined;
 
 declare const queryUtils_aggregate: typeof aggregate;
-declare const queryUtils_buildFieldRef: typeof buildFieldRef;
 declare const queryUtils_buildJoinPairs: typeof buildJoinPairs;
 declare const queryUtils_ensureArray: typeof ensureArray;
 declare const queryUtils_extractFieldName: typeof extractFieldName;
@@ -1185,7 +1187,7 @@ declare const queryUtils_requireModel: typeof requireModel;
 declare const queryUtils_safeJSONStringify: typeof safeJSONStringify;
 declare const queryUtils_stripAlias: typeof stripAlias;
 declare namespace queryUtils {
-  export { queryUtils_aggregate as aggregate, queryUtils_buildFieldRef as buildFieldRef, queryUtils_buildJoinPairs as buildJoinPairs, queryUtils_ensureArray as ensureArray, queryUtils_extractFieldName as extractFieldName, queryUtils_extractIdFields as extractIdFields, queryUtils_extractModelName as extractModelName, queryUtils_fieldHasDefaultValue as fieldHasDefaultValue, queryUtils_flattenCompoundUniqueFilters as flattenCompoundUniqueFilters, queryUtils_getDelegateDescendantModels as getDelegateDescendantModels, queryUtils_getDiscriminatorField as getDiscriminatorField, queryUtils_getEnum as getEnum, queryUtils_getField as getField, queryUtils_getIdFields as getIdFields, queryUtils_getIdValues as getIdValues, queryUtils_getManyToManyRelation as getManyToManyRelation, queryUtils_getModel as getModel, queryUtils_getRelationForeignKeyFieldPairs as getRelationForeignKeyFieldPairs, queryUtils_getTypeDef as getTypeDef, queryUtils_getUniqueFields as getUniqueFields, queryUtils_hasModel as hasModel, queryUtils_isEnum as isEnum, queryUtils_isForeignKeyField as isForeignKeyField, queryUtils_isInheritedField as isInheritedField, queryUtils_isRelationField as isRelationField, queryUtils_isScalarField as isScalarField, queryUtils_makeDefaultOrderBy as makeDefaultOrderBy, queryUtils_requireField as requireField, queryUtils_requireIdFields as requireIdFields, queryUtils_requireModel as requireModel, queryUtils_safeJSONStringify as safeJSONStringify, queryUtils_stripAlias as stripAlias };
+  export { queryUtils_aggregate as aggregate, queryUtils_buildJoinPairs as buildJoinPairs, queryUtils_ensureArray as ensureArray, queryUtils_extractFieldName as extractFieldName, queryUtils_extractIdFields as extractIdFields, queryUtils_extractModelName as extractModelName, queryUtils_fieldHasDefaultValue as fieldHasDefaultValue, queryUtils_flattenCompoundUniqueFilters as flattenCompoundUniqueFilters, queryUtils_getDelegateDescendantModels as getDelegateDescendantModels, queryUtils_getDiscriminatorField as getDiscriminatorField, queryUtils_getEnum as getEnum, queryUtils_getField as getField, queryUtils_getIdFields as getIdFields, queryUtils_getIdValues as getIdValues, queryUtils_getManyToManyRelation as getManyToManyRelation, queryUtils_getModel as getModel, queryUtils_getRelationForeignKeyFieldPairs as getRelationForeignKeyFieldPairs, queryUtils_getTypeDef as getTypeDef, queryUtils_getUniqueFields as getUniqueFields, queryUtils_hasModel as hasModel, queryUtils_isEnum as isEnum, queryUtils_isForeignKeyField as isForeignKeyField, queryUtils_isInheritedField as isInheritedField, queryUtils_isRelationField as isRelationField, queryUtils_isScalarField as isScalarField, queryUtils_makeDefaultOrderBy as makeDefaultOrderBy, queryUtils_requireField as requireField, queryUtils_requireIdFields as requireIdFields, queryUtils_requireModel as requireModel, queryUtils_safeJSONStringify as safeJSONStringify, queryUtils_stripAlias as stripAlias };
 }
 
 declare class DefaultOperationNodeVisitor extends OperationNodeVisitor {

package/dist/index.d.ts

@@ -9,7 +9,7 @@ import { ExpressionBuilder, SelectQueryBuilder, Expression, SqlBool, ExpressionW
 /**
  * Client API methods that are not supported in transactions.
  */
-declare const TRANSACTION_UNSUPPORTED_METHODS: readonly ["$transaction", "$disconnect", "$use"];
+declare const TRANSACTION_UNSUPPORTED_METHODS: readonly ["$transaction", "$connect", "$disconnect", "$use"];
 /**
  * Logical combinators used in filters.
  */
@@ -47,7 +47,7 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
     private buildDateTimeFilter;
     private buildBytesFilter;
     private buildEnumFilter;
-    buildOrderBy(query: SelectQueryBuilder<any, any, any>, model: string, modelAlias: string, orderBy: OrArray<OrderBy<Schema, GetModels<Schema>, boolean, boolean>> | undefined, useDefaultIfEmpty: boolean, negated: boolean): SelectQueryBuilder<any, any, any>;
+    buildOrderBy(query: SelectQueryBuilder<any, any, any>, model: string, modelAlias: string, orderBy: OrArray<OrderBy<Schema, GetModels<Schema>, boolean, boolean>> | undefined, negated: boolean): SelectQueryBuilder<any, any, any>;
     buildSelectAllFields(model: string, query: SelectQueryBuilder<any, any, any>, omit: Record<string, boolean | undefined> | undefined, modelAlias: string): SelectQueryBuilder<any, any, any>;
     protected buildModelSelect(model: GetModels<Schema>, subQueryAlias: string, payload: true | FindArgs<Schema, GetModels<Schema>, true>, selectAllFields: boolean): SelectQueryBuilder<any, any, {}>;
     buildSelectField(query: SelectQueryBuilder<any, any, any>, model: string, modelAlias: string, field: string): SelectQueryBuilder<any, any, any>;
@@ -61,7 +61,7 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
     and(...args: Expression<SqlBool>[]): Expression<SqlBool>;
     or(...args: Expression<SqlBool>[]): Expression<SqlBool>;
     not(...args: Expression<SqlBool>[]): ExpressionWrapper<any, any, SqlBool>;
-    fieldRef(model: string, field: string, modelAlias?: string, inlineComputedField?: boolean): ExpressionWrapper<any, any, unknown>;
+    fieldRef(model: string, field: string, modelAlias?: string, inlineComputedField?: boolean): any;
     protected canJoinWithoutNestedSelect(modelDef: ModelDef, payload: boolean | FindArgs<Schema, GetModels<Schema>, true>): boolean;
     abstract get provider(): DataSourceProviderType;
     /**
@@ -452,7 +452,11 @@ type ClientContract<Schema extends SchemaDef> = {
      */
     $unuseAll(): ClientContract<Schema>;
     /**
-     * Disconnects the underlying Kysely instance from the database.
+     * Eagerly connects to the database.
+     */
+    $connect(): Promise<void>;
+    /**
+     * Explicitly disconnects from the database.
      */
     $disconnect(): Promise<void>;
     /**
@@ -1106,7 +1110,6 @@ declare function getUniqueFields(schema: SchemaDef, model: string): ({
     defs: Record<string, FieldDef>;
 })[];
 declare function getIdValues(schema: SchemaDef, model: string, data: any): Record<string, any>;
-declare function buildFieldRef<Schema extends SchemaDef>(schema: Schema, model: string, field: string, options: ClientOptions<Schema>, eb: ExpressionBuilder<any, any>, modelAlias?: string, inlineComputedField?: boolean): ExpressionWrapper<any, any, unknown>;
 declare function fieldHasDefaultValue(fieldDef: FieldDef): boolean | undefined;
 declare function isEnum(schema: SchemaDef, type: string): boolean;
 declare function getEnum(schema: SchemaDef, type: string): _zenstackhq_sdk_schema.EnumDef | undefined;
@@ -1153,7 +1156,6 @@ declare function extractModelName(node: OperationNode): string | undefined;
 declare function extractFieldName(node: OperationNode): string | undefined;
 
 declare const queryUtils_aggregate: typeof aggregate;
-declare const queryUtils_buildFieldRef: typeof buildFieldRef;
 declare const queryUtils_buildJoinPairs: typeof buildJoinPairs;
 declare const queryUtils_ensureArray: typeof ensureArray;
 declare const queryUtils_extractFieldName: typeof extractFieldName;
@@ -1185,7 +1187,7 @@ declare const queryUtils_requireModel: typeof requireModel;
 declare const queryUtils_safeJSONStringify: typeof safeJSONStringify;
 declare const queryUtils_stripAlias: typeof stripAlias;
 declare namespace queryUtils {
-  export { queryUtils_aggregate as aggregate, queryUtils_buildFieldRef as buildFieldRef, queryUtils_buildJoinPairs as buildJoinPairs, queryUtils_ensureArray as ensureArray, queryUtils_extractFieldName as extractFieldName, queryUtils_extractIdFields as extractIdFields, queryUtils_extractModelName as extractModelName, queryUtils_fieldHasDefaultValue as fieldHasDefaultValue, queryUtils_flattenCompoundUniqueFilters as flattenCompoundUniqueFilters, queryUtils_getDelegateDescendantModels as getDelegateDescendantModels, queryUtils_getDiscriminatorField as getDiscriminatorField, queryUtils_getEnum as getEnum, queryUtils_getField as getField, queryUtils_getIdFields as getIdFields, queryUtils_getIdValues as getIdValues, queryUtils_getManyToManyRelation as getManyToManyRelation, queryUtils_getModel as getModel, queryUtils_getRelationForeignKeyFieldPairs as getRelationForeignKeyFieldPairs, queryUtils_getTypeDef as getTypeDef, queryUtils_getUniqueFields as getUniqueFields, queryUtils_hasModel as hasModel, queryUtils_isEnum as isEnum, queryUtils_isForeignKeyField as isForeignKeyField, queryUtils_isInheritedField as isInheritedField, queryUtils_isRelationField as isRelationField, queryUtils_isScalarField as isScalarField, queryUtils_makeDefaultOrderBy as makeDefaultOrderBy, queryUtils_requireField as requireField, queryUtils_requireIdFields as requireIdFields, queryUtils_requireModel as requireModel, queryUtils_safeJSONStringify as safeJSONStringify, queryUtils_stripAlias as stripAlias };
+  export { queryUtils_aggregate as aggregate, queryUtils_buildJoinPairs as buildJoinPairs, queryUtils_ensureArray as ensureArray, queryUtils_extractFieldName as extractFieldName, queryUtils_extractIdFields as extractIdFields, queryUtils_extractModelName as extractModelName, queryUtils_fieldHasDefaultValue as fieldHasDefaultValue, queryUtils_flattenCompoundUniqueFilters as flattenCompoundUniqueFilters, queryUtils_getDelegateDescendantModels as getDelegateDescendantModels, queryUtils_getDiscriminatorField as getDiscriminatorField, queryUtils_getEnum as getEnum, queryUtils_getField as getField, queryUtils_getIdFields as getIdFields, queryUtils_getIdValues as getIdValues, queryUtils_getManyToManyRelation as getManyToManyRelation, queryUtils_getModel as getModel, queryUtils_getRelationForeignKeyFieldPairs as getRelationForeignKeyFieldPairs, queryUtils_getTypeDef as getTypeDef, queryUtils_getUniqueFields as getUniqueFields, queryUtils_hasModel as hasModel, queryUtils_isEnum as isEnum, queryUtils_isForeignKeyField as isForeignKeyField, queryUtils_isInheritedField as isInheritedField, queryUtils_isRelationField as isRelationField, queryUtils_isScalarField as isScalarField, queryUtils_makeDefaultOrderBy as makeDefaultOrderBy, queryUtils_requireField as requireField, queryUtils_requireIdFields as requireIdFields, queryUtils_requireModel as requireModel, queryUtils_safeJSONStringify as safeJSONStringify, queryUtils_stripAlias as stripAlias };
 }
 
 declare class DefaultOperationNodeVisitor extends OperationNodeVisitor {

package/dist/index.js

@@ -16,7 +16,6 @@ import { match as match7 } from "ts-pattern";
 var query_utils_exports = {};
 __export(query_utils_exports, {
   aggregate: () => aggregate,
-  buildFieldRef: () => buildFieldRef,
   buildJoinPairs: () => buildJoinPairs,
   ensureArray: () => ensureArray,
   extractFieldName: () => extractFieldName,
@@ -362,28 +361,6 @@ function getIdValues(schema, model, data) {
   }), {});
 }
 __name(getIdValues, "getIdValues");
-function buildFieldRef(schema, model, field, options, eb, modelAlias, inlineComputedField = true) {
-  const fieldDef = requireField(schema, model, field);
-  if (!fieldDef.computed) {
-    return eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
-  } else {
-    if (!inlineComputedField) {
-      return eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
-    }
-    let computer;
-    if ("computedFields" in options) {
-      const computedFields = options.computedFields;
-      computer = computedFields?.[model]?.[field];
-    }
-    if (!computer) {
-      throw new QueryError(`Computed field "${field}" implementation not provided for model "${model}"`);
-    }
-    return computer(eb, {
-      modelAlias
-    });
-  }
-}
-__name(buildFieldRef, "buildFieldRef");
 function fieldHasDefaultValue(fieldDef) {
   return fieldDef.default !== void 0 || fieldDef.updatedAt;
 }
@@ -735,7 +712,7 @@ var BaseCrudDialect = class {
       take = -take;
     }
     result = this.buildSkipTake(result, skip, take);
-    result = this.buildOrderBy(result, model, modelAlias, args.orderBy, skip !== void 0 || take !== void 0, negateOrderBy);
+    result = this.buildOrderBy(result, model, modelAlias, args.orderBy, negateOrderBy);
     if ("distinct" in args && args.distinct) {
       const distinct = ensureArray(args.distinct);
       if (this.supportsDistinctOn) {
@@ -1094,16 +1071,12 @@ var BaseCrudDialect = class {
     ]);
     return this.and(...conditions.conditions);
   }
-  buildOrderBy(query, model, modelAlias, orderBy, useDefaultIfEmpty, negated) {
+  buildOrderBy(query, model, modelAlias, orderBy, negated) {
     if (!orderBy) {
-      if (useDefaultIfEmpty) {
-        orderBy = makeDefaultOrderBy(this.schema, model);
-      } else {
-        return query;
-      }
+      return query;
     }
     let result = query;
-    const buildFieldRef2 = /* @__PURE__ */ __name((model2, field, modelAlias2) => {
+    const buildFieldRef = /* @__PURE__ */ __name((model2, field, modelAlias2) => {
       const fieldDef = requireField(this.schema, model2, field);
       return fieldDef.originModel ? this.fieldRef(fieldDef.originModel, field, fieldDef.originModel) : this.fieldRef(model2, field, modelAlias2);
     }, "buildFieldRef");
@@ -1122,7 +1095,7 @@ var BaseCrudDialect = class {
           invariant2(value && typeof value === "object", `invalid orderBy value for field "${field}"`);
           for (const [k, v] of Object.entries(value)) {
             invariant2(v === "asc" || v === "desc", `invalid orderBy value for field "${field}"`);
-            result = result.orderBy((eb) => aggregate(eb, buildFieldRef2(model, k, modelAlias), field), sql.raw(this.negateSort(v, negated)));
+            result = result.orderBy((eb) => aggregate(eb, buildFieldRef(model, k, modelAlias), field), sql.raw(this.negateSort(v, negated)));
           }
           continue;
         }
@@ -1131,7 +1104,7 @@ var BaseCrudDialect = class {
             invariant2(value && typeof value === "object", 'invalid orderBy value for field "_count"');
             for (const [k, v] of Object.entries(value)) {
               invariant2(v === "asc" || v === "desc", `invalid orderBy value for field "${field}"`);
-              result = result.orderBy((eb) => eb.fn.count(buildFieldRef2(model, k, modelAlias)), sql.raw(this.negateSort(v, negated)));
+              result = result.orderBy((eb) => eb.fn.count(buildFieldRef(model, k, modelAlias)), sql.raw(this.negateSort(v, negated)));
             }
             continue;
           }
@@ -1140,7 +1113,7 @@ var BaseCrudDialect = class {
         }
         const fieldDef = requireField(this.schema, model, field);
         if (!fieldDef.relation) {
-          const fieldRef = buildFieldRef2(model, field, modelAlias);
+          const fieldRef = buildFieldRef(model, field, modelAlias);
           if (value === "asc" || value === "desc") {
             result = result.orderBy(fieldRef, this.negateSort(value, negated));
           } else if (value && typeof value === "object" && "nulls" in value && "sort" in value && (value.sort === "asc" || value.sort === "desc") && (value.nulls === "first" || value.nulls === "last")) {
@@ -1169,7 +1142,7 @@ var BaseCrudDialect = class {
               const joinPairs = buildJoinPairs(this.schema, model, modelAlias, field, relationModel);
               return join.on((eb) => this.and(...joinPairs.map(([left, right]) => eb(this.eb.ref(left), "=", this.eb.ref(right)))));
             });
-            result = this.buildOrderBy(result, fieldDef.type, relationModel, value, false, negated);
+            result = this.buildOrderBy(result, fieldDef.type, relationModel, value, negated);
           }
         }
       }
@@ -1216,13 +1189,9 @@ var BaseCrudDialect = class {
   }
   buildSelectField(query, model, modelAlias, field) {
     const fieldDef = requireField(this.schema, model, field);
-    if (fieldDef.computed) {
-      return query.select(() => this.fieldRef(model, field, modelAlias).as(field));
-    } else if (!fieldDef.originModel) {
-      return query.select(this.eb.ref(`${modelAlias}.${field}`).as(field));
-    } else {
-      return this.buildSelectField(query, fieldDef.originModel, fieldDef.originModel, field);
-    }
+    const fieldModel = fieldDef.originModel ?? model;
+    const alias = fieldDef.originModel ?? modelAlias;
+    return query.select(() => this.fieldRef(fieldModel, field, alias).as(field));
   }
   buildDelegateJoin(thisModel, thisModelAlias, otherModelAlias, query) {
     const idFields = requireIdFields(this.schema, thisModel);
@@ -1311,7 +1280,25 @@ var BaseCrudDialect = class {
     return this.eb.not(this.and(...args));
   }
   fieldRef(model, field, modelAlias, inlineComputedField = true) {
-    return buildFieldRef(this.schema, model, field, this.options, this.eb, modelAlias, inlineComputedField);
+    const fieldDef = requireField(this.schema, model, field);
+    if (!fieldDef.computed) {
+      return this.eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
+    } else {
+      if (!inlineComputedField) {
+        return this.eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
+      }
+      let computer;
+      if ("computedFields" in this.options) {
+        const computedFields = this.options.computedFields;
+        computer = computedFields?.[fieldDef.originModel ?? model]?.[field];
+      }
+      if (!computer) {
+        throw new QueryError(`Computed field "${field}" implementation not provided for model "${model}"`);
+      }
+      return computer(this.eb, {
+        modelAlias
+      });
+    }
   }
   canJoinWithoutNestedSelect(modelDef, payload) {
     if (modelDef.computedFields) {
@@ -3155,7 +3142,7 @@ var AggregateOperationHandler = class extends BaseOperationHandler {
         take = -take;
       }
       subQuery = this.dialect.buildSkipTake(subQuery, skip, take);
-      subQuery = this.dialect.buildOrderBy(subQuery, this.model, this.model, parsedArgs.orderBy, skip !== void 0 || take !== void 0, negateOrderBy);
+      subQuery = this.dialect.buildOrderBy(subQuery, this.model, this.model, parsedArgs.orderBy, negateOrderBy);
       return subQuery.as("$sub");
     });
     for (const [key, value] of Object.entries(parsedArgs)) {
@@ -3386,29 +3373,23 @@ var GroupByOperationHandler = class extends BaseOperationHandler {
   async handle(_operation, args) {
     const normalizedArgs = this.normalizeArgs(args);
     const parsedArgs = this.inputValidator.validateGroupByArgs(this.model, normalizedArgs);
-    let query = this.kysely.selectFrom((eb) => {
-      let subQuery = eb.selectFrom(this.model).selectAll().where(() => this.dialect.buildFilter(this.model, this.model, parsedArgs?.where));
-      const skip = parsedArgs?.skip;
-      let take = parsedArgs?.take;
-      let negateOrderBy = false;
-      if (take !== void 0 && take < 0) {
-        negateOrderBy = true;
-        take = -take;
-      }
-      subQuery = this.dialect.buildSkipTake(subQuery, skip, take);
-      subQuery = this.dialect.buildOrderBy(subQuery, this.model, this.model, void 0, skip !== void 0 || take !== void 0, negateOrderBy);
-      return subQuery.as("$sub");
-    });
-    const fieldRef = /* @__PURE__ */ __name((field) => this.dialect.fieldRef(this.model, field, "$sub"), "fieldRef");
+    let query = this.kysely.selectFrom(this.model).where(() => this.dialect.buildFilter(this.model, this.model, parsedArgs?.where));
+    const fieldRef = /* @__PURE__ */ __name((field) => this.dialect.fieldRef(this.model, field), "fieldRef");
     const bys = typeof parsedArgs.by === "string" ? [
       parsedArgs.by
     ] : parsedArgs.by;
     query = query.groupBy(bys.map((by) => fieldRef(by)));
-    if (parsedArgs.orderBy) {
-      query = this.dialect.buildOrderBy(query, this.model, "$sub", parsedArgs.orderBy, false, false);
+    const skip = parsedArgs?.skip;
+    let take = parsedArgs?.take;
+    let negateOrderBy = false;
+    if (take !== void 0 && take < 0) {
+      negateOrderBy = true;
+      take = -take;
     }
+    query = this.dialect.buildSkipTake(query, skip, take);
+    query = this.dialect.buildOrderBy(query, this.model, this.model, parsedArgs.orderBy, negateOrderBy);
     if (parsedArgs.having) {
-      query = query.having(() => this.dialect.buildFilter(this.model, "$sub", parsedArgs.having));
+      query = query.having(() => this.dialect.buildFilter(this.model, this.model, parsedArgs.having));
     }
     for (const by of bys) {
       query = query.select(() => fieldRef(by).as(by));
@@ -3932,12 +3913,12 @@ function evalCall(data, expr) {
 __name(evalCall, "evalCall");
 
 // src/client/crud/validator/index.ts
+var schemaCache = /* @__PURE__ */ new WeakMap();
 var InputValidator = class {
   static {
     __name(this, "InputValidator");
   }
   client;
-  schemaCache = /* @__PURE__ */ new Map();
   constructor(client) {
     this.client = client;
   }
@@ -3986,16 +3967,34 @@ var InputValidator = class {
   validateGroupByArgs(model, args) {
     return this.validate(model, "groupBy", void 0, (model2) => this.makeGroupBySchema(model2), args);
   }
+  getSchemaCache(cacheKey) {
+    let thisCache = schemaCache.get(this.schema);
+    if (!thisCache) {
+      thisCache = /* @__PURE__ */ new Map();
+      schemaCache.set(this.schema, thisCache);
+    }
+    return thisCache.get(cacheKey);
+  }
+  setSchemaCache(cacheKey, schema) {
+    let thisCache = schemaCache.get(this.schema);
+    if (!thisCache) {
+      thisCache = /* @__PURE__ */ new Map();
+      schemaCache.set(this.schema, thisCache);
+    }
+    return thisCache.set(cacheKey, schema);
+  }
   validate(model, operation, options, getSchema, args) {
     const cacheKey = stableStringify({
+      type: "model",
       model,
       operation,
-      options
+      options,
+      extraValidationsEnabled: this.extraValidationsEnabled
     });
-    let schema = this.schemaCache.get(cacheKey);
+    let schema = this.getSchemaCache(cacheKey);
     if (!schema) {
       schema = getSchema(model, options);
-      this.schemaCache.set(cacheKey, schema);
+      this.setSchemaCache(cacheKey, schema);
     }
     const { error, data } = schema.safeParse(args);
     if (error) {
@@ -4054,8 +4053,12 @@ var InputValidator = class {
     }
   }
   makeTypeDefSchema(type) {
-    const key = `$typedef-${type}`;
-    let schema = this.schemaCache.get(key);
+    const key = stableStringify({
+      type: "typedef",
+      name: type,
+      extraValidationsEnabled: this.extraValidationsEnabled
+    });
+    let schema = this.getSchemaCache(key);
     if (schema) {
       return schema;
     }
@@ -4074,7 +4077,7 @@ var InputValidator = class {
         fieldSchema
       ];
     }))).passthrough();
-    this.schemaCache.set(key, schema);
+    this.setSchemaCache(key, schema);
     return schema;
   }
   makeWhereSchema(model, unique, withoutRelationFields = false, withAggregations = false) {
@@ -5523,7 +5526,18 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
   nameMapper;
   constructor(client, driver, compiler, adapter, connectionProvider, plugins = [], suppressMutationHooks = false) {
     super(compiler, adapter, connectionProvider, plugins), this.client = client, this.driver = driver, this.compiler = compiler, this.connectionProvider = connectionProvider, this.suppressMutationHooks = suppressMutationHooks;
-    this.nameMapper = new QueryNameMapper(client.$schema);
+    if (this.schemaHasMappedNames(client.$schema)) {
+      this.nameMapper = new QueryNameMapper(client.$schema);
+    }
+  }
+  schemaHasMappedNames(schema) {
+    const hasMapAttr = /* @__PURE__ */ __name((decl) => {
+      if (decl.attributes?.some((attr) => attr.name === "@@map")) {
+        return true;
+      }
+      return Object.values(decl.fields).some((field) => field.attributes?.some((attr) => attr.name === "@map"));
+    }, "hasMapAttr");
+    return Object.values(schema.models).some(hasMapAttr) || Object.values(schema.typeDefs ?? []).some(hasMapAttr);
   }
   get kysely() {
     return this.client.$qb;
@@ -5605,7 +5619,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
   async proceedQuery(connection, query, parameters, queryId) {
     let compiled;
     if (this.suppressMutationHooks || !this.isMutationNode(query) || !this.hasEntityMutationPlugins) {
-      const finalQuery2 = this.nameMapper.transformNode(query);
+      const finalQuery2 = this.processNameMapping(query);
       compiled = this.compileQuery(finalQuery2);
       if (parameters) {
         compiled = {
@@ -5623,7 +5637,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
         ])
       };
     }
-    const finalQuery = this.nameMapper.transformNode(query);
+    const finalQuery = this.processNameMapping(query);
     compiled = this.compileQuery(finalQuery);
     if (parameters) {
       compiled = {
@@ -5651,6 +5665,9 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
     }
     return result;
   }
+  processNameMapping(query) {
+    return this.nameMapper?.transformNode(query) ?? query;
+  }
   createClientForConnection(connection, inTx) {
     const innerExecutor = this.withConnectionProvider(new SingleConnectionProvider(connection));
     innerExecutor.suppressMutationHooks = true;
@@ -6435,6 +6452,11 @@ var ClientImpl = class _ClientImpl {
       ...args
     ]);
   }
+  async $connect() {
+    await this.kysely.connection().execute(async (conn) => {
+      await conn.executeQuery(sql7`select 1`.compile(this.kysely));
+    });
+  }
   async $disconnect() {
     await this.kysely.destroy();
   }