@zenstackhq/runtime 2.0.0-beta.3 → 2.0.0-beta.5

package/enhancements/policy/handler.d.ts

@@ -16,15 +16,14 @@ export declare class PolicyProxyHandler<DbClient extends DbClientContract> imple
     private readonly queryUtils;
     constructor(prisma: DbClient, model: string, options: InternalEnhancementOptions, context?: EnhancementContext | undefined);
     private get modelClient();
-    findUnique(args: any): Promise<unknown>;
-    findUniqueOrThrow(args: any): Promise<unknown>;
-    findFirst(args?: any): Promise<unknown>;
-    findFirstOrThrow(args: any): Promise<unknown>;
+    findUnique(args: any): Promise<any>;
+    findUniqueOrThrow(args: any): Promise<any>;
+    findFirst(args?: any): Promise<any>;
+    findFirstOrThrow(args: any): Promise<any>;
     findMany(args?: any): Promise<unknown[]>;
-    private findWithFluentCallStubs;
+    private findWithFluent;
+    private addFluentSelect;
     private doFind;
-    private fluentCall;
-    private addFluentFunctions;
     create(args: any): Promise<unknown>;
     private doCreate;
     private hasNestedCreateOrConnect;
@@ -54,7 +53,6 @@ export declare class PolicyProxyHandler<DbClient extends DbClientContract> imple
     subscribe(args: any): Promise<any>;
     private get shouldLogQuery();
     private runPostWriteChecks;
-    private makeHandler;
     private requireBackLink;
     private mergeToParent;
     private removeFromParent;

package/enhancements/policy/handler.js

@@ -32,10 +32,10 @@ const zod_validation_error_1 = require("zod-validation-error");
 const constants_1 = require("../../constants");
 const cross_1 = require("../../cross");
 const logger_1 = require("../logger");
+const promise_1 = require("../promise");
 const query_utils_1 = require("../query-utils");
 const utils_1 = require("../utils");
 const policy_utils_1 = require("./policy-utils");
-const promise_1 = require("./promise");
 /**
  * Prisma proxy handler for injecting access policy check.
  */
@@ -62,7 +62,7 @@ class PolicyProxyHandler {
         if (!args.where) {
             throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'where field is required in query argument');
         }
