@protobase/schema 0.40.6 → 0.40.7

package/dist/access/rule.d.ts

@@ -2,9 +2,9 @@ import { AccessFn } from "./types.js";
 //#region src/access/rule.d.ts
 /** An access function that can be combined with plain functions or other rules. */
 export type Rule<R = any> = AccessFn<R> & {
-  /** Both must allow; filters are ANDed. */
+  /** Both must allow; filters are ANDed. The other side is not run once this one denies. */
   and: (other: AccessFn<R>) => Rule<R>;
-  /** Either may allow; filters are ORed. */
+  /** Either may allow; filters are ORed. The other side is not run once this one allows. */
   or: (other: AccessFn<R>) => Rule<R>;
 };
 /**

package/dist/access/rule.js

@@ -1,6 +1,22 @@
-import { andResults, orResults } from "./combine.js";
+import { andResults, normalize, orResults } from "./combine.js";
 //#region src/access/rule.ts
-const combine = (join, left, right) => async (ctx, record, input) => join(await left(ctx, record, input), await right(ctx, record, input));
+const settle = async (fn, ...args) => {
+	try {
+		return { result: normalize(await fn(...args)) };
+	} catch (error) {
+		if (error instanceof TypeError) return { error };
+		throw error;
+	}
+};
+const combine = (join, decided, left, right) => async (...args) => {
+	const a = await settle(left, ...args);
+	if (a.result === decided) return decided;
+	const b = await settle(right, ...args);
+	if (b.result === decided) return decided;
+	if (a.error) throw a.error;
+	if (b.error) throw b.error;
+	return join(a.result, b.result);
+};
 /**
 * Wraps an access function so it combines with others through `.and()` and `.or()`; `roles.can()` and `roles.is()`
 * return such rules already.
@@ -12,8 +28,8 @@ const combine = (join, left, right) => async (ctx, record, input) => join(await
 * ```
 */
 const rule = (fn) => Object.assign((ctx, record, input) => fn(ctx, record, input), {
-	and: (other) => rule(combine(andResults, fn, other)),
-	or: (other) => rule(combine(orResults, fn, other))
+	and: (other) => rule(combine(andResults, false, fn, other)),
+	or: (other) => rule(combine(orResults, true, fn, other))
 });
 //#endregion
 export { rule };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/schema",
-  "version": "0.40.6",
+  "version": "0.40.7",
   "description": "Resource, field, view and access definitions for Protobase configs.",
   "license": "Apache-2.0",
   "repository": {