@danielhritcu/zenstack-orm 3.5.20 → 3.5.22

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as _zenstackhq_schema from '@zenstackhq/schema';
-import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, GetModel, ProcedureDef, BuiltinType, FieldDef, ModelDef, DataSourceProviderType, IsDelegateModel, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, GetTypeDefFieldType, TypeDefFieldIsArray, UpdatedAtInfo, FieldIsDelegateDiscriminator, FieldType, RelationInfo, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, BindingExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
+import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, GetModel, ProcedureDef, HasRls, BuiltinType, FieldDef, ModelDef, DataSourceProviderType, IsDelegateModel, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, GetTypeDefFieldType, TypeDefFieldIsArray, UpdatedAtInfo, FieldIsDelegateDiscriminator, FieldType, RelationInfo, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, BindingExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
 import * as kysely from 'kysely';
 import { Kysely, OperationNodeVisitor, OperationNode, SelectQueryNode, SelectionNode, ColumnNode, AliasNode, TableNode, FromNode, ReferenceNode, AndNode, OrNode, ValueListNode, ParensNode, JoinNode, RawNode, WhereNode, InsertQueryNode, DeleteQueryNode, ReturningNode, CreateTableNode, AddColumnNode, ColumnDefinitionNode, DropTableNode, OrderByNode, OrderByItemNode, GroupByNode, GroupByItemNode, UpdateQueryNode, ColumnUpdateNode, LimitNode, OffsetNode, OnConflictNode, OnDuplicateKeyNode, CheckConstraintNode, DataTypeNode, SelectAllNode, IdentifierNode, SchemableIdentifierNode, ValueNode, PrimitiveValueListNode, OperatorNode, CreateIndexNode, DropIndexNode, ListNode, PrimaryKeyConstraintNode, UniqueConstraintNode, ReferencesNode, WithNode, CommonTableExpressionNode, CommonTableExpressionNameNode, HavingNode, CreateSchemaNode, DropSchemaNode, AlterTableNode, DropColumnNode, RenameColumnNode, AlterColumnNode, ModifyColumnNode, AddConstraintNode, DropConstraintNode, ForeignKeyConstraintNode, CreateViewNode, DropViewNode, GeneratedNode, DefaultValueNode, OnNode, ValuesNode, SelectModifierNode, CreateTypeNode, DropTypeNode, ExplainNode, DefaultInsertValueNode, AggregateFunctionNode, OverNode, PartitionByNode, PartitionByItemNode, SetOperationNode, BinaryOperationNode, UnaryOperationNode, UsingNode, FunctionNode, CaseNode, WhenNode, JSONReferenceNode, JSONPathNode, JSONPathLegNode, JSONOperatorChainNode, TupleNode, MergeQueryNode, MatchedNode, AddIndexNode, CastNode, FetchNode, TopNode, OutputNode, RenameConstraintNode, RefreshMaterializedViewNode, OrActionNode, CollateNode, Generated, QueryId, RootOperationNode, QueryResult, UnknownRow, Dialect, ExpressionBuilder, Expression, KyselyConfig, OperandExpression, SelectQueryBuilder, SqlBool, AliasableExpression, ExpressionWrapper } from 'kysely';
 import Decimal from 'decimal.js';
