@zenstackhq/runtime 3.0.0-alpha.24 → 3.0.0-alpha.26

package/dist/{contract-C9SubPBD.d.cts → contract-BF6mvhVn.d.cts}

@@ -1,5 +1,5 @@
 import Decimal, { Decimal as Decimal$1 } from 'decimal.js';
-import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, BuiltinType, GetModel, FieldDef, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, ProcedureDef } from '@zenstackhq/sdk/schema';
+import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetModel, FieldDef, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, BuiltinType, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, ProcedureDef } from '@zenstackhq/sdk/schema';
 import { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, SelectQueryBuilder, Expression, ExpressionWrapper, OperationNode, RootOperationNode, QueryResult, UnknownRow, Dialect, KyselyConfig } from 'kysely';
 
 type Optional<T extends object, K extends keyof T = keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
@@ -259,9 +259,9 @@ type FindArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Collect
     skip?: number;
     take?: number;
     orderBy?: OrArray<OrderBy<Schema, Model, true, false>>;
-} : {}) & (AllowFilter extends true ? {
+} & Distinct<Schema, Model> & Cursor<Schema, Model> : {}) & (AllowFilter extends true ? {
     where?: WhereInput<Schema, Model>;
-} : {}) & SelectIncludeOmit<Schema, Model, Collection> & Distinct<Schema, Model> & Cursor<Schema, Model>;
+} : {}) & SelectIncludeOmit<Schema, Model, Collection>;
 type FindManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, true>;
 type FindFirstArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, false>;
 type FindUniqueArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
@@ -562,7 +562,7 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
     protected and(eb: ExpressionBuilder<any, any>, ...args: Expression<SqlBool>[]): Expression<SqlBool>;
     protected or(eb: ExpressionBuilder<any, any>, ...args: Expression<SqlBool>[]): Expression<SqlBool>;
     protected not(eb: ExpressionBuilder<any, any>, ...args: Expression<SqlBool>[]): ExpressionWrapper<any, any, SqlBool>;
-    fieldRef(model: string, field: string, eb: ExpressionBuilder<any, any>, modelAlias?: string): ExpressionWrapper<any, any, unknown>;
+    fieldRef(model: string, field: string, eb: ExpressionBuilder<any, any>, modelAlias?: string, inlineComputedField?: boolean): ExpressionWrapper<any, any, unknown>;
     abstract get provider(): DataSourceProviderType;
     /**
      * Builds selection for a relation field.
@@ -603,6 +603,7 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
 }
 
 type CrudOperation = 'findMany' | 'findUnique' | 'findFirst' | 'create' | 'createMany' | 'createManyAndReturn' | 'update' | 'updateMany' | 'updateManyAndReturn' | 'upsert' | 'delete' | 'deleteMany' | 'count' | 'aggregate' | 'groupBy';
+type AllCrudOperation = CrudOperation | 'findUniqueOrThrow' | 'findFirstOrThrow';
 
 /**
  * ZenStack runtime plugin.
@@ -647,7 +648,7 @@ type OnQueryHookContext<Schema extends SchemaDef> = {
     /**
      * The operation that is being performed.
      */
-    operation: CrudOperation;
+    operation: AllCrudOperation;
     /**
      * The query arguments.
      */

package/dist/{contract-C9SubPBD.d.ts → contract-BF6mvhVn.d.ts}

@@ -1,5 +1,5 @@
 import Decimal, { Decimal as Decimal$1 } from 'decimal.js';
-import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, BuiltinType, GetModel, FieldDef, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, ProcedureDef } from '@zenstackhq/sdk/schema';
+import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetModel, FieldDef, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, BuiltinType, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, ProcedureDef } from '@zenstackhq/sdk/schema';
 import { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, SelectQueryBuilder, Expression, ExpressionWrapper, OperationNode, RootOperationNode, QueryResult, UnknownRow, Dialect, KyselyConfig } from 'kysely';
 
 type Optional<T extends object, K extends keyof T = keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
@@ -259,9 +259,9 @@ type FindArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Collect
     skip?: number;
     take?: number;
     orderBy?: OrArray<OrderBy<Schema, Model, true, false>>;
-} : {}) & (AllowFilter extends true ? {
+} & Distinct<Schema, Model> & Cursor<Schema, Model> : {}) & (AllowFilter extends true ? {
     where?: WhereInput<Schema, Model>;
-} : {}) & SelectIncludeOmit<Schema, Model, Collection> & Distinct<Schema, Model> & Cursor<Schema, Model>;
+} : {}) & SelectIncludeOmit<Schema, Model, Collection>;
 type FindManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, true>;
 type FindFirstArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, false>;
 type FindUniqueArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