-        return this.findWithFluentCallStubs(args, 'findUnique', false, () => null);
+        return this.findWithFluent('findUnique', args, () => null);
     }
     findUniqueOrThrow(args) {
         if (!args) {
@@ -71,110 +71,60 @@ class PolicyProxyHandler {
         if (!args.where) {
             throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'where field is required in query argument');
         }
-        return this.findWithFluentCallStubs(args, 'findUniqueOrThrow', true, () => {
+        return this.findWithFluent('findUniqueOrThrow', args, () => {
             throw this.policyUtils.notFound(this.model);
         });
     }
     findFirst(args) {
-        return this.findWithFluentCallStubs(args, 'findFirst', false, () => null);
+        return this.findWithFluent('findFirst', args, () => null);
     }
     findFirstOrThrow(args) {
-        return this.findWithFluentCallStubs(args, 'findFirstOrThrow', true, () => {
+        return this.findWithFluent('findFirstOrThrow', args, () => {
             throw this.policyUtils.notFound(this.model);
         });
     }
     findMany(args) {
         return (0, promise_1.createDeferredPromise)(() => this.doFind(args, 'findMany', () => []));
     }
-    // returns a promise for the given find operation, together with function stubs for fluent API calls
-    findWithFluentCallStubs(args, actionName, resolveRoot, handleRejection) {
-        // create a deferred promise so it's only evaluated when awaited or .then() is called
-        const result = (0, promise_1.createDeferredPromise)(() => this.doFind(args, actionName, handleRejection));
-        this.addFluentFunctions(result, this.model, args === null || args === void 0 ? void 0 : args.where, resolveRoot ? result : undefined);
-        return result;
+    // make a find query promise with fluent API call stubs installed
+    findWithFluent(method, args, handleRejection) {
+        args = this.policyUtils.clone(args);
+        return (0, promise_1.createFluentPromise)(() => this.doFind(args, method, handleRejection), args, this.options.modelMeta, this.model);
+    }
+    addFluentSelect(args, field, fluentArgs) {
+        // overwrite include/select with the fluent field
+        delete args.include;
+        args.select = { [field]: fluentArgs !== null && fluentArgs !== void 0 ? fluentArgs : true };
     }
     doFind(args, actionName, handleRejection) {
-        const origArgs = args;
-        const _args = this.policyUtils.clone(args);
-        if (!this.policyUtils.injectForRead(this.prisma, this.model, _args)) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const origArgs = args;
+            const _args = this.policyUtils.clone(args);
+            if (!this.policyUtils.injectForRead(this.prisma, this.model, _args)) {
+                if (this.shouldLogQuery) {
+                    this.logger.info(`[policy] \`${actionName}\` ${this.model}: unconditionally denied`);
+                }
+                return handleRejection();
+            }
+            this.policyUtils.injectReadCheckSelect(this.model, _args);
             if (this.shouldLogQuery) {
-                this.logger.info(`[policy] \`${actionName}\` ${this.model}: unconditionally denied`);
+                this.logger.info(`[policy] \`${actionName}\` ${this.model}:\n${(0, utils_1.formatObject)(_args)}`);
             }
-            return handleRejection();
-        }
-        this.policyUtils.injectReadCheckSelect(this.model, _args);
-        if (this.shouldLogQuery) {
-            this.logger.info(`[policy] \`${actionName}\` ${this.model}:\n${(0, utils_1.formatObject)(_args)}`);
-        }
-        return new Promise((resolve, reject) => {
-            this.modelClient[actionName](_args).then((value) => {
-                this.policyUtils.postProcessForRead(value, this.model, origArgs);
-                resolve(value);
-            }, (err) => reject(err));
+            const result = yield this.modelClient[actionName](_args);
+            this.policyUtils.postProcessForRead(result, this.model, origArgs);
+            return result;
         });
     }
-    // returns a fluent API call function
-    fluentCall(filter, fieldInfo, rootPromise) {
-        return (args) => {
-            args = this.policyUtils.clone(args);
-            // combine the parent filter with the current one
-            const backLinkField = this.requireBackLink(fieldInfo);
-            const condition = backLinkField.isArray
-                ? { [backLinkField.name]: { some: filter } }
-                : { [backLinkField.name]: { is: filter } };
-            args.where = this.policyUtils.and(args.where, condition);
-            const promise = (0, promise_1.createDeferredPromise)(() => {
-                // Promise for fetching
-                const fetchFluent = (resolve, reject) => {
-                    const handler = this.makeHandler(fieldInfo.type);
-                    if (fieldInfo.isArray) {
-                        // fluent call stops here
-                        handler.findMany(args).then((value) => resolve(value), (err) => reject(err));
-                    }
-                    else {
-                        handler.findFirst(args).then((value) => resolve(value), (err) => reject(err));
-                    }
-                };
-                return new Promise((resolve, reject) => {
-                    if (rootPromise) {
-                        // if a root promise exists, resolve it before fluent API call,
-                        // so that fluent calls start with `findUniqueOrThrow` and `findFirstOrThrow`
-                        // can throw error properly if the root promise is rejected
-                        rootPromise.then(() => fetchFluent(resolve, reject), (err) => reject(err));
-                    }
-                    else {
-                        fetchFluent(resolve, reject);
-                    }
-                });
-            });
-            if (!fieldInfo.isArray) {
-                // prepare for a chained fluent API call
-                this.addFluentFunctions(promise, fieldInfo.type, args.where, rootPromise);
-            }
-            return promise;
-        };
-    }
-    // add fluent API functions to the given promise
-    addFluentFunctions(promise, model, filter, rootPromise) {
-        const fields = this.policyUtils.getModelFields(model);
-        if (fields) {
-            for (const [field, fieldInfo] of Object.entries(fields)) {
-                if (fieldInfo.isDataModel) {
-                    promise[field] = this.fluentCall(filter, fieldInfo, rootPromise);
-                }
-            }
-        }
-    }
     //#endregion
     //#region Create
     create(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!args) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
-            }
-            if (!args.data) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'data field is required in query argument');
-            }
+        if (!args) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
+        }
+        if (!args.data) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'data field is required in query argument');
+        }
+        return (0, promise_1.createDeferredPromise)(() => __awaiter(this, void 0, void 0, function* () {
             this.policyUtils.tryReject(this.prisma, this.model, 'create');
             const origArgs = args;
             args = this.policyUtils.clone(args);
@@ -217,7 +167,7 @@ class PolicyProxyHandler {
             else {
                 return result;
             }
-        });
+        }));
     }
     // create with nested write
     doCreate(model, args, db) {
@@ -399,13 +349,13 @@ class PolicyProxyHandler {
         }
     }
     createMany(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!args) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