@@ -782,6 +782,11 @@ type ClientOptions<Schema extends SchemaDef> = QueryOptions<Schema> & {
      * Custom procedure definitions.
      */
     procedures: ProceduresOptions<Schema>;
+} : {}) & (HasRls<Schema> extends true ? {
+    /**
+     * Row Level Security configuration.
+     */
+    rls: Record<string, unknown>;
 } : {});
 /**
  * Config for omitting fields in ORM query results.

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _zenstackhq_schema from '@zenstackhq/schema';
-import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, GetModel, ProcedureDef, BuiltinType, FieldDef, ModelDef, DataSourceProviderType, IsDelegateModel, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, GetTypeDefFieldType, TypeDefFieldIsArray, UpdatedAtInfo, FieldIsDelegateDiscriminator, FieldType, RelationInfo, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, BindingExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
+import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, GetModel, ProcedureDef, HasRls, BuiltinType, FieldDef, ModelDef, DataSourceProviderType, IsDelegateModel, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, GetTypeDefFieldType, TypeDefFieldIsArray, UpdatedAtInfo, FieldIsDelegateDiscriminator, FieldType, RelationInfo, Expression as Expression$1, LiteralExpression, ArrayExpression, FieldExpression, MemberExpression, BinaryExpression, UnaryExpression, CallExpression, BindingExpression, ThisExpression, NullExpression } from '@zenstackhq/schema';
 import * as kysely from 'kysely';
 import { Kysely, OperationNodeVisitor, OperationNode, SelectQueryNode, SelectionNode, ColumnNode, AliasNode, TableNode, FromNode, ReferenceNode, AndNode, OrNode, ValueListNode, ParensNode, JoinNode, RawNode, WhereNode, InsertQueryNode, DeleteQueryNode, ReturningNode, CreateTableNode, AddColumnNode, ColumnDefinitionNode, DropTableNode, OrderByNode, OrderByItemNode, GroupByNode, GroupByItemNode, UpdateQueryNode, ColumnUpdateNode, LimitNode, OffsetNode, OnConflictNode, OnDuplicateKeyNode, CheckConstraintNode, DataTypeNode, SelectAllNode, IdentifierNode, SchemableIdentifierNode, ValueNode, PrimitiveValueListNode, OperatorNode, CreateIndexNode, DropIndexNode, ListNode, PrimaryKeyConstraintNode, UniqueConstraintNode, ReferencesNode, WithNode, CommonTableExpressionNode, CommonTableExpressionNameNode, HavingNode, CreateSchemaNode, DropSchemaNode, AlterTableNode, DropColumnNode, RenameColumnNode, AlterColumnNode, ModifyColumnNode, AddConstraintNode, DropConstraintNode, ForeignKeyConstraintNode, CreateViewNode, DropViewNode, GeneratedNode, DefaultValueNode, OnNode, ValuesNode, SelectModifierNode, CreateTypeNode, DropTypeNode, ExplainNode, DefaultInsertValueNode, AggregateFunctionNode, OverNode, PartitionByNode, PartitionByItemNode, SetOperationNode, BinaryOperationNode, UnaryOperationNode, UsingNode, FunctionNode, CaseNode, WhenNode, JSONReferenceNode, JSONPathNode, JSONPathLegNode, JSONOperatorChainNode, TupleNode, MergeQueryNode, MatchedNode, AddIndexNode, CastNode, FetchNode, TopNode, OutputNode, RenameConstraintNode, RefreshMaterializedViewNode, OrActionNode, CollateNode, Generated, QueryId, RootOperationNode, QueryResult, UnknownRow, Dialect, ExpressionBuilder, Expression, KyselyConfig, OperandExpression, SelectQueryBuilder, SqlBool, AliasableExpression, ExpressionWrapper } from 'kysely';
 import Decimal from 'decimal.js';
@@ -782,6 +782,11 @@ type ClientOptions<Schema extends SchemaDef> = QueryOptions<Schema> & {
      * Custom procedure definitions.
      */
     procedures: ProceduresOptions<Schema>;
