relocate custom funcs and their tests

Author: walker-tx

.speakeasy/workflow.lock

@@ -11,8 +11,8 @@ targets:
     openrouter:
         source: OpenRouter API
         sourceNamespace: open-router-chat-completions-api
-        sourceRevisionDigest: sha256:c2e2e5da1b9a37b494867bb17c7bb41a4959ceeafd85543abc062675303a6e0c
-        sourceBlobDigest: sha256:598248a264c5fac83e1bbae64cf68a4a95f6213b95bd17917299b192604c72c7
+        sourceRevisionDigest: sha256:4e400d0ed413626f503b2f9662518aef3c7a8ca9ab30d7027f0580b94242e77c
+        sourceBlobDigest: sha256:f18b355f07b1593cc10f1b09fe0f5dbbc1225f16d5d8f250bec0bc9b6e6611db
 workflow:
     workflowVersion: 1.0.0
     speakeasyVersion: latest

…cs/custom/oAuthCreateAuthorizationUrl.ts src/funcs/oAuthCreateAuthorizationUrl.tssrc/funcs/custom/oAuthCreateAuthorizationUrl.ts renamed to src/funcs/oAuthCreateAuthorizationUrl.ts src/funcs/custom/oAuthCreateAuthorizationUrl.ts renamed to src/funcs/oAuthCreateAuthorizationUrl.ts

@@ -1,7 +1,7 @@
 import z from "zod/v3";
