jazz-tools 0.18.3 → 0.18.5

package/src/better-auth/auth/tests/server.test.ts

@@ -1,13 +1,54 @@
 import { betterAuth } from "better-auth";
 import { memoryAdapter } from "better-auth/adapters/memory";
-import { beforeEach, describe, expect, it, vi, type Mock } from "vitest";
+import {
+  afterAll,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  vi,
+  type Mock,
+} from "vitest";
+import { OAuth2Server } from "oauth2-mock-server";
 import { jazzPlugin } from "../server.js";
+import { genericOAuth } from "better-auth/plugins";
 
-describe("Better Auth - Signup and Login Tests", () => {
-  let auth: ReturnType<typeof betterAuth>;
+describe("Better Auth - Signup and Login Tests", async () => {
+  const providerId = "test";
+  const clientId = "test-client-id";
+  const clientSecret = "test-client-secret";
+  const server = new OAuth2Server();
+  await server.start();
+  const oauthPort = Number(server.issuer.url?.split(":")[2]!);
+
+  let auth: ReturnType<
+    typeof betterAuth<{
+      plugins: ReturnType<typeof jazzPlugin | typeof genericOAuth>[];
+    }>
+  >;
   let accountCreationSpy: Mock;
   let verificationCreationSpy: Mock;
 
+  beforeAll(async () => {
+    await server.issuer.keys.generate("RS256");
+
+    server.service.on("beforeUserinfo", (userInfoResponse) => {
+      userInfoResponse.body = {
+        email: "oauth2@test.com",
+        name: "OAuth2 Test",
+        sub: "oauth2",
+        picture: "https://test.com/picture.png",
+        email_verified: true,
+      };
+      userInfoResponse.statusCode = 200;
+    });
+  });
+
+  afterAll(async () => {
+    await server.stop();
+  });
+
   beforeEach(() => {
     accountCreationSpy = vi.fn();
     verificationCreationSpy = vi.fn();
@@ -20,7 +61,22 @@ describe("Better Auth - Signup and Login Tests", () => {
         verification: [],
         account: [],
       }),
-      plugins: [jazzPlugin()],
+      baseURL: "http://localhost:3000",
+      plugins: [
+        jazzPlugin(),
+        genericOAuth({
+          config: [
+            {
+              providerId,
+              discoveryUrl: `http://localhost:${oauthPort}/.well-known/openid-configuration`,
+              authorizationUrl: `http://localhost:${oauthPort}/authorize`,
+              clientId: clientId,
+              clientSecret: clientSecret,
+              pkce: true,
+            },
+          ],
+        }),
+      ],
       emailAndPassword: {
         enabled: true,
         requireEmailVerification: false, // Disable for testing
@@ -219,8 +275,40 @@ describe("Better Auth - Signup and Login Tests", () => {
       );
     });
 
-    it.todo(
-      "should create a new account with jazz auth when using social provider",
-    );
+    it("should create a new account with jazz auth when using social provider", async () => {
+      const response = await auth.api.signInSocial({
+        body: {
+          provider: providerId,
+          callbackURL: "http://localhost:3000/api/auth/sign-in/social/callback",
+          newUserCallbackURL:
+            "http://localhost:3000/api/auth/sign-in/social/callback",
+        },
+        headers: {
+          "x-jazz-auth": JSON.stringify({
+            accountID: "123",
+            secretSeed: [1, 2, 3],
+            accountSecret: "123",
+          }),
+        },
+      });
+
+      const oauthres = await fetch(response.url as string, {
+        redirect: "manual",
+      });
+
+      const resURL = new URL(oauthres.headers.get("Location") as string);
+
+      const callbackRes = await auth.handler(new Request(resURL));
+
+      expect(callbackRes.headers.getSetCookie()[0]).toMatch(
+        "better-auth.session_token=",
+      );
+
+      expect(accountCreationSpy).toHaveBeenCalledTimes(1);
+      expect(accountCreationSpy).toHaveBeenCalledWith(
+        expect.objectContaining({ accountID: "123" }),
+        expect.any(Object),
+      );
+    });
   });
 });

package/src/browser/createBrowserContext.ts

@@ -214,6 +214,14 @@ export function provideBrowserLockSession(
   accountID: ID<Account> | AgentID,
   crypto: CryptoProvider,
 ) {
+  if (typeof navigator === "undefined" || !navigator.locks?.request) {
+    // Fallback to random session ID for each tab session
+    return Promise.resolve({
+      sessionID: crypto.newRandomSessionID(accountID as RawAccountID | AgentID),
+      sessionDone: () => {},
+    });
+  }
+
   let sessionDone!: () => void;
   const donePromise = new Promise<void>((resolve) => {
     sessionDone = resolve;

package/src/tools/coValues/account.ts

@@ -274,7 +274,9 @@ export class Account extends CoValueBase implements CoValue {
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   toJSON(): object | any[] {
-    return {};
+    return {
+      $jazz: { id: this.$jazz.id },
+    };
   }
 
   [inspect]() {

package/src/tools/coValues/coFeed.ts

@@ -228,6 +228,7 @@ export class CoFeed<out Item = any> extends CoValueBase implements CoValue {
    * @category
    */
   toJSON(): {
+    $jazz: { id: string };
     [key: string]: unknown;
     in: { [key: string]: unknown };
   } {
@@ -240,6 +241,7 @@ export class CoFeed<out Item = any> extends CoValueBase implements CoValue {
           : (v: unknown) => v && (v as CoValue).$jazz.id;
 
     return {
+      $jazz: { id: this.$jazz.id },
       ...Object.fromEntries(
         Object.entries(this).map(([account, entry]) => [
           account,
@@ -257,6 +259,7 @@ export class CoFeed<out Item = any> extends CoValueBase implements CoValue {
 
   /** @internal */
   [inspect](): {
+    $jazz: { id: string };
     [key: string]: unknown;
     in: { [key: string]: unknown };
   } {
@@ -928,6 +931,7 @@ export class FileStream extends CoValueBase implements CoValue {
    * @category Content
    */
   toJSON(): {
+    $jazz: { id: string };
     mimeType?: string;
     totalSizeBytes?: number;
     fileName?: string;
@@ -935,6 +939,7 @@ export class FileStream extends CoValueBase implements CoValue {
     finished?: boolean;
   } {
     return {
+      $jazz: { id: this.$jazz.id },
       ...this.getChunks(),
     };
   }

package/src/tools/coValues/coMap.ts

@@ -185,7 +185,9 @@ export class CoMap extends CoValueBase implements CoValue {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   toJSON(_key?: string, processedValues?: ID<CoValue>[]): any {
-    const result = {} as Record<string, any>;
+    const result = {
+      $jazz: { id: this.$jazz.id },
+    } as Record<string, any>;
 
     for (const key of this.$jazz.raw.keys()) {
       const tKey = key as CoKeys<this>;

package/src/tools/implementation/anonymousJazzAgent.ts

@@ -1,5 +1,5 @@
 import { LocalNode } from "cojson";
-import { TypeSym } from "./symbols";
+import { TypeSym } from "./symbols.js";
 
 export class AnonymousJazzAgent {
   [TypeSym] = "Anonymous" as const;

package/src/tools/implementation/zodSchema/coExport.ts

@@ -1,4 +1,5 @@
 export { Loaded as loaded } from "./zodSchema.js";
+export { Loaded as output } from "./zodSchema.js";
 export { CoMapSchema as Map } from "./schemaTypes/CoMapSchema.js";
 export { CoRecordSchema as Record } from "./schemaTypes/CoRecordSchema.js";
 export { CoListSchema as List } from "./schemaTypes/CoListSchema.js";
@@ -6,6 +7,7 @@ export { CoFeedSchema as Feed } from "./schemaTypes/CoFeedSchema.js";
 export { PlainTextSchema as PlainText } from "./schemaTypes/PlainTextSchema.js";
 export { RichTextSchema as RichText } from "./schemaTypes/RichTextSchema.js";
 export { FileStreamSchema as FileStream } from "./schemaTypes/FileStreamSchema.js";
+export { CoInput as input } from "./typeConverters/CoFieldSchemaInit.js";
 export {
   AccountSchema as Account,
   CoProfileSchema as Profile,

package/src/tools/implementation/zodSchema/schemaTypes/CoMapSchema.ts

@@ -131,6 +131,25 @@ export interface CoMapSchema<
     R
   > | null>;
 
+  /**
+   * @deprecated Use `co.map().catchall` will be removed in an upcoming version.
+   *
+   * Use a `co.record` nested inside a `co.map` if you need to store key-value properties.
+   *
+   * @example
+   * ```ts
+   * // Instead of:
+   * const Image = co.map({
+   *   original: co.fileStream(),
+   * }).catchall(co.fileStream());
+   *
+   * // Use:
+   * const Image = co.map({
+   *   original: co.fileStream(),
+   *   resolutions: co.record(z.string(), co.fileStream()),
+   * });
+   * ```
+   */
   catchall<T extends AnyZodOrCoValueSchema>(schema: T): CoMapSchema<Shape, T>;
 
   withMigration(

package/src/tools/implementation/zodSchema/typeConverters/CoFieldSchemaInit.ts

@@ -6,7 +6,6 @@ import {
   CoreCoMapSchema,
   CoreCoRecordSchema,
   CorePlainTextSchema,
-  PartialOnUndefined,
   Simplify,
 } from "../../../internal.js";
 import { CoreCoOptionalSchema } from "../schemaTypes/CoOptionalSchema.js";
@@ -76,3 +75,11 @@ export type CoListSchemaInit<T extends AnyZodOrCoValueSchema> = Simplify<
 export type CoFeedSchemaInit<T extends AnyZodOrCoValueSchema> = Simplify<
   ReadonlyArray<CoFieldSchemaInit<T>>
 >;
+
+/**
+ * The convenience type for extracting the init type of a CoValue schema.
+ */
+export type CoInput<S extends CoValueClass | AnyZodOrCoValueSchema> =
+  S extends CoreCoValueSchema
+    ? Exclude<CoFieldSchemaInit<S>, Loaded<S>>
+    : CoFieldSchemaInit<S>;

package/src/tools/implementation/zodSchema/typeConverters/TypeOfZodSchema.ts

@@ -1,5 +1,4 @@
 import { JsonValue } from "cojson";
-import { PartialOnUndefined } from "../../../internal.js";
 import { z } from "../zodReExport.js";
 
 // Copied from https://github.com/colinhacks/zod/blob/7e7e3461aceecf3633e158df50d6bc852e7cdf45/packages/zod/src/v4/core/schemas.ts#L1591,

package/src/tools/implementation/zodSchema/unionUtils.ts

@@ -1,4 +1,3 @@
-import { RawAccount, RawCoList, RawCoMap } from "cojson";
 import {
   AnyZodOrCoValueSchema,
   CoDiscriminatedUnionSchema,