@@ -562,7 +562,7 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
     protected and(eb: ExpressionBuilder<any, any>, ...args: Expression<SqlBool>[]): Expression<SqlBool>;
     protected or(eb: ExpressionBuilder<any, any>, ...args: Expression<SqlBool>[]): Expression<SqlBool>;
     protected not(eb: ExpressionBuilder<any, any>, ...args: Expression<SqlBool>[]): ExpressionWrapper<any, any, SqlBool>;
-    fieldRef(model: string, field: string, eb: ExpressionBuilder<any, any>, modelAlias?: string): ExpressionWrapper<any, any, unknown>;
+    fieldRef(model: string, field: string, eb: ExpressionBuilder<any, any>, modelAlias?: string, inlineComputedField?: boolean): ExpressionWrapper<any, any, unknown>;
     abstract get provider(): DataSourceProviderType;
     /**
      * Builds selection for a relation field.
@@ -603,6 +603,7 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
 }
 
 type CrudOperation = 'findMany' | 'findUnique' | 'findFirst' | 'create' | 'createMany' | 'createManyAndReturn' | 'update' | 'updateMany' | 'updateManyAndReturn' | 'upsert' | 'delete' | 'deleteMany' | 'count' | 'aggregate' | 'groupBy';
+type AllCrudOperation = CrudOperation | 'findUniqueOrThrow' | 'findFirstOrThrow';
 
 /**
  * ZenStack runtime plugin.
@@ -647,7 +648,7 @@ type OnQueryHookContext<Schema extends SchemaDef> = {
     /**
      * The operation that is being performed.
      */
-    operation: CrudOperation;
+    operation: AllCrudOperation;
     /**
      * The query arguments.
      */

package/dist/index.cjs

@@ -305,11 +305,14 @@ function getIdValues(schema, model, data) {
   }), {});
 }
 __name(getIdValues, "getIdValues");