-import { OpenRouterCore } from "../../core.js";
-import { serverURLFromOptions } from "../../lib/config.js";
-import { Result } from "../../types/fp.js";
+import { OpenRouterCore } from "../core.js";
+import { serverURLFromOptions } from "../lib/config.js";
+import { Result } from "../types/fp.js";
 
 const CreateAuthorizationUrlBaseSchema = z.object({
   callbackUrl: z.union([z.string().url(), z.instanceof(URL)]),

…custom/oAuthCreateSHA256CodeChallenge.ts …/funcs/oAuthCreateSHA256CodeChallenge.tssrc/funcs/custom/oAuthCreateSHA256CodeChallenge.ts renamed to src/funcs/oAuthCreateSHA256CodeChallenge.ts src/funcs/custom/oAuthCreateSHA256CodeChallenge.ts renamed to src/funcs/oAuthCreateSHA256CodeChallenge.ts

@@ -1,5 +1,5 @@
 import z from "zod/v3";
-import { Result } from "../../types/fp.js";
+import { Result } from "../types/fp.js";
 
 const CreateSHA256CodeChallengeRequestSchema = z.object({
   /**

src/sdk/oauth.ts

@@ -11,12 +11,12 @@ import { unwrapAsync } from "../types/fp.js";
 import {
   CreateAuthorizationUrlRequest,
   oAuthCreateAuthorizationUrl,
-} from "../funcs/custom/oAuthCreateAuthorizationUrl.js";
+} from "../funcs/oAuthCreateAuthorizationUrl.js";
 import {
   CreateSHA256CodeChallengeRequest,
   CreateSHA256CodeChallengeResponse,
   oAuthCreateSHA256CodeChallenge,
-} from "../funcs/custom/oAuthCreateSHA256CodeChallenge.js";
+} from "../funcs/oAuthCreateSHA256CodeChallenge.js";
 // #endregion imports
 
 export class OAuth extends ClientSDK {

…stom/oAuthCreateAuthorizationUrl.test.ts …uncs/oAuthCreateAuthorizationUrl.test.tssrc/funcs/custom/oAuthCreateAuthorizationUrl.test.ts renamed to tests/funcs/oAuthCreateAuthorizationUrl.test.ts src/funcs/custom/oAuthCreateAuthorizationUrl.test.ts renamed to tests/funcs/oAuthCreateAuthorizationUrl.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from "vitest";
-import { OpenRouterCore } from "../../core.js";
-import { oAuthCreateAuthorizationUrl } from "./oAuthCreateAuthorizationUrl.js";
+import { OpenRouterCore } from "../../src/core";
+import { oAuthCreateAuthorizationUrl } from "../../src/funcs/oAuthCreateAuthorizationUrl";
 
 describe("oAuthCreateAuthorizationUrl", () => {
   const createMockClient = (serverURL?: string) => {

…m/oAuthCreateSHA256CodeChallenge.test.ts …s/oAuthCreateSHA256CodeChallenge.test.tssrc/funcs/custom/oAuthCreateSHA256CodeChallenge.test.ts renamed to tests/funcs/oAuthCreateSHA256CodeChallenge.test.ts src/funcs/custom/oAuthCreateSHA256CodeChallenge.test.ts renamed to tests/funcs/oAuthCreateSHA256CodeChallenge.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from "vitest";
-import { oAuthCreateSHA256CodeChallenge } from "./oAuthCreateSHA256CodeChallenge.js";
+import { oAuthCreateSHA256CodeChallenge } from "../../src/funcs/oAuthCreateSHA256CodeChallenge";
 
 describe("oAuthCreateSHA256CodeChallenge", () => {
   it("should generate code challenge from provided code verifier", async () => {
@@ -101,7 +101,9 @@ describe("oAuthCreateSHA256CodeChallenge", () => {
     expect(result.ok).toBe(false);
     if (!result.ok) {
       expect(result.error).toBeDefined();
-      expect((result.error as Error).message).toContain("at least 43 characters");
+      expect((result.error as Error).message).toContain(
+        "at least 43 characters",
+      );
     }
   });
 
@@ -113,7 +115,9 @@ describe("oAuthCreateSHA256CodeChallenge", () => {
     expect(result.ok).toBe(false);
     if (!result.ok) {
       expect(result.error).toBeDefined();
-      expect((result.error as Error).message).toContain("at least 43 characters");
+      expect((result.error as Error).message).toContain(
+        "at least 43 characters",
+      );
     }
   });
 
@@ -126,7 +130,9 @@ describe("oAuthCreateSHA256CodeChallenge", () => {
     expect(result.ok).toBe(false);
     if (!result.ok) {
       expect(result.error).toBeDefined();
-      expect((result.error as Error).message).toContain("at most 128 characters");
+      expect((result.error as Error).message).toContain(
+        "at most 128 characters",
+      );
     }
   });
 
@@ -170,7 +176,9 @@ describe("oAuthCreateSHA256CodeChallenge", () => {
     expect(result.ok).toBe(false);
     if (!result.ok) {
       expect(result.error).toBeDefined();
-      expect((result.error as Error).message).toContain("unreserved characters");
+      expect((result.error as Error).message).toContain(
+        "unreserved characters",
+      );
     }
   });
 
@@ -183,7 +191,9 @@ describe("oAuthCreateSHA256CodeChallenge", () => {
     expect(result.ok).toBe(false);
     if (!result.ok) {
       expect(result.error).toBeDefined();
-      expect((result.error as Error).message).toContain("unreserved characters");
+      expect((result.error as Error).message).toContain(
+        "unreserved characters",
+      );
     }
   });
 });

tests/sdk/oauth.test.ts

@@ -0,0 +1,44 @@
+import { describe, expect, it, vi } from "vitest";
+import { OAuth as OpenRouterOAuthSDK } from "../../src/sdk/oauth";
+
+describe("oauth", () => {
+  const oauthSdkInstance = new OpenRouterOAuthSDK({
+    serverURL: "https://test-server-url",
+  });
+
+  describe("createSHA256CodeChallenge", () => {
+    it("is defined on the oauth sdk object", () => {
+      expect(oauthSdkInstance.createSHA256CodeChallenge).toBeDefined();
+    });
+
+    it("calls the custom oAuthCreateSHA256CodeChallenge function", async () => {
+      const spy = vi.spyOn(
+        await import("../../src/funcs/oAuthCreateSHA256CodeChallenge"),
+        "oAuthCreateSHA256CodeChallenge",
+      );
+
+      oauthSdkInstance.createSHA256CodeChallenge();
+
+      expect(spy).toHaveBeenCalled();
+    });
+  });
+
+  describe("createAuthorizationUrl", () => {
+    it("is defined on the oauth sdk object", () => {
+      expect(oauthSdkInstance.createAuthorizationUrl).toBeDefined();
+    });
+
+    it("calls the custom oAuthCreateAuthorizationUrl function", async () => {
+      const spy = vi.spyOn(
+        await import("../../src/funcs/oAuthCreateAuthorizationUrl"),
+        "oAuthCreateAuthorizationUrl",
+      );
+
+      oauthSdkInstance.createAuthorizationUrl({
+        callbackUrl: "https://example.com/callback",
+      });
+
+      expect(spy).toHaveBeenCalled();
+    });
+  });
+});