Remove defineOptions

package/src/core/define-integration.ts

@@ -25,26 +25,24 @@ import type { AnyOptions, AnyPlugin, ExtendedHooks } from "./types.js";
  * ```
  */
 export const defineIntegration = <
-	TOptions extends AnyOptions = never,
+	TOptions extends import("astro/zod").AnyZodObject,
 	TPlugins extends Array<AnyPlugin> = [],
 >({
 	name,
-	options: optionsDef,
+	optionsSchema,
 	setup,
 	plugins: _plugins,
 }: {
 	name: string;
-	options?: TOptions;
+	optionsSchema?: TOptions;
 	plugins?: TPlugins;
 	setup: (params: {
 		name: string;
-		options: z.output<TOptions["schema"]>;
+		options: z.output<TOptions>;
 	}) => ExtendedHooks<TPlugins>;
-}): ((options?: z.input<TOptions["schema"]>) => AstroIntegration) => {
-	return (_options?: z.input<TOptions["schema"]>) => {
-		const options = optionsDef?.schema.parse(_options ?? {}) as z.output<
-			TOptions["schema"]
-		>;
+}): ((options?: z.input<TOptions>) => AstroIntegration) => {
+	return (_options?: z.input<TOptions>) => {
+		const options = optionsSchema?.parse(_options ?? {}) as z.output<TOptions>;
 
 		const resolvedPlugins = Object.values(
 			(() => {

package/src/core/index.ts

@@ -1,5 +1,4 @@
-export { createResolver } from "./create-resolver.js"
-export { defineIntegration } from "./define-integration.js"
-export { defineOptions } from "./define-options.js"
-export { definePlugin } from "./define-plugin.js"
-export * from "./types.js"
+export { createResolver } from "./create-resolver.js";
+export { defineIntegration } from "./define-integration.js";
+export { definePlugin } from "./define-plugin.js";
+export * from "./types.js";

package/src/core/types.ts

@@ -142,9 +142,3 @@ export interface ExtendedHooks<TPlugins extends Array<AnyPlugin>> {
 		AddedParam<TPlugins, "astro:build:done">
 	>;
 }
-
-export type Options<Schema extends import("astro/zod").AnyZodObject> = {
-	schema: Schema;
-};
-
-export type AnyOptions = Options<any>;

playground/astro.config.mjs → playground/astro.config.mts

@@ -6,7 +6,9 @@ import testIntegration from "./integration";
 export default defineConfig({
 	integrations: [
 		tailwind(),
-		testIntegration({ name: "ced" }),
+		testIntegration({
+			resource: "abc",
+		}),
 		{ name: "integration-a", hooks: {} },
 		{ name: "integration-b", hooks: {} },
 	],

playground/integration/index.ts

@@ -8,24 +8,22 @@ import { corePlugins } from "astro-integration-kit/plugins";
 import { z } from "astro/zod";
 
 const OptionsSchema = z.object({
-	name: z.string().optional().default("abc")
-})
-
-type Options = {
 	/**
-	 * An important comment
+	 * The name of the resource.
 	 */
-	name?: z.infer<typeof OptionsSchema>["name"]
-};
+	resource: z
+		.string()
+		.default("abc")
+		.transform((val) => val.length),
+});
 
 const testIntegration = defineIntegration({
 	name: "test-integration",
-	options: defineOptions<Options>({
-		schema: OptionsSchema
-	}),
+	options: OptionsSchema,
 	plugins: [...corePlugins],
 	setup: ({ options }) => {
 		const { resolve } = createResolver(import.meta.url);
+		options.resource;
 
 		const pluginPath = resolve("./plugin.ts");
 		console.log({ options, pluginPath });