@zenstackhq/orm 3.0.0-beta.22 → 3.0.0-beta.23

package/dist/index.cjs

@@ -4091,9 +4091,9 @@ var InputValidator = class {
     } else {
       fields["where"] = where.optional();
     }
-    fields["select"] = this.makeSelectSchema(model).optional();
-    fields["include"] = this.makeIncludeSchema(model).optional();
-    fields["omit"] = this.makeOmitSchema(model).optional();
+    fields["select"] = this.makeSelectSchema(model).optional().nullable();
+    fields["include"] = this.makeIncludeSchema(model).optional().nullable();
+    fields["omit"] = this.makeOmitSchema(model).optional().nullable();
     if (!options.unique) {
       fields["skip"] = this.makeSkipSchema().optional();
       if (options.findOne) {
@@ -4467,9 +4467,9 @@ var InputValidator = class {
         // to-many relations and optional to-one relations are filterable
         where: import_zod2.z.lazy(() => this.makeWhereSchema(fieldDef.type, false)).optional()
       } : {},
-      select: import_zod2.z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
-      include: import_zod2.z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional(),
-      omit: import_zod2.z.lazy(() => this.makeOmitSchema(fieldDef.type)).optional(),
+      select: import_zod2.z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional().nullable(),
+      include: import_zod2.z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional().nullable(),
+      omit: import_zod2.z.lazy(() => this.makeOmitSchema(fieldDef.type)).optional().nullable(),
       ...fieldDef.array ? {
         // to-many relations can be ordered, skipped, taken, and cursor-located
         orderBy: import_zod2.z.lazy(() => this.orArray(this.makeOrderBySchema(fieldDef.type, true, false), true)).optional(),
@@ -4578,9 +4578,9 @@ var InputValidator = class {
     const dataSchema = this.makeCreateDataSchema(model, false);
     let schema = import_zod2.z.strictObject({
       data: dataSchema,
-      select: this.makeSelectSchema(model).optional(),
-      include: this.makeIncludeSchema(model).optional(),
-      omit: this.makeOmitSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      include: this.makeIncludeSchema(model).optional().nullable(),
+      omit: this.makeOmitSchema(model).optional().nullable()
     });
     schema = this.refineForSelectIncludeMutuallyExclusive(schema);
     schema = this.refineForSelectOmitMutuallyExclusive(schema);
@@ -4592,8 +4592,8 @@ var InputValidator = class {
   makeCreateManyAndReturnSchema(model) {
     const base = this.makeCreateManyDataSchema(model, []);
     const result = base.extend({
-      select: this.makeSelectSchema(model).optional(),
-      omit: this.makeOmitSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      omit: this.makeOmitSchema(model).optional().nullable()
     });
     return this.refineForSelectOmitMutuallyExclusive(result).optional();
   }
@@ -4783,9 +4783,9 @@ var InputValidator = class {
     let schema = import_zod2.z.strictObject({
       where: this.makeWhereSchema(model, true),
       data: this.makeUpdateDataSchema(model),
-      select: this.makeSelectSchema(model).optional(),
-      include: this.makeIncludeSchema(model).optional(),
-      omit: this.makeOmitSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      include: this.makeIncludeSchema(model).optional().nullable(),
+      omit: this.makeOmitSchema(model).optional().nullable()
     });
     schema = this.refineForSelectIncludeMutuallyExclusive(schema);
     schema = this.refineForSelectOmitMutuallyExclusive(schema);
@@ -4801,8 +4801,8 @@ var InputValidator = class {
   makeUpdateManyAndReturnSchema(model) {
     const base = this.makeUpdateManySchema(model);
     let schema = base.extend({
-      select: this.makeSelectSchema(model).optional(),
-      omit: this.makeOmitSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      omit: this.makeOmitSchema(model).optional().nullable()
     });
     schema = this.refineForSelectOmitMutuallyExclusive(schema);
     return schema;
@@ -4812,9 +4812,9 @@ var InputValidator = class {
       where: this.makeWhereSchema(model, true),
       create: this.makeCreateDataSchema(model, false),
       update: this.makeUpdateDataSchema(model),
-      select: this.makeSelectSchema(model).optional(),
-      include: this.makeIncludeSchema(model).optional(),
-      omit: this.makeOmitSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      include: this.makeIncludeSchema(model).optional().nullable(),
+      omit: this.makeOmitSchema(model).optional().nullable()
     });
     schema = this.refineForSelectIncludeMutuallyExclusive(schema);
     schema = this.refineForSelectOmitMutuallyExclusive(schema);
@@ -4904,8 +4904,8 @@ var InputValidator = class {
   makeDeleteSchema(model) {
     let schema = import_zod2.z.strictObject({
       where: this.makeWhereSchema(model, true),
-      select: this.makeSelectSchema(model).optional(),
-      include: this.makeIncludeSchema(model).optional()
+      select: this.makeSelectSchema(model).optional().nullable(),
+      include: this.makeIncludeSchema(model).optional().nullable()
     });
     schema = this.refineForSelectIncludeMutuallyExclusive(schema);
     schema = this.refineForSelectOmitMutuallyExclusive(schema);
@@ -5295,7 +5295,9 @@ var QueryNameMapper = class extends import_kysely6.OperationNodeTransformer {
       return super.transformSelectQuery(node);
     }
     const processedFroms = node.from.froms.map((from) => this.processSelectTable(from));
-    const processedJoins = (node.joins ?? []).map((join) => this.processSelectTable(join.table));
+    const processedJoins = this.withScopes([
+      ...processedFroms.map(({ scope }) => scope)
+    ], () => (node.joins ?? []).map((join) => this.processSelectTable(join.table)));
     const scopes = [
       ...processedFroms.map(({ scope }) => scope),
       ...processedJoins.map(({ scope }) => scope)