@porulle/core 0.20.0 → 0.20.1

package/dist/kernel/database/scoped-db.d.ts

@@ -5,6 +5,7 @@
  * org-scoped tables automatically include the actor's organizationId,
  * and SELECT / UPDATE / DELETE against org-scoped tables constrain rows to
  * that organization — including when the caller supplies no WHERE clause.
+ * Joins and ordering stay within the organization scope across the fluent chain.
  *
  * Plugin route handlers receive this scoped db via PluginContext.database.db
  * (organization resolved per operation from AsyncLocalStorage when used from

package/dist/kernel/database/scoped-db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scoped-db.d.ts","sourceRoot":"","sources":["../../../src/kernel/database/scoped-db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAMH,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;AAuD3D,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,oBAAoB,GAAG,GAAG,CA2GpF"}
+{"version":3,"file":"scoped-db.d.ts","sourceRoot":"","sources":["../../../src/kernel/database/scoped-db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAMH,MAAM,MAAM,oBAAoB,GAAG,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;AAgE3D,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,oBAAoB,GAAG,GAAG,CA2GpF"}

package/dist/kernel/database/scoped-db.js

@@ -5,6 +5,7 @@
  * org-scoped tables automatically include the actor's organizationId,
  * and SELECT / UPDATE / DELETE against org-scoped tables constrain rows to
  * that organization — including when the caller supplies no WHERE clause.
+ * Joins and ordering stay within the organization scope across the fluent chain.
  *
  * Plugin route handlers receive this scoped db via PluginContext.database.db
  * (organization resolved per operation from AsyncLocalStorage when used from
@@ -57,7 +58,17 @@ function wrapWhereable(builder, orgEq) {
                     return wrapWhereable(next, orgEq);
                 };
             }
-            return typeof sv === "function" ? sv.bind(st) : sv;
+            if (typeof sv !== "function")
+                return sv;
+            return (...args) => {
+                const next = sv.call(st, ...args);
+                if (next !== null && (typeof next === "object" || typeof next === "function")) {
+                    const where = Reflect.get(next, "where");
+                    if (typeof where === "function")
+                        return wrapWhereable(next, orgEq);
+                }
+                return next;
+            };
         },
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@porulle/core",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "license": "MIT",
   "type": "module",
   "exports": {

package/src/kernel/database/scoped-db.ts

@@ -5,6 +5,7 @@
  * org-scoped tables automatically include the actor's organizationId,
  * and SELECT / UPDATE / DELETE against org-scoped tables constrain rows to
  * that organization — including when the caller supplies no WHERE clause.
+ * Joins and ordering stay within the organization scope across the fluent chain.
  *
  * Plugin route handlers receive this scoped db via PluginContext.database.db
  * (organization resolved per operation from AsyncLocalStorage when used from
@@ -63,7 +64,16 @@ function wrapWhereable(builder: unknown, orgEq: SQL): unknown {
           return wrapWhereable(next, orgEq);
         };
       }
-      return typeof sv === "function" ? sv.bind(st) : sv;
+      if (typeof sv !== "function") return sv;
+
+      return (...args: unknown[]) => {
+        const next = (sv as (...a: unknown[]) => unknown).call(st, ...args);
+        if (next !== null && (typeof next === "object" || typeof next === "function")) {
+          const where = Reflect.get(next, "where");
+          if (typeof where === "function") return wrapWhereable(next, orgEq);
+        }
+        return next;
+      };
     },
   });
 }