-function buildFieldRef(schema, model, field, options, eb, modelAlias) {
+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;
@@ -493,7 +496,6 @@ var import_kysely2 = require("kysely");
 var import_ts_pattern3 = require("ts-pattern");
 
 // src/client/constants.ts
-var CONTEXT_COMMENT_PREFIX = "-- $$context:";
 var NUMERIC_FIELD_TYPES = [
   "Int",
   "Float",
@@ -1080,8 +1082,8 @@ var BaseCrudDialect = class {
   not(eb, ...args) {
     return eb.not(this.and(eb, ...args));
   }
-  fieldRef(model, field, eb, modelAlias) {
-    return buildFieldRef(this.schema, model, field, this.options, eb, modelAlias);
+  fieldRef(model, field, eb, modelAlias, inlineComputedField = true) {
+    return buildFieldRef(this.schema, model, field, this.options, eb, modelAlias, inlineComputedField);
   }
 };
 
@@ -1176,7 +1178,7 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
     if (payload === true || !payload.select) {
       objArgs.push(...Object.entries(relationModelDef.fields).filter(([, value]) => !value.relation).filter(([name]) => !(typeof payload === "object" && payload.omit?.[name] === true)).map(([field]) => [
         import_kysely2.sql.lit(field),
-        this.fieldRef(relationModel, field, eb)
+        this.fieldRef(relationModel, field, eb, void 0, false)
       ]).flatMap((v) => v));
     } else if (payload.select) {
       objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
@@ -1188,7 +1190,7 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
           ];
         } else {
           const fieldDef = requireField(this.schema, relationModel, field);
-          const fieldValue = fieldDef.relation ? eb.ref(`${parentAlias}$${relationField}$${field}.$j`) : this.fieldRef(relationModel, field, eb);
+          const fieldValue = fieldDef.relation ? eb.ref(`${parentAlias}$${relationField}$${field}.$j`) : this.fieldRef(relationModel, field, eb, void 0, false);
           return [
             import_kysely2.sql.lit(field),
             fieldValue
@@ -1339,7 +1341,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
       if (payload === true || !payload.select) {
         objArgs.push(...Object.entries(relationModelDef.fields).filter(([, value]) => !value.relation).filter(([name]) => !(typeof payload === "object" && payload.omit?.[name] === true)).map(([field]) => [
           import_kysely3.sql.lit(field),
-          this.fieldRef(relationModel, field, eb)
+          this.fieldRef(relationModel, field, eb, void 0, false)
         ]).flatMap((v) => v));
       } else if (payload.select) {
         objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
@@ -1360,7 +1362,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
             } else {
               return [
                 import_kysely3.sql.lit(field),
-                this.fieldRef(relationModel, field, eb)
+                this.fieldRef(relationModel, field, eb, void 0, false)
               ];
             }
           }
@@ -3460,8 +3462,8 @@ ${compiled.parameters.map((p) => (0, import_node_util.inspect)(p)).join("\n")}`;
   isNumericField(fieldDef) {
     return NUMERIC_FIELD_TYPES.includes(fieldDef.type) && !fieldDef.array;
   }
-  makeContextComment(context) {
-    return import_kysely8.sql.raw(`${CONTEXT_COMMENT_PREFIX}${JSON.stringify(context)}`);
+  makeContextComment(_context) {
+    return import_kysely8.sql``;
   }
   async updateMany(kysely, model, where, data, limit, returnData, filterModel) {
     if (typeof data !== "object") {
@@ -4504,8 +4506,7 @@ var InputValidator = class {
   }
   validateFindArgs(model, unique, args) {
     return this.validate(model, "find", {
-      unique,
-      collection: true
+      unique
     }, (model2, options) => this.makeFindSchema(model2, options), args);
   }
   validateCreateArgs(model, args) {
@@ -4573,12 +4574,12 @@ var InputValidator = class {
     fields["select"] = this.makeSelectSchema(model).optional();
     fields["include"] = this.makeIncludeSchema(model).optional();
     fields["omit"] = this.makeOmitSchema(model).optional();
-    fields["distinct"] = this.makeDistinctSchema(model).optional();
-    fields["cursor"] = this.makeCursorSchema(model).optional();
-    if (options.collection) {
+    if (!options.unique) {
       fields["skip"] = this.makeSkipSchema().optional();
       fields["take"] = this.makeTakeSchema().optional();
       fields["orderBy"] = this.orArray(this.makeOrderBySchema(model, true, false), true).optional();
+      fields["cursor"] = this.makeCursorSchema(model).optional();
+      fields["distinct"] = this.makeDistinctSchema(model).optional();
     }
     let result = import_zod.z.strictObject(fields);
     result = this.refineForSelectIncludeMutuallyExclusive(result);
@@ -4884,13 +4885,7 @@ var InputValidator = class {
     for (const field of Object.keys(modelDef.fields)) {
       const fieldDef = requireField(this.schema, model, field);
       if (fieldDef.relation) {
-        fields[field] = import_zod.z.union([
-          import_zod.z.literal(true),
-          import_zod.z.strictObject({
-            select: import_zod.z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
-            include: import_zod.z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional()
-          })
-        ]).optional();
+        fields[field] = this.makeRelationSelectIncludeSchema(fieldDef).optional();
       } else {
         fields[field] = import_zod.z.boolean().optional();
       }
@@ -4914,6 +4909,28 @@ var InputValidator = class {
     }
     return import_zod.z.strictObject(fields);
   }
+  makeRelationSelectIncludeSchema(fieldDef) {
+    return import_zod.z.union([
+      import_zod.z.boolean(),
+      import_zod.z.strictObject({
+        ...fieldDef.array || fieldDef.optional ? {
+          // to-many relations and optional to-one relations are filterable
+          where: import_zod.z.lazy(() => this.makeWhereSchema(fieldDef.type, false)).optional()
+        } : {},
+        select: import_zod.z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
+        include: import_zod.z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional(),
+        omit: import_zod.z.lazy(() => this.makeOmitSchema(fieldDef.type)).optional(),
+        ...fieldDef.array ? {
+          // to-many relations can be ordered, skipped, taken, and cursor-located
+          orderBy: import_zod.z.lazy(() => this.makeOrderBySchema(fieldDef.type, true, false)).optional(),
+          skip: this.makeSkipSchema().optional(),
+          take: this.makeTakeSchema().optional(),
+          cursor: this.makeCursorSchema(fieldDef.type).optional(),
+          distinct: this.makeDistinctSchema(fieldDef.type).optional()
+        } : {}
+      })
+    ]);
+  }
   makeOmitSchema(model) {
     const modelDef = requireModel(this.schema, model);
     const fields = {};
@@ -4931,19 +4948,7 @@ var InputValidator = class {
     for (const field of Object.keys(modelDef.fields)) {
       const fieldDef = requireField(this.schema, model, field);
       if (fieldDef.relation) {
-        fields[field] = import_zod.z.union([
-          import_zod.z.literal(true),
-          import_zod.z.strictObject({
-            select: import_zod.z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
-            include: import_zod.z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional(),
-            omit: import_zod.z.lazy(() => this.makeOmitSchema(fieldDef.type)).optional(),
-            where: import_zod.z.lazy(() => this.makeWhereSchema(fieldDef.type, false)).optional(),
-            orderBy: import_zod.z.lazy(() => this.makeOrderBySchema(fieldDef.type, true, false)).optional(),
-            skip: this.makeSkipSchema().optional(),
-            take: this.makeTakeSchema().optional(),
-            distinct: this.makeDistinctSchema(fieldDef.type).optional()
-          })
-        ]).optional();
+        fields[field] = this.makeRelationSelectIncludeSchema(fieldDef).optional();
       }
     }
     return import_zod.z.strictObject(fields);