Tie generic types to Zod Schema

florian-lefebvre · Feb 13, 2024 · 39ecdb1 · 39ecdb1
1 parent abf8a1f
commit 39ecdb1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/package/src/core/define-integration.ts b/package/src/core/define-integration.ts
@@ -1,6 +1,7 @@
 import type { AstroIntegration, HookParameters } from "astro";
-import type { AnyOptions, AnyPlugin, ExtendedHooks } from "./types.js";
+import type { z } from "astro/zod";
 import { DEFAULT_HOOK_NAMES } from "../internal/constants.js";
+import type { AnyOptions, AnyPlugin, ExtendedHooks } from "./types.js";
 
 /**
  * A powerful wrapper around the standard Astro Integrations API. It allows to provide extra hooks, functionality
@@ -37,13 +38,13 @@ export const defineIntegration = <
 	plugins?: TPlugins;
 	setup: (params: {
 		name: string;
-		options: TOptions["options"];
+		options: z.output<TOptions["schema"]>;
 	}) => ExtendedHooks<TPlugins>;
-}): ((options?: TOptions["options"]) => AstroIntegration) => {
-	return (_options?: TOptions["options"]) => {
-		const options = optionsDef?.schema.parse(
-			_options ?? {},
-		) as TOptions["options"];
+}): ((options?: z.input<TOptions["schema"]>) => AstroIntegration) => {
+	return (_options?: z.input<TOptions["schema"]>) => {
+		const options = optionsDef?.schema.parse(_options ?? {}) as z.output<
+			TOptions["schema"]
+		>;
 
 		const resolvedPlugins = Object.values(
 			(() => {

diff --git a/package/src/core/define-options.ts b/package/src/core/define-options.ts
@@ -22,9 +22,8 @@ import type { Options } from "../core/types.js";
  * })
  * ```
  */
-export const defineOptions = <TOptions extends Record<string, unknown>>({
+export const defineOptions = <Schema extends import("astro/zod").AnyZodObject>({
 	schema,
-}: { schema: import("astro/zod").AnyZodObject }): Options<TOptions> => ({
-	options: {} as TOptions,
+}: { schema: Schema }): Options<Schema> => ({
 	schema,
 });
diff --git a/package/src/core/types.ts b/package/src/core/types.ts
@@ -143,9 +143,8 @@ export interface ExtendedHooks<TPlugins extends Array<AnyPlugin>> {
 	>;
 }
 
-export type Options<TOptions extends Record<string, unknown>> = {
-	options: TOptions;
-	schema: import('astro/zod').AnyZodObject
+export type Options<Schema extends import("astro/zod").AnyZodObject> = {
+	schema: Schema;
 };
 
 export type AnyOptions = Options<any>;