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

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

@@ -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.

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

@@ -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.

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") {