@zenstackhq/plugin-policy 3.3.0-beta.3 → 3.3.0-beta.4

package/dist/index.cjs

@@ -311,6 +311,7 @@ var ExpressionTransformer = class {
   }
   client;
   dialect;
+  eb = (0, import_kysely2.expressionBuilder)();
   constructor(client) {
     this.client = client;
     this.dialect = (0, import_orm3.getCrudDialect)(this.schema, this.clientOptions);
@@ -335,13 +336,15 @@ var ExpressionTransformer = class {
     if (!handler) {
       throw new Error(`Unsupported expression kind: ${expression.kind}`);
     }
-    return handler.value.call(this, expression, context);
+    const result = handler.value.call(this, expression, context);
+    (0, import_common_helpers2.invariant)("kind" in result, `expression handler must return an OperationNode: transforming ${expression.kind}`);
+    return result;
   }
   _literal(expr2) {
     return this.transformValue(expr2.value, typeof expr2.value === "string" ? "String" : typeof expr2.value === "boolean" ? "Boolean" : "Int");
   }
   _array(expr2, context) {
-    return import_kysely2.ValueListNode.create(expr2.items.map((item) => this.transform(item, context)));
+    return this.dialect.buildArrayValue(expr2.items.map((item) => new import_kysely2.ExpressionWrapper(this.transform(item, context))), expr2.type).toOperationNode();
   }
   _field(expr2, context) {
     if (context.contextValue) {
@@ -628,9 +631,11 @@ var ExpressionTransformer = class {
       return trueNode(this.dialect);
     } else if (value === false) {
       return falseNode(this.dialect);
+    } else if (Array.isArray(value)) {
+      return this.dialect.buildArrayValue(value.map((v) => new import_kysely2.ExpressionWrapper(this.transformValue(v, type))), type).toOperationNode();
     } else {
       const transformed = this.dialect.transformInput(value, type, false) ?? null;
-      if (!Array.isArray(transformed)) {
+      if (typeof transformed !== "string") {
         return import_kysely2.ValueNode.createImmediate(transformed);
       } else {
         return import_kysely2.ValueNode.create(transformed);
@@ -654,8 +659,7 @@ var ExpressionTransformer = class {
     if (!func) {
       throw createUnsupportedError(`Function not implemented: ${expr2.function}`);
     }
-    const eb = (0, import_kysely2.expressionBuilder)();
-    return func(eb, (expr2.args ?? []).map((arg) => this.transformCallArg(eb, arg, context)), {
+    return func(this.eb, (expr2.args ?? []).map((arg) => this.transformCallArg(arg, context)), {
       client: this.client,
       dialect: this.dialect,
       model: context.modelOrType,
@@ -675,21 +679,12 @@ var ExpressionTransformer = class {
     }
     return func;
   }
-  transformCallArg(eb, arg, context) {
-    if (import_schema3.ExpressionUtils.isLiteral(arg)) {
-      return eb.val(arg.value);
-    }
+  transformCallArg(arg, context) {
     if (import_schema3.ExpressionUtils.isField(arg)) {
-      return eb.ref(arg.field);
-    }
-    if (import_schema3.ExpressionUtils.isCall(arg)) {
-      return this.transformCall(arg, context);
-    }
-    if (this.isAuthMember(arg)) {
-      const valNode = this.valueMemberAccess(this.auth, arg, this.authType);
-      return valNode ? eb.val(valNode.value) : eb.val(null);
+      return this.eb.ref(arg.field);
+    } else {
+      return new import_kysely2.ExpressionWrapper(this.transform(arg, context));
     }
-    throw createUnsupportedError(`Unsupported argument expression: ${arg.kind}`);
   }
   _member(expr2, context) {
     if (import_schema3.ExpressionUtils.isBinding(expr2.receiver)) {
@@ -1584,8 +1579,9 @@ var PolicyHandler = class extends import_kysely3.OperationNodeTransformer {
           value = this.dialect.transformInput(item, fieldDef.type, !!fieldDef.array);
         }
         if (Array.isArray(value)) {
+          const fieldDef = import_orm4.QueryUtils.requireField(this.client.$schema, model, fields[i]);
           result.push({
-            node: this.dialect.buildArrayLiteralSQL(value).toOperationNode(),
+            node: this.dialect.buildArrayValue(value, fieldDef.type).toOperationNode(),
             raw: value
           });
         } else {