-            }
-            if (!args.data) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'data field is required in query argument');
-            }
+        if (!args) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
+        }
+        if (!args.data) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'data field is required in query argument');
+        }
+        return (0, promise_1.createDeferredPromise)(() => __awaiter(this, void 0, void 0, function* () {
             this.policyUtils.tryReject(this.prisma, this.model, 'create');
             args = this.policyUtils.clone(args);
             // go through create items, statically check input to determine if post-create
@@ -441,7 +391,7 @@ class PolicyProxyHandler {
                     return result;
                 }));
             }
-        });
+        }));
     }
     doCreateMany(model, args, db) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -543,16 +493,16 @@ class PolicyProxyHandler {
     // "updateMany" works against a set of entities, entities not passing policy check are silently
     // ignored
     update(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!args) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
-            }
-            if (!args.where) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'where field is required in query argument');
-            }
-            if (!args.data) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'data field is required in query argument');
-            }
+        if (!args) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
+        }
+        if (!args.where) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'where field is required in query argument');
+        }
+        if (!args.data) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'data field is required in query argument');
+        }
+        return (0, promise_1.createDeferredPromise)(() => __awaiter(this, void 0, void 0, function* () {
             args = this.policyUtils.clone(args);
             const { result, error } = yield this.queryUtils.transaction(this.prisma, (tx) => __awaiter(this, void 0, void 0, function* () {
                 // proceed with nested writes and collect post-write checks
@@ -568,7 +518,7 @@ class PolicyProxyHandler {
             else {
                 return result;
             }
-        });
+        }));
     }
     doUpdate(args, db) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -922,17 +872,17 @@ class PolicyProxyHandler {
         }
     }
     updateMany(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!args) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
-            }
-            if (!args.data) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'data field is required in query argument');
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.options, 'query argument is required');
-            }
-            if (!args.data) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.options, 'data field is required in query argument');
-            }
+        if (!args) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
+        }
+        if (!args.data) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'data field is required in query argument');
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.options, 'query argument is required');
+        }
+        if (!args.data) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.options, 'data field is required in query argument');
+        }
+        return (0, promise_1.createDeferredPromise)(() => {
             this.policyUtils.tryReject(this.prisma, this.model, 'update');
             args = this.policyUtils.clone(args);
             this.policyUtils.injectAuthGuardAsWhere(this.prisma, args, this.model, 'update');
@@ -976,19 +926,19 @@ class PolicyProxyHandler {
         });
     }
     upsert(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!args) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
-            }
-            if (!args.where) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'where field is required in query argument');
-            }
-            if (!args.create) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'create field is required in query argument');
-            }
-            if (!args.update) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'update field is required in query argument');
-            }
+        if (!args) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
+        }
+        if (!args.where) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'where field is required in query argument');
+        }
+        if (!args.create) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'create field is required in query argument');
+        }
+        if (!args.update) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'update field is required in query argument');
+        }
+        return (0, promise_1.createDeferredPromise)(() => __awaiter(this, void 0, void 0, function* () {
             this.policyUtils.tryReject(this.prisma, this.model, 'create');
             this.policyUtils.tryReject(this.prisma, this.model, 'update');
             args = this.policyUtils.clone(args);
@@ -1016,20 +966,20 @@ class PolicyProxyHandler {
             else {
                 return result;
             }
-        });
+        }));
     }
     //#endregion
     //#region Delete
     // "delete" works against a single entity, and is rejected if the entity fails policy check.
     // "deleteMany" works against a set of entities, entities that fail policy check are filtered out.
     delete(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!args) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
