@stonecrop/casl-middleware 0.13.4 → 0.13.5

package/dist/casl-middleware.d.ts

@@ -95,7 +95,7 @@ export declare interface FieldPermission {
  * Middleware function that wraps a GraphQL resolver with authorization logic
  * @public
  */
-export declare type MiddlewareFn = (resolve: ResolverFn, root: any, args: any, context: Context, info: GraphQLResolveInfo) => Promise<any> | any;
+export declare type MiddlewareFn = (resolve: ResolverFn, root: any, args: any, context: Context, info: GraphQLResolveInfo) => any;
 
 /**
  * Configuration options for CASL middleware
@@ -140,7 +140,7 @@ export declare interface PluginOptions extends MiddlewareOptions {
  * GraphQL resolver function type
  * @public
  */
-export declare type ResolverFn = (root: any, args: any, context: Context, info: GraphQLResolveInfo) => Promise<any> | any;
+export declare type ResolverFn = (root: any, args: any, context: Context, info: GraphQLResolveInfo) => any;
 
 /**
  * User information for authorization

package/dist/casl-middleware.js

@@ -164,22 +164,22 @@ function Ce(e) {
 }
 function Z(e, t) {
   const n = e.locationOffset.column - 1, s = "".padStart(n) + e.body, i = t.line - 1, r = e.locationOffset.line - 1, a = t.line + r, l = t.line === 1 ? n : 0, p = t.column + l, u = `${e.name}:${a}:${p}
-`, h = s.split(/\r\n|[\n\r]/g), d = h[i];
-  if (d.length > 120) {
-    const f = Math.floor(p / 80), x = p % 80, E = [];
-    for (let N = 0; N < d.length; N += 80)
-      E.push(d.slice(N, N + 80));
+`, h = s.split(/\r\n|[\n\r]/g), E = h[i];
+  if (E.length > 120) {
+    const d = Math.floor(p / 80), x = p % 80, f = [];
+    for (let N = 0; N < E.length; N += 80)
+      f.push(E.slice(N, N + 80));
     return u + Y([
-      [`${a} |`, E[0]],
-      ...E.slice(1, f + 1).map((N) => ["|", N]),
+      [`${a} |`, f[0]],
+      ...f.slice(1, d + 1).map((N) => ["|", N]),
       ["|", "^".padStart(x)],
-      ["|", E[f + 1]]
+      ["|", f[d + 1]]
     ]);
   }
   return u + Y([
     // Lines specified like this: ["prefix", "string"],
     [`${a - 1} |`, h[i - 1]],
-    [`${a} |`, d],
+    [`${a} |`, E],
     ["|", "^".padStart(p)],
     [`${a + 1} |`, h[i + 1]]
   ]);
@@ -252,18 +252,18 @@ class B extends Error {
    */
   constructor(t, ...n) {
     var s, i, r;
-    const { nodes: a, source: l, positions: p, path: u, originalError: h, extensions: d } = ke(n);
+    const { nodes: a, source: l, positions: p, path: u, originalError: h, extensions: E } = ke(n);
     super(t), this.name = "GraphQLError", this.path = u ?? void 0, this.originalError = h ?? void 0, this.nodes = J(
       Array.isArray(a) ? a : a ? [a] : void 0
     );
-    const f = J(
-      (s = this.nodes) === null || s === void 0 ? void 0 : s.map((E) => E.loc).filter((E) => E != null)
+    const d = J(
+      (s = this.nodes) === null || s === void 0 ? void 0 : s.map((f) => f.loc).filter((f) => f != null)
     );
-    this.source = l ?? (f == null || (i = f[0]) === null || i === void 0 ? void 0 : i.source), this.positions = p ?? f?.map((E) => E.start), this.locations = p && l ? p.map((E) => M(l, E)) : f?.map((E) => M(E.source, E.start));
+    this.source = l ?? (d == null || (i = d[0]) === null || i === void 0 ? void 0 : i.source), this.positions = p ?? d?.map((f) => f.start), this.locations = p && l ? p.map((f) => M(l, f)) : d?.map((f) => M(f.source, f.start));
     const x = ve(
       h?.extensions
     ) ? h?.extensions : void 0;
-    this.extensions = (r = d ?? x) !== null && r !== void 0 ? r : /* @__PURE__ */ Object.create(null), Object.defineProperties(this, {
+    this.extensions = (r = E ?? x) !== null && r !== void 0 ? r : /* @__PURE__ */ Object.create(null), Object.defineProperties(this, {
       message: {
         writable: !0,
         enumerable: !0
@@ -2170,13 +2170,13 @@ function ze(e, t, n = ee) {
   const s = /* @__PURE__ */ new Map();
   for (const y of Object.values(c))
     s.set(y, He(t, y));
-  let i, r = Array.isArray(e), a = [e], l = -1, p = [], u = e, h, d;
-  const f = [], x = [];
+  let i, r = Array.isArray(e), a = [e], l = -1, p = [], u = e, h, E;
+  const d = [], x = [];
   do {
     l++;
     const y = l === a.length, C = y && p.length !== 0;
     if (y) {
-      if (h = x.length === 0 ? void 0 : f[f.length - 1], u = d, d = x.pop(), C)
+      if (h = x.length === 0 ? void 0 : d[d.length - 1], u = E, E = x.pop(), C)
         if (r) {
           u = u.slice();
           let A = 0;
@@ -2190,33 +2190,33 @@ function ze(e, t, n = ee) {
             u[A] = F;
         }
       l = i.index, a = i.keys, p = i.edits, r = i.inArray, i = i.prev;
-    } else if (d) {
-      if (h = r ? l : a[l], u = d[h], u == null)
+    } else if (E) {
+      if (h = r ? l : a[l], u = E[h], u == null)
         continue;
-      f.push(h);
+      d.push(h);
     }
     let I;
     if (!Array.isArray(u)) {
-      var E, N;
+      var f, N;
       Q(u) || b(!1, `Invalid AST Node: ${V(u)}.`);
-      const A = y ? (E = s.get(u.kind)) === null || E === void 0 ? void 0 : E.leave : (N = s.get(u.kind)) === null || N === void 0 ? void 0 : N.enter;
-      if (I = A?.call(t, u, h, d, f, x), I === qe)
+      const A = y ? (f = s.get(u.kind)) === null || f === void 0 ? void 0 : f.leave : (N = s.get(u.kind)) === null || N === void 0 ? void 0 : N.enter;
+      if (I = A?.call(t, u, h, E, d, x), I === qe)
         break;
       if (I === !1) {
         if (!y) {
-          f.pop();
+          d.pop();
           continue;
         }
       } else if (I !== void 0 && (p.push([h, I]), !y))
         if (Q(I))
           u = I;
         else {
-          f.pop();
+          d.pop();
           continue;
         }
     }
     if (I === void 0 && C && p.push([h, u]), y)
-      f.pop();
+      d.pop();
     else {
       var S;
       i = {
@@ -2225,7 +2225,7 @@ function ze(e, t, n = ee) {
         keys: a,
         edits: p,
         prev: i
-      }, r = Array.isArray(u), a = r ? u : (S = n[u.kind]) !== null && S !== void 0 ? S : [], l = -1, p = [], d && x.push(d), d = u;
+      }, r = Array.isArray(u), a = r ? u : (S = n[u.kind]) !== null && S !== void 0 ? S : [], l = -1, p = [], E && x.push(E), E = u;
     }
   } while (i !== void 0);
   return p.length !== 0 ? p[p.length - 1][1] : e;
@@ -2277,17 +2277,17 @@ const We = (e) => e.operation.operation.toLowerCase(), Ze = (e) => e.path.typena
   } = e;
   return async (a, l, p, u, h) => {
     u.ability || (u.ability = await z(u.user, i));
-    const d = We(h), f = Ze(h), x = n[d] || d, E = h.parentType.name, N = t[E] || E;
-    if (r && console.log(`Checking permission: ${x} on ${N} at ${f}`), s[f] && !s[f].some(
+    const E = We(h), d = Ze(h), x = n[E] || E, f = h.parentType.name, N = t[f] || f;
+    if (r && console.debug(`Checking permission: ${x} on ${N} at ${d}`), s[d] && !s[d].some(
       (I) => (
         // Don't pass resolver args here - only use them if the permission defines conditions
         P(u, I.action, I.subject, I.conditions)
       )
     ))
-      throw new $(`Access denied for field ${f}`);
+      throw new $(`Access denied for field ${d}`);
     if (!P(u, x, N))
       throw new $(`Access denied for ${x} on ${N}`);
-    if (d === "mutation" && p.input) {
+    if (E === "mutation" && p.input) {
       const y = h.operation.loc?.source.body;
       if (y) {
         const C = Ke(y);
@@ -2341,25 +2341,22 @@ const We = (e) => e.operation.operation.toLowerCase(), Ze = (e) => e.path.typena
       Mutation: {
         plans: {
           async createAbility(i, r) {
-            const a = r.getRaw().input, l = a.userId, p = a.roles;
-            return s(
-              [l, p],
-              async ([u, h]) => {
-                try {
-                  return {
-                    success: !0,
-                    ability: (await z({ id: u, roles: h })).rules,
-                    message: "Ability created successfully"
-                  };
-                } catch (d) {
-                  return {
-                    success: !1,
-                    ability: null,
-                    message: d instanceof Error ? d.message : "Unknown error occurred"
-                  };
-                }
+            const a = r.getRaw().input.userId, l = r.getRaw().input.roles;
+            return s([a, l], async ([p, u]) => {
+              try {
+                return {
+                  success: !0,
+                  ability: (await z({ id: p, roles: u })).rules,
+                  message: "Ability created successfully"
+                };
+              } catch (h) {
+                return {
+                  success: !1,
+                  ability: null,
+                  message: h instanceof Error ? h.message : "Unknown error occurred"
+                };
               }
-            );
+            });
           }
         }
       }