@cedarjs/tenancy 8.0.0-canary.3556 → 8.0.0-canary.3559

package/dist/prismaExtension.d.ts

@@ -72,14 +72,43 @@ type ExtendableClient = {
  * an unscoped one allows.
  */
 type RawSqlMethod = '$queryRaw' | '$queryRawUnsafe' | '$executeRaw' | '$executeRawUnsafe';
+/**
+ * Raw SQL typed the way the un-extended client types it, instead of as
+ * always throwing.
+ */
+type AllowedRawSql<TClient> = Pick<TClient, Extract<keyof TClient, RawSqlMethod>>;
+/**
+ * The `tx` and the options of `TDb`'s interactive `$transaction`, read from
+ * Prisma's own signature. A conditional type matches the last overload, which
+ * for Prisma is the interactive one (the batch form comes first).
+ */
+type InteractiveTransaction<TDb> = TDb extends {
+    $transaction: (fn: (tx: infer Tx) => Promise<unknown>, options?: infer Options) => Promise<unknown>;
+} ? {
+    tx: Tx;
+    options: Options;
+} : never;
+/**
+ * The `$transaction` of `db.$withoutTenant()`: its callback's `tx` is `db`'s
+ * own transaction client with raw SQL allowed, like the client it was started
+ * on (at runtime it's built from that unscoped client). `db`'s own overloads
+ * follow it, unchanged: the batch form, and the callback form for a callback
+ * that names `db`'s `tx` type. Keeping them also lets TypeScript call
+ * `$transaction` on a union of `db` and the unscoped client, using the
+ * signatures the two have in common.
+ */
+type UnscopedTransaction<TDb, TClient> = (<R>(fn: (tx: Omit<InteractiveTransaction<TDb>['tx'], RawSqlMethod> & AllowedRawSql<TClient>) => Promise<R>, options?: InteractiveTransaction<TDb>['options']) => Promise<R>) & (TDb extends {
+    $transaction: infer T;
+} ? T : never);
 /**
  * The type of `db.$withoutTenant()`: `db`'s own type, with raw SQL typed the
- * way the un-extended client types it instead of as always throwing. Every
- * other member, the models and `$transaction` included, has exactly `db`'s
- * type, so code can take either client without the two forming a union
- * TypeScript can't call model methods on.
+ * way the un-extended client types it instead of as always throwing, on the
+ * client and on its interactive transactions' `tx`. Every other member, the
+ * models included, has exactly `db`'s type, so code can take either client
+ * without the two forming a union TypeScript can't call model methods on.
  */
-export type UnscopedClient<TDb, TClient> = Omit<TDb, RawSqlMethod | '$forOrg' | '$withoutTenant'> & Pick<TClient, Extract<keyof TClient, RawSqlMethod>> & {
+export type UnscopedClient<TDb, TClient> = Omit<TDb, RawSqlMethod | '$transaction' | '$forOrg' | '$withoutTenant'> & AllowedRawSql<TClient> & {
+    $transaction: UnscopedTransaction<TDb, TClient>;
     $forOrg(this: ExtendableClient, organizationId: string): TDb;
     $withoutTenant(this: ExtendableClient): UnscopedClient<TDb, TClient>;
 };

package/dist/prismaExtension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prismaExtension.d.ts","sourceRoot":"","sources":["../src/prismaExtension.ts"],"names":[],"mappings":"AAQA,KAAK,uBAAuB,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,MAAM,EAAE,GACpD,KAAK,GACL,CAAC,SAAS,MAAM,GACd,KAAK,GACL,CAAC,CAAA;AAEP;;;GAGG;AACH,MAAM,MAAM,aAAa,CAAC,OAAO,IAAI,uBAAuB,CAAC,MAAM,OAAO,CAAC,CAAA;AAE3E,MAAM,WAAW,aAAa,CAAC,OAAO;IACpC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;;;;OAMG;IACH,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG;QAAE,SAAS,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,CAAA;KAAE,CAAA;IAC1E;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CACvC;AA4ID;;;;;;GAMG;AACH,UAAU,iBAAiB;IACzB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACxB,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACxB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,GACjB,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAwChC;AAiwBD,iBAAS,oBAAoB,IAAI,KAAK,CAErC;AAQD;;;;;;GAMG;AACH,KAAK,gBAAgB,GAAG;IAAE,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAA;AAQ7C;;;GAGG;AACH,KAAK,YAAY,GACf,WAAW,GAAG,iBAAiB,GAAG,aAAa,GAAG,mBAAmB,CAAA;AAEvE;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,CAAC,GAAG,EAAE,OAAO,IAAI,IAAI,CAC7C,GAAG,EACH,YAAY,GAAG,SAAS,GAAG,gBAAgB,CAC5C,GACC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,OAAO,EAAE,YAAY,CAAC,CAAC,GAAG;IACpD,OAAO,CAAC,IAAI,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,GAAG,GAAG,CAAA;IAC5D,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;CACrE,CAAA;AAEH;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAC5C,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC;cA8BX,CAAC,SAAS,gBAAgB,QACnC,CAAC,kBACS,MAAM,KACrB,CAAC;qBAaoB,CAAC,SAAS,gBAAgB,QAC1C,CAAC,KACN,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC;;;;;0DA2DhC"}
+{"version":3,"file":"prismaExtension.d.ts","sourceRoot":"","sources":["../src/prismaExtension.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/tenancy",
-  "version": "8.0.0-canary.3556",
+  "version": "8.0.0-canary.3559",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -44,17 +44,17 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/api": "8.0.0-canary.3556",
-    "@cedarjs/context": "8.0.0-canary.3556",
-    "@cedarjs/graphql-server": "8.0.0-canary.3556"
+    "@cedarjs/api": "8.0.0-canary.3559",
+    "@cedarjs/context": "8.0.0-canary.3559",
+    "@cedarjs/graphql-server": "8.0.0-canary.3559"
   },
   "devDependencies": {
     "@apollo/client": "4.3.5",
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "8.0.0-canary.3556",
-    "@cedarjs/framework-tools": "8.0.0-canary.3556",
-    "@cedarjs/router": "8.0.0-canary.3556",
-    "@cedarjs/web": "8.0.0-canary.3556",
+    "@cedarjs/auth": "8.0.0-canary.3559",
+    "@cedarjs/framework-tools": "8.0.0-canary.3559",
+    "@cedarjs/router": "8.0.0-canary.3559",
+    "@cedarjs/web": "8.0.0-canary.3559",
     "@prisma/adapter-better-sqlite3": "7.10.1",
     "@prisma/client": "7.10.1",
     "@testing-library/dom": "10.4.2",
@@ -80,9 +80,9 @@
   },
   "peerDependencies": {
     "@apollo/client": "4.3.5",
-    "@cedarjs/auth": "8.0.0-canary.3556",
-    "@cedarjs/router": "8.0.0-canary.3556",
-    "@cedarjs/web": "8.0.0-canary.3556",
+    "@cedarjs/auth": "8.0.0-canary.3559",
+    "@cedarjs/router": "8.0.0-canary.3559",
+    "@cedarjs/web": "8.0.0-canary.3559",
     "@prisma/client": "7.10.1",
     "react": "19.3.1"
   },