Release 1.1.4

dennemark · Dec 4, 2024 · 5234086 · 5234086
1 parent 56cde5f
commit 5234086
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 
 
+## [1.1.4](https://github.com/dennemark/prisma-extension-casl/compare/1.1.3...1.1.4) (2024-12-04)
+
+### Bug Fixes
+
+* :bug: try fixing batching ([56cde5f](https://github.com/dennemark/prisma-extension-casl/commit/56cde5fba2b61c9968ca1f4ea8d9b27c093bffec))
+
 ## [1.1.3](https://github.com/dennemark/prisma-extension-casl/compare/1.1.2...1.1.3) (2024-11-29)
 
 ### Bug Fixes

diff --git a/dist/index.d.mts b/dist/index.d.mts
@@ -109,5 +109,6 @@ declare function useCaslAbilities(getAbilityFactory: () => AbilityBuilder<PureAb
         };
     };
 };
+declare function getBatchId(query: any): string | undefined;
 
-export { applyCaslToQuery, useCaslAbilities };
+export { applyCaslToQuery, getBatchId, useCaslAbilities };
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -109,5 +109,6 @@ declare function useCaslAbilities(getAbilityFactory: () => AbilityBuilder<PureAb
         };
     };
 };
+declare function getBatchId(query: any): string | undefined;
 
-export { applyCaslToQuery, useCaslAbilities };
+export { applyCaslToQuery, getBatchId, useCaslAbilities };
diff --git a/dist/index.js b/dist/index.js
@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   applyCaslToQuery: () => applyCaslToQuery,
+  getBatchId: () => getBatchId,
   useCaslAbilities: () => useCaslAbilities
 });
 module.exports = __toCommonJS(src_exports);
@@ -1585,6 +1586,7 @@ function useCaslAbilities(getAbilityFactory, opts) {
           return transactionQuery(client._createItxClient(transaction));
         } else {
           return client.$transaction(async (tx) => {
+            tx[Symbol.for("prisma.client.transaction.id")] = "casl-extension-" + tx[Symbol.for("prisma.client.transaction.id")];
             return transactionQuery(tx);
           }, {
             //https://github.com/prisma/prisma/issues/20015
@@ -1594,6 +1596,12 @@ function useCaslAbilities(getAbilityFactory, opts) {
         }
       }
     });
+    client._requestHandler.dataloader.options.batchBy = (request) => {
+      if (request.transaction?.id && !request.transaction?.id?.toString().startsWith("casl-extension-")) {
+        return `transaction-${request.transaction.id}`;
+      }
+      return getBatchId(request.protocolQuery);
+    };
     return client.$extends({
       name: "prisma-extension-casl",
       client: {
@@ -1621,8 +1629,33 @@ function useCaslAbilities(getAbilityFactory, opts) {
     });
   });
 }
+function getBatchId(query) {
+  if (query.action !== "findUnique" && query.action !== "findUniqueOrThrow") {
+    return void 0;
+  }
+  const parts = [];
+  if (query.modelName) {
+    parts.push(query.modelName);
+  }
+  if (query.query.arguments) {
+    parts.push(buildKeysString(query.query.arguments));
+  }
+  parts.push(buildKeysString(query.query.selection));
+  return parts.join("");
+}
+function buildKeysString(obj) {
+  const keysArray = Object.keys(obj).sort().map((key) => {
+    const value = obj[key];
+    if (typeof value === "object" && value !== null) {
+      return `(${key} ${buildKeysString(value)})`;
+    }
+    return key;
+  });
+  return `(${keysArray.join(" ")})`;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   applyCaslToQuery,
+  getBatchId,
   useCaslAbilities
 });
diff --git a/dist/index.mjs b/dist/index.mjs
@@ -1560,6 +1560,7 @@ function useCaslAbilities(getAbilityFactory, opts) {
           return transactionQuery(client._createItxClient(transaction));
         } else {
           return client.$transaction(async (tx) => {
+            tx[Symbol.for("prisma.client.transaction.id")] = "casl-extension-" + tx[Symbol.for("prisma.client.transaction.id")];
             return transactionQuery(tx);
           }, {
             //https://github.com/prisma/prisma/issues/20015
@@ -1569,6 +1570,12 @@ function useCaslAbilities(getAbilityFactory, opts) {
         }
       }
     });
+    client._requestHandler.dataloader.options.batchBy = (request) => {
+      if (request.transaction?.id && !request.transaction?.id?.toString().startsWith("casl-extension-")) {
+        return `transaction-${request.transaction.id}`;
+      }
+      return getBatchId(request.protocolQuery);
+    };
     return client.$extends({
       name: "prisma-extension-casl",
       client: {
@@ -1596,7 +1603,32 @@ function useCaslAbilities(getAbilityFactory, opts) {
     });
   });
 }
+function getBatchId(query) {
+  if (query.action !== "findUnique" && query.action !== "findUniqueOrThrow") {
+    return void 0;
+  }
+  const parts = [];
+  if (query.modelName) {
+    parts.push(query.modelName);
+  }
+  if (query.query.arguments) {
+    parts.push(buildKeysString(query.query.arguments));
+  }
+  parts.push(buildKeysString(query.query.selection));
+  return parts.join("");
+}
+function buildKeysString(obj) {
+  const keysArray = Object.keys(obj).sort().map((key) => {
+    const value = obj[key];
+    if (typeof value === "object" && value !== null) {
+      return `(${key} ${buildKeysString(value)})`;
+    }
+    return key;
+  });
+  return `(${keysArray.join(" ")})`;
+}
 export {
   applyCaslToQuery,
+  getBatchId,
   useCaslAbilities
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prisma-extension-casl",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Enforce casl abilities on prisma client ",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",