+} : {}) & (HasRls<Schema> extends true ? {
+    /**
+     * Row Level Security configuration.
+     */
+    rls: Record<string, unknown>;
 } : {});
 /**
  * Config for omitting fields in ORM query results.

package/dist/index.js

@@ -7937,7 +7937,7 @@ __name(performanceNow, "performanceNow");
 
 // src/client/executor/zenstack-query-executor.ts
 import { invariant as invariant11 } from "@zenstackhq/common-helpers";
-import { AndNode, ColumnNode as ColumnNode3, ColumnUpdateNode as ColumnUpdateNode2, createQueryId as createQueryId2, DefaultQueryExecutor, DeleteQueryNode, expressionBuilder as expressionBuilder7, InsertQueryNode, PrimitiveValueListNode as PrimitiveValueListNode2, ReturningNode, SelectionNode as SelectionNode2, SingleConnectionProvider, TableNode as TableNode3, UpdateQueryNode, ValueNode as ValueNode2, ValuesNode as ValuesNode2, WhereNode } from "kysely";
+import { AndNode, ColumnNode as ColumnNode3, ColumnUpdateNode as ColumnUpdateNode2, createQueryId as createQueryId3, DefaultQueryExecutor, DeleteQueryNode, expressionBuilder as expressionBuilder7, InsertQueryNode, PrimitiveValueListNode as PrimitiveValueListNode2, ReturningNode, SelectionNode as SelectionNode2, SingleConnectionProvider, TableNode as TableNode3, UpdateQueryNode, ValueNode as ValueNode2, ValuesNode as ValuesNode2, WhereNode } from "kysely";
 import { match as match12 } from "ts-pattern";
 
 // src/client/executor/name-mapper.ts
@@ -8520,6 +8520,32 @@ var QueryNameMapper = class extends OperationNodeTransformer {
   }
 };
 
+// src/client/executor/rls.ts
+import { createQueryId as createQueryId2 } from "kysely";
+function buildRlsSetConfigSql(rlsDef, rlsValues) {
+  const parts = [];
+  for (const [name, keyDef] of Object.entries(rlsDef.keys)) {
+    const rawValue = rlsValues[name];
+    const resolved = keyDef.resolve(rawValue);
+    const escaped = String(resolved).replace(/'/g, "''");
+    parts.push(`set_config('${keyDef.set}', '${escaped}', true)`);
+  }
+  return `SELECT ${parts.join(", ")}`;
+}
+__name(buildRlsSetConfigSql, "buildRlsSetConfigSql");
+async function applyRlsContext(connection, rlsDef, rlsValues) {
+  const sql9 = buildRlsSetConfigSql(rlsDef, rlsValues);
+  await connection.executeQuery({
+    sql: sql9,
+    parameters: [],
+    query: {
+      kind: "RawNode"
+    },
+    queryId: createQueryId2()
+  });
+}
+__name(applyRlsContext, "applyRlsContext");
+
 // src/client/executor/temp-alias-transformer.ts
 import { IdentifierNode as IdentifierNode2, OperationNodeTransformer as OperationNodeTransformer2 } from "kysely";
 var TempAliasTransformer = class extends OperationNodeTransformer2 {
@@ -8583,6 +8609,7 @@ var ZenStackQueryExecutor = class _ZenStackQueryExecutor extends DefaultQueryExe
   // #region constructor, fields and props
   nameMapper;
   dialect;
+  rlsInitializedConnections = /* @__PURE__ */ new WeakSet();
   constructor(client, driver, compiler, adapter, connectionProvider, plugins = [], suppressMutationHooks = false) {
     super(compiler, adapter, connectionProvider, plugins), this.client = client, this.driver = driver, this.compiler = compiler, this.connectionProvider = connectionProvider, this.suppressMutationHooks = suppressMutationHooks;
     if (client.$schema.provider.type === "postgresql" || // postgres queries need to be schema-qualified
@@ -8984,23 +9011,67 @@ In such cases, ZenStack cannot reliably determine the IDs of the mutated entitie
   }
   async internalExecuteQuery(query, connection, queryId, parameters) {
     const finalQuery = this.processQueryNode(query);
-    let compiledQuery = this.compileQuery(finalQuery, queryId ?? createQueryId2());
+    let compiledQuery = this.compileQuery(finalQuery, queryId ?? createQueryId3());
     if (parameters) {
       compiledQuery = {
         ...compiledQuery,
         parameters
       };
     }
+    const rlsDef = this.client.$schema.rls;
+    const rlsValues = this.client.$options.rls;
+    const isTransaction = this.driver.isTransactionConnection(connection);
+    const needsRls = rlsDef && rlsValues;
+    const needsRlsInit = needsRls && (!isTransaction || !this.rlsInitializedConnections.has(connection));
     const trackSlowQuery = this.options.diagnostics !== void 0;
     const startTimestamp = trackSlowQuery ? performance.now() : void 0;
     const startedAt = trackSlowQuery ? /* @__PURE__ */ new Date() : void 0;
     try {
+      if (needsRlsInit) {
+        if (!isTransaction) {
+          await connection.executeQuery({
+            sql: "BEGIN",
+            parameters: [],
+            query: {
+              kind: "RawNode"
+            },
+            queryId: createQueryId3()
+          });
+        }
+        await applyRlsContext(connection, rlsDef, rlsValues);
+        if (isTransaction) {
+          this.rlsInitializedConnections.add(connection);
+        }
+      }
       const result = await connection.executeQuery(compiledQuery);
+      if (needsRlsInit && !isTransaction) {
+        await connection.executeQuery({
+          sql: "COMMIT",
+          parameters: [],
+          query: {
+            kind: "RawNode"
+          },
+          queryId: createQueryId3()
+        });
+      }
       if (startTimestamp !== void 0) {
         this.trackSlowQuery(compiledQuery, startTimestamp, startedAt);
       }
       return this.ensureProperQueryResult(compiledQuery.query, result);
     } catch (err) {
+      if (needsRlsInit && !isTransaction) {
+        try {
+          await connection.executeQuery({
+            sql: "ROLLBACK",
+            parameters: [],
+            query: {
+              kind: "RawNode"
+            },
+            queryId: createQueryId3()
+          });
+        } catch {
+        }
+      }
       throw createDBQueryError(`Failed to execute query: ${err}`, err, compiledQuery.sql, compiledQuery.parameters);
     }
   }