@gradio/core 1.3.0 → 1.4.1

package/src/{init.test.ts → init.test.skip.ts}

@@ -1,6 +1,6 @@
 import { describe, test, expect, vi } from "vitest";
 import { spy } from "tinyspy";
-import { setupServer } from "msw/node";
+import { setupWorker } from "msw/browser";
 import { http, HttpResponse } from "msw";
 import type { client_return } from "@gradio/client";
 import { Dependency, TargetMap } from "./types";
@@ -11,6 +11,9 @@ import {
 	process_server_fn,
 	get_component
 } from "./_init";
+import { get_api_url } from "./init.svelte";
+import type { AppConfig } from "./types";
+import { commands } from "@vitest/browser/context";
 
 describe("process_frontend_fn", () => {
 	test("empty source code returns null", () => {
@@ -461,6 +464,8 @@ describe("get_component", () => {
 						value: "hi",
 						interactive: false
 					},
+					key: "test-component-one",
+
 					has_modes: false,
 					instance: {} as any,
 					component: {} as any
@@ -476,7 +481,7 @@ describe("get_component", () => {
 		);
 	});
 
-	test("if the component is not found then it should request the component from the server", async () => {
+	test.skip("if the component is not found then it should request the component from the server", async () => {
 		const api_url = "example.com";
 		const id = "test-random";
 		const variant = "component";
@@ -512,13 +517,307 @@ describe("get_component", () => {
 			}
 		);
 
-		const server = setupServer(...handlers);
-		server.listen();
+		const worker = setupWorker(...handlers);
+		worker.start();
 
 		await get_component("test-random", id, api_url, []).component;
 
 		expect(mock).toHaveBeenCalled();
 
-		server.close();
+		worker.stop();
+	});
+});
+
+describe("get_api_url", () => {
+	describe("root URL with trailing slash", () => {
+		test("root with trailing slash, api_prefix with leading slash", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp/",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api");
+		});
+
+		test("root with trailing slash, api_prefix without leading slash", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp/",
+				api_prefix: "api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api");
+		});
+
+		test("root at domain root with trailing slash", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/api");
+		});
+	});
+
+	describe("root URL without trailing slash", () => {
+		test("root without trailing slash, api_prefix with leading slash", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api");
+		});
+
+		test("root without trailing slash, api_prefix without leading slash", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp",
+				api_prefix: "api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api");
+		});
+
+		test("root at domain root without trailing slash", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/api");
+		});
+	});
+
+	describe("different root path combinations", () => {
+		test("root path is just '/'", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/api");
+		});
+
+		test("root path is '/' without trailing slash", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/api");
+		});
+
+		test("root path is '/myapp'", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api");
+		});
+
+		test("root path is '/myapp/'", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp/",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api");
+		});
+
+		test("root path is '/deep/nested/path'", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/deep/nested/path",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/deep/nested/path/api");
+		});
+
+		test("root path is '/deep/nested/path/'", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/deep/nested/path/",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/deep/nested/path/api");
+		});
+	});
+
+	describe("different api_prefix formats", () => {
+		test("api_prefix with leading slash", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api");
+		});
+
+		test("api_prefix without leading slash", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp",
+				api_prefix: "api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api");
+		});
+
+		test("api_prefix with nested path and leading slash", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp",
+				api_prefix: "/api/v1",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api/v1");
+		});
+
+		test("api_prefix with nested path without leading slash", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp",
+				api_prefix: "api/v1",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api/v1");
+		});
+	});
+
+	describe("edge cases", () => {
+		test("root with port number", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com:8080/myapp",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com:8080/myapp/api");
+		});
+
+		test("root with HTTPS", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "https://example.com/myapp",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("https://example.com/myapp/api");
+		});
+
+		test("root with query parameters (should be ignored)", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp?param=value",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api");
+		});
+
+		test("root with hash (should be ignored)", () => {
+			const config: Omit<AppConfig, "api_url"> = {
+				root: "http://example.com/myapp#section",
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+			const result = get_api_url(config);
+			expect(result).toBe("http://example.com/myapp/api");
+		});
+	});
+
+	describe("consistency checks", () => {
+		test("same result regardless of root trailing slash", () => {
+			const baseConfig = {
+				api_prefix: "/api",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+
+			const config1: Omit<AppConfig, "api_url"> = {
+				...baseConfig,
+				root: "http://example.com/myapp"
+			};
+			const config2: Omit<AppConfig, "api_url"> = {
+				...baseConfig,
+				root: "http://example.com/myapp/"
+			};
+
+			expect(get_api_url(config1)).toBe(get_api_url(config2));
+		});
+
+		test("same result regardless of api_prefix leading slash", () => {
+			const baseConfig = {
+				root: "http://example.com/myapp",
+				theme: "default",
+				version: "1.0.0",
+				autoscroll: true
+			};
+
+			const config1: Omit<AppConfig, "api_url"> = {
+				...baseConfig,
+				api_prefix: "/api"
+			};
+			const config2: Omit<AppConfig, "api_url"> = {
+				...baseConfig,
+				api_prefix: "api"
+			};
+
+			expect(get_api_url(config1)).toBe(get_api_url(config2));
+		});
 	});
 });

package/src/init_utils.ts

@@ -13,7 +13,7 @@ export function get_component(
 	class_id: string,
 	root: string,
 	variant: "component" | "example" | "base" = "component"
-): LoadingComponent {
+): { component: LoadingComponent; runtime: false | typeof import("svelte") } {
 	if (type === "api") type = "state";
 
 	return load_component({
@@ -21,7 +21,7 @@ export function get_component(
 		name: type,
 		id: class_id,
 		variant
-	}).component;
+	});
 }
 
 /**

package/src/types.ts

@@ -26,9 +26,9 @@ export interface ProcessedComponentMeta {
 	id: number;
 	props: { shared_props: SharedProps; props: Record<string, unknown> };
 	component: Component | LoadingComponent | null;
+	runtime: false | typeof import("svelte");
 	documentation?: Documentation;
 	children: ProcessedComponentMeta[];
-	//	parent?: ProcessedComponentMeta;
 	component_class_id: string; // ?;
 	key: string | number | null; // ?;
 	rendered_in?: number; // ?;
@@ -128,4 +128,5 @@ export interface AppConfig {
 	autoscroll: boolean;
 	api_prefix: string;
 	api_url: string;
+	fill_height?: boolean;
 }

package/src/vite-env-override.d.ts

@@ -16,5 +16,6 @@ declare module "virtual:component-loader" {
 	export function load_component(args: Args): {
 		name: ComponentMeta["type"];
 		component: LoadedComponent;
+		runtime: false | typeof import("svelte");
 	};
 }