fix: use schema-first generic pattern for Zod type compatibility

Refactor `SignInResolverFactoryOptions` and `createSchemaFromZod` to use
`TSchema extends ZodType` instead of `ZodSchema<Output, Def, Input>`,
avoiding "excessively deep" TypeScript inference errors when multiple
Zod copies are resolved in a project.

Signed-off-by: Jon Koops <jonkoops@gmail.com>
This commit is contained in:
Jon Koops
2026-03-24 12:51:20 +01:00
parent 3d67aebd35
commit fa550786b0
5 changed files with 56 additions and 37 deletions
@@ -14,7 +14,7 @@
* limitations under the License.
*/
import type { ZodSchema, ZodTypeDef } from 'zod/v3';
import type { z, ZodType } from 'zod/v3';
import { SignInResolver } from '../types';
import zodToJsonSchema from 'zod-to-json-schema';
import { JsonObject } from '@backstage/types';
@@ -34,38 +34,32 @@ export interface SignInResolverFactory<TAuthResult = any, TOptions = any> {
/** @public */
export interface SignInResolverFactoryOptions<
TAuthResult,
TOptionsOutput,
TOptionsInput,
TSchema extends ZodType = ZodType<unknown>,
> {
optionsSchema?: ZodSchema<TOptionsOutput, ZodTypeDef, TOptionsInput>;
create(options: TOptionsOutput): SignInResolver<TAuthResult>;
optionsSchema?: TSchema;
create(options: z.output<TSchema>): SignInResolver<TAuthResult>;
}
/** @public */
export function createSignInResolverFactory<
TAuthResult,
TOptionsOutput,
TOptionsInput,
TSchema extends ZodType = ZodType<unknown>,
>(
options: SignInResolverFactoryOptions<
TAuthResult,
TOptionsOutput,
TOptionsInput
>,
): SignInResolverFactory<TAuthResult, TOptionsInput> {
options: SignInResolverFactoryOptions<TAuthResult, TSchema>,
): SignInResolverFactory<TAuthResult, z.input<TSchema>> {
const { optionsSchema } = options;
if (!optionsSchema) {
return (resolverOptions?: TOptionsInput) => {
return (resolverOptions?: z.input<TSchema>) => {
if (resolverOptions) {
throw new InputError('sign-in resolver does not accept options');
}
return options.create(undefined as TOptionsOutput);
return options.create(undefined);
};
}
const factory = (
...[resolverOptions]: undefined extends TOptionsInput
? [options?: TOptionsInput]
: [options: TOptionsInput]
...[resolverOptions]: undefined extends z.input<TSchema>
? [options?: z.input<TSchema>]
: [options: z.input<TSchema>]
) => {
let parsedOptions;
try {