disallow nullable and optional as base types, fix action

.github/workflows/test-and-publish.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 16
-          registry-url: https://registry.npmjs.org/
+          registry-url: https://registry.yarnpkg.com/
       - name: Setup git config
         run: |
           git config user.name "GitHub Actions Bot"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-react/form",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Build forms faster!",
   "module": "lib/index.mjs",
   "main": "lib/index.js",

src/__tests__/createSchemaForm.test.tsx

@@ -504,7 +504,7 @@ describe("createSchemaForm", () => {
   it("should throw a duplicate type error if multiple of the same schema are passed.", () => {
     const mapping = [
       [z.string(), () => <div />] as const,
-      [z.string().optional(), () => <div />] as const,
+      [z.string(), () => <div />] as const,
     ] as const;
 
     expect(() => createTsForm(mapping)).toThrowError(duplicateTypeError());

src/createSchemaForm.tsx

@@ -13,7 +13,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { IndexOf, RequireKeysWithRequiredChildren } from "./typeUtilities";
 import { getMetaInformationForZodType } from "./getMetaInformationForZodType";
 import { unwrapEffects, UnwrapZodType } from "./unwrap";
-import { RTFSupportedZodTypes } from "./supportedZodTypes";
+import { RTFBaseZodType, RTFSupportedZodTypes } from "./supportedZodTypes";
 import { FieldContextProvider } from "./FieldContext";
 import { isZodTypeEqual } from "./isZodTypeEqual";
 
@@ -33,7 +33,7 @@ export type ReactComponentWithRequiredProps<
   | (ForwardRefExoticComponent<Props> & RefAttributes<unknown>);
 
 export type MappingItem<PropType extends ReactProps> = readonly [
-  RTFSupportedZodTypes,
+  RTFBaseZodType,
   ReactComponentWithRequiredProps<PropType>
 ];
 

src/supportedZodTypes.ts

@@ -20,7 +20,7 @@ import {
 /**
  * Reducing this helps with TS performance
  */
-export type RTFSupportedZodTypes =
+export type RTFBaseZodType =
   | ZodString
   | ZodNumber
   | ZodBoolean
@@ -33,7 +33,10 @@ export type RTFSupportedZodTypes =
   | ZodMap<any>
   | ZodSet<any>
   | ZodEnum<any>
-  | ZodOptional<any>
-  | ZodNullable<any>
   | ZodBranded<any, any>
   | ZodEffects<any, any>;
+
+export type RTFSupportedZodTypes =
+  | RTFBaseZodType
+  | ZodOptional<any>
+  | ZodNullable<any>;