How to get TAddOptional (return type of Type.Optional) without importing Ensure, TOptional?

[waynesbrain]

My Maybe function below only works correctly if I specify the return type for each overload, but I couldn't import TAddOptional so I had to recreate it by importing it's component types: Ensure and TOptional.

Is there another way?

import type { Ensure, Static, TOptional, TSchema } from "@sinclair/typebox";
import { Type } from "@sinclair/typebox";

type TAddOptional<T extends TSchema> =
  T extends TOptional<infer S> ? TOptional<S> : Ensure<TOptional<T>>;

/** Creates an optional property. */
export function Maybe<T extends TSchema>(schema: T): TAddOptional<T>;
/** Creates an optional, nullable property. */
export function Maybe<T extends TSchema>(
  schema: T,
  nullable: null,
): ReturnType<typeof Nullable<T>>;
export function Maybe<T extends TSchema>(schema: T, nullable?: null) {
  if (nullable !== null) {
    return Type.Optional(schema);
  }
  return Type.Optional(Nullable(schema));
}
/** Alias for {@link Type.Union}, e.g. `myprop: T | null;` */
export function Nullable<T extends TSchema>(schema: T) {
  return Type.Union([schema, Type.Null()]);
}