-            }
-            if (!args.where) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'where field is required in query argument');
-            }
+        if (!args) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
+        }
+        if (!args.where) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'where field is required in query argument');
+        }
+        return (0, promise_1.createDeferredPromise)(() => __awaiter(this, void 0, void 0, function* () {
             this.policyUtils.tryReject(this.prisma, this.model, 'delete');
             const { result, error } = yield this.queryUtils.transaction(this.prisma, (tx) => __awaiter(this, void 0, void 0, function* () {
                 // do a read-back before delete
@@ -1053,10 +1003,10 @@ class PolicyProxyHandler {
             else {
                 return result;
             }
-        });
+        }));
     }
     deleteMany(args) {
-        return __awaiter(this, void 0, void 0, function* () {
+        return (0, promise_1.createDeferredPromise)(() => {
             this.policyUtils.tryReject(this.prisma, this.model, 'delete');
             // inject policy conditions
             args = args !== null && args !== void 0 ? args : {};
@@ -1071,10 +1021,10 @@ class PolicyProxyHandler {
     //#endregion
     //#region Aggregation
     aggregate(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!args) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
-            }
+        if (!args) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
+        }
+        return (0, promise_1.createDeferredPromise)(() => {
             args = this.policyUtils.clone(args);
             // inject policy conditions
             this.policyUtils.injectAuthGuardAsWhere(this.prisma, args, this.model, 'read');
@@ -1085,10 +1035,10 @@ class PolicyProxyHandler {
         });
     }
     groupBy(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!args) {
-                throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
-            }
+        if (!args) {
+            throw (0, utils_1.prismaClientValidationError)(this.prisma, this.prismaModule, 'query argument is required');
+        }
+        return (0, promise_1.createDeferredPromise)(() => {
             args = this.policyUtils.clone(args);
             // inject policy conditions
             this.policyUtils.injectAuthGuardAsWhere(this.prisma, args, this.model, 'read');
@@ -1099,7 +1049,7 @@ class PolicyProxyHandler {
         });
     }
     count(args) {
-        return __awaiter(this, void 0, void 0, function* () {
+        return (0, promise_1.createDeferredPromise)(() => {
             // inject policy conditions
             args = args ? this.policyUtils.clone(args) : {};
             this.policyUtils.injectAuthGuardAsWhere(this.prisma, args, this.model, 'read');
@@ -1112,7 +1062,7 @@ class PolicyProxyHandler {
     //#endregion
     //#region Subscribe (Prisma Pulse)
     subscribe(args) {
-        return __awaiter(this, void 0, void 0, function* () {
+        return (0, promise_1.createDeferredPromise)(() => {
             const readGuard = this.policyUtils.getAuthGuard(this.prisma, this.model, 'read');
             if (this.policyUtils.isTrue(readGuard)) {
                 // no need to inject
@@ -1164,9 +1114,6 @@ class PolicyProxyHandler {
             yield Promise.all(postWriteChecks.map(({ model, operation, uniqueFilter, preValue }) => __awaiter(this, void 0, void 0, function* () { return this.policyUtils.checkPolicyForUnique(model, uniqueFilter, operation, db, undefined, preValue); })));
         });
     }
-    makeHandler(model) {
-        return new PolicyProxyHandler(this.prisma, model, this.options, this.context);
-    }
     requireBackLink(fieldInfo) {
         (0, tiny_invariant_1.default)(fieldInfo.backLink, `back link not found for field ${fieldInfo.name}`);
         return (0, cross_1.requireField)(this.modelMeta, fieldInfo.type, fieldInfo.backLink);