@zenstackhq/orm 3.8.0-beta.2 → 3.8.0

package/dist/index.cjs

@@ -1474,7 +1474,10 @@ var LateralJoinDialectBase = class extends BaseCrudDialect {
 				return { [field]: fieldValue };
 			}
 		}));
-		if (typeof payload === "object" && payload.include && typeof payload.include === "object") Object.assign(objArgs, ...Object.entries(payload.include).filter(([, value]) => value).map(([field]) => ({ [field]: eb.ref(`${parentResultName}$${field}.$data`) })));
+		if (typeof payload === "object" && payload.include && typeof payload.include === "object") Object.assign(objArgs, ...Object.entries(payload.include).filter(([, value]) => value).map(([field, value]) => {
+			if (field === "_count") return { [field]: this.buildCountJson(relationModel, eb, relationModelAlias, value) };
+			return { [field]: eb.ref(`${parentResultName}$${field}.$data`) };
+		}));
 		return objArgs;
 	}
 	buildRelationJoins(query, relationModel, relationModelAlias, payload, parentResultName) {
@@ -1869,7 +1872,7 @@ var PostgresCrudDialect = class PostgresCrudDialect extends LateralJoinDialectBa
 		return this.eb.fn("trim", [expression, kysely.sql.lit("\"")]);
 	}
 	buildArrayLength(array) {
-		return this.eb.fn("array_length", [array]);
+		return this.eb.fn("array_length", [array, kysely.sql.lit(1)]);
 	}
 	buildArrayValue(values, elemType) {
 		const arr = kysely.sql`ARRAY[${kysely.sql.join(values, kysely.sql.raw(","))}]`;
@@ -2149,6 +2152,10 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
 				} else return [kysely.sql.lit(field), this.fieldRef(relationModel, field, subQueryName, false)];
 			}).flatMap((v) => v));
 			if (typeof payload === "object" && payload.include && typeof payload.include === "object") objArgs.push(...Object.entries(payload.include).filter(([, value]) => value).map(([field, value]) => {
+				if (field === "_count") {
+					const subJson = this.buildCountJson(relationModel, eb, tmpAlias(`${parentAlias}$${relationField}`), value);
+					return [kysely.sql.lit(field), subJson];
+				}
 				const subJson = this.buildRelationJSON(relationModel, eb, field, tmpAlias(`${parentAlias}$${relationField}`), value);
 				return [kysely.sql.lit(field), subJson];
 			}).flatMap((v) => v));
@@ -2874,7 +2881,8 @@ var ZodSchemaFactory = class {
 		for (const [field, fieldDef] of this.getModelFields(model)) if (fieldDef.relation) {
 			if (!this.shouldIncludeRelations(options)) continue;
 			if (this.isModelAllowed(fieldDef.type)) fields[field] = this.makeRelationSelectIncludeSchema(model, field, options).optional();
-		} else fields[field] = zod.z.boolean().optional();
+		} else if (this.options.allowQueryTimeOmitOverride === false && this.isFieldOmittedByConfig(model, field)) fields[field] = zod.z.literal(false).optional();
+		else fields[field] = zod.z.boolean().optional();
 		if (this.shouldIncludeRelations(options)) {
 			const _countSchema = this.makeCountSelectionSchema(model, options);
 			if (!(_countSchema instanceof zod.z.ZodNever)) fields["_count"] = _countSchema;
@@ -2920,6 +2928,15 @@ var ZodSchemaFactory = class {
 		this.registerSchema(`${model}${(0, _zenstackhq_common_helpers.upperCaseFirst)(field)}RelationInput`, result);
 		return result;
 	}
+	/**
+	* Determines whether a field is configured to be omitted at the schema or client-options level
+	* (query-level omit is excluded as it's mutually exclusive with `select`).
+	*/
+	isFieldOmittedByConfig(model, field) {
+		const omitConfig = this.options.omit?.[(0, _zenstackhq_common_helpers.lowerCaseFirst)(model)] ?? this.options.omit?.[model];
+		if (omitConfig && typeof omitConfig[field] === "boolean") return omitConfig[field];
+		return !!requireField(this.schema, model, field).omit;
+	}
 	makeOmitSchema(model) {
 		const fields = {};
 		for (const [field, fieldDef] of this.getModelFields(model)) if (!fieldDef.relation) if (this.options.allowQueryTimeOmitOverride !== false) fields[field] = zod.z.boolean().optional();