fix: make util standalone from form

jotaijs · May 28, 2024 · 33999c9 · 33999c9
1 parent 5088546
commit 33999c9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -60,7 +60,10 @@
     "preset": "ts-jest/presets/js-with-ts",
     "testPathIgnorePatterns": [
       "__tests__/components"
-    ]
+    ],
+    "moduleNameMapper": {
+      "jotai-form": "<rootDir>/src"
+    }
   },
   "keywords": [
     "jotai",

diff --git a/rollup.config.js b/rollup.config.js
@@ -24,8 +24,12 @@ module.exports = function config() {
     builder.buildESM('./src/react/index.ts', 'dist/react'),
 
     // utils - zod
-    builder.buildUMD('./src/utils/zod.ts', 'jotai-form-zod', 'dist/utils/zod'),
-    builder.buildESM('./src/utils/zod.ts', 'dist/utils/zod'),
+    builder.buildUMD('./src/utils/zod.ts', 'jotai-form-zod', 'dist/utils/zod', {
+      external: [/^jotai\//, 'jotai-form', 'zod'],
+    }),
+    builder.buildESM('./src/utils/zod.ts', 'dist/utils/zod', {
+      external: [/^jotai\//, 'jotai-form', 'zod'],
+    }),
   );
 };
 
@@ -61,8 +65,10 @@ function configBuilder({ env } = {}) {
     merge(...configs) {
       return [].concat(configs).flat(1);
     },
-    /** @returns {import("rollup").RollupOptions[]} */
-    buildESM(input, output) {
+    /**
+     * @param {import("rollup").RollupOptions} options
+     * @returns {import("rollup").RollupOptions[]} */
+    buildESM(input, output, options = {}) {
       const plugins = getCommonPlugins(input, output);
 
       return [
@@ -77,6 +83,7 @@ function configBuilder({ env } = {}) {
             entryFileNames: '[name].modern.js',
           },
           plugins: [...plugins],
+          ...options,
         },
         {
           input,
@@ -89,11 +96,15 @@ function configBuilder({ env } = {}) {
             entryFileNames: '[name].modern.mjs',
           },
           plugins: [...plugins],
+          ...options,
         },
       ];
     },
-    /** @returns {import("rollup").RollupOptions[]} */
-    buildUMD(input, name, output) {
+
+    /**
+     * @param {import("rollup").RollupOptions} options
+     * @returns {import("rollup").RollupOptions[]} */
+    buildUMD(input, name, output, options = {}) {
       const plugins = getCommonPlugins(input, output);
       return [
         {
@@ -108,6 +119,7 @@ function configBuilder({ env } = {}) {
             entryFileNames: '[name].umd.js',
           },
           plugins: [...plugins],
+          ...options,
         },
       ];
     },

diff --git a/src/utils/zod.ts b/src/utils/zod.ts
@@ -1,7 +1,10 @@
+import {
+  AtomWithValidation,
+  Options,
+  atomWithFormControls,
+  atomWithValidate,
+} from 'jotai-form';
 import { ZodDefault, ZodObject, ZodType } from 'zod';
-import { Options, atomWithFormControls } from '../atomWithFormControls';
-import { atomWithValidate } from '../atomWithValidate';
-import { AtomWithValidation } from '../validateAtoms';
 
 const INSTANCE_DEFAULT_MAP = {
   string: 'defaultemail',