pdyform 1.1.0 → 2.0.0

package/packages/core/dist/index.cjs

@@ -26,6 +26,12 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/utils.ts
+function parseNumberish(value) {
+  if (typeof value === "number") return Number.isNaN(value) ? null : value;
+  if (typeof value !== "string" || value.trim() === "") return null;
+  const parsed = Number(value);
+  return Number.isNaN(parsed) ? null : parsed;
+}
 function validateField(value, field) {
   if (!field.validations) return null;
   for (const rule of field.validations) {
@@ -36,6 +42,13 @@ function validateField(value, field) {
         }
         break;
       case "min":
+        if (field.type === "number") {
+          const numericValue = parseNumberish(value);
+          if (numericValue !== null && numericValue < rule.value) {
+            return rule.message || `${field.label} must be at least ${rule.value}`;
+          }
+          break;
+        }
         if (typeof value === "number" && value < rule.value) {
           return rule.message || `${field.label} must be at least ${rule.value}`;
         }
@@ -44,6 +57,13 @@ function validateField(value, field) {
         }
         break;
       case "max":
+        if (field.type === "number") {
+          const numericValue = parseNumberish(value);
+          if (numericValue !== null && numericValue > rule.value) {
+            return rule.message || `${field.label} must be at most ${rule.value}`;
+          }
+          break;
+        }
         if (typeof value === "number" && value > rule.value) {
           return rule.message || `${field.label} must be at most ${rule.value}`;
         }

package/packages/core/dist/index.js

@@ -1,7 +1,7 @@
 import {
   getDefaultValues,
   validateField
-} from "./chunk-KQR3LFND.js";
+} from "./chunk-GQASS6PM.js";
 export {
   getDefaultValues,
   validateField

package/packages/core/dist/utils.cjs

@@ -24,6 +24,12 @@ __export(utils_exports, {
   validateField: () => validateField
 });
 module.exports = __toCommonJS(utils_exports);
+function parseNumberish(value) {
+  if (typeof value === "number") return Number.isNaN(value) ? null : value;
+  if (typeof value !== "string" || value.trim() === "") return null;
+  const parsed = Number(value);
+  return Number.isNaN(parsed) ? null : parsed;
+}
 function validateField(value, field) {
   if (!field.validations) return null;
   for (const rule of field.validations) {
@@ -34,6 +40,13 @@ function validateField(value, field) {
         }
         break;
       case "min":
+        if (field.type === "number") {
+          const numericValue = parseNumberish(value);
+          if (numericValue !== null && numericValue < rule.value) {
+            return rule.message || `${field.label} must be at least ${rule.value}`;
+          }
+          break;
+        }
         if (typeof value === "number" && value < rule.value) {
           return rule.message || `${field.label} must be at least ${rule.value}`;
         }
@@ -42,6 +55,13 @@ function validateField(value, field) {
         }
         break;
       case "max":
+        if (field.type === "number") {
+          const numericValue = parseNumberish(value);
+          if (numericValue !== null && numericValue > rule.value) {
+            return rule.message || `${field.label} must be at most ${rule.value}`;
+          }
+          break;
+        }
         if (typeof value === "number" && value > rule.value) {
           return rule.message || `${field.label} must be at most ${rule.value}`;
         }

package/packages/core/dist/utils.js

@@ -1,7 +1,7 @@
 import {
   getDefaultValues,
   validateField
-} from "./chunk-KQR3LFND.js";
+} from "./chunk-GQASS6PM.js";
 export {
   getDefaultValues,
   validateField

package/packages/core/node_modules/.bin/jiti

@@ -0,0 +1,17 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/jiti@1.21.7/node_modules/jiti/bin/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/jiti@1.21.7/node_modules/jiti/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/jiti@1.21.7/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/jiti@1.21.7/node_modules/jiti/bin/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/jiti@1.21.7/node_modules/jiti/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/jiti@1.21.7/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../../../../node_modules/.pnpm/jiti@1.21.7/node_modules/jiti/bin/jiti.js" "$@"
+else
+  exec node  "$basedir/../../../../node_modules/.pnpm/jiti@1.21.7/node_modules/jiti/bin/jiti.js" "$@"
+fi

package/packages/core/node_modules/.bin/tsup

@@ -6,9 +6,9 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules/tsup/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules/tsup/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules/tsup/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules/tsup/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
   exec "$basedir/node"  "$basedir/../tsup/dist/cli-default.js" "$@"

package/packages/core/node_modules/.bin/tsup-node

@@ -6,9 +6,9 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules/tsup/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules/tsup/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules/tsup/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__postcss@8.5.8_typescript@5.9.3/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules/tsup/dist/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules/tsup/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/tsup@8.5.1_@microsoft+api-extractor@7.57.6_@types+node@20.19.35__jiti@1.21.7_postcss@8.5.8_typescript@5.9.3/node_modules:/Users/pidan/Work/Learn/dynamic-form/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
   exec "$basedir/node"  "$basedir/../tsup/dist/cli-node.js" "$@"

package/packages/core/node_modules/.vite/vitest/results.json

@@ -1 +1 @@
-{"version":"1.6.1","results":[[":src/index.test.ts",{"duration":2,"failed":false}]]}
+{"version":"1.6.1","results":[[":test/utils.test.ts",{"duration":3,"failed":false}]]}

package/packages/core/src/utils.ts

@@ -1,5 +1,12 @@
 import type { FormField } from './types';
 
+function parseNumberish(value: unknown): number | null {
+  if (typeof value === 'number') return Number.isNaN(value) ? null : value;
+  if (typeof value !== 'string' || value.trim() === '') return null;
+  const parsed = Number(value);
+  return Number.isNaN(parsed) ? null : parsed;
+}
+
 export function validateField(value: any, field: FormField): string | null {
   if (!field.validations) return null;
 
@@ -11,6 +18,13 @@ export function validateField(value: any, field: FormField): string | null {
         }
         break;
       case 'min':
+        if (field.type === 'number') {
+          const numericValue = parseNumberish(value);
+          if (numericValue !== null && numericValue < rule.value) {
+            return rule.message || `${field.label} must be at least ${rule.value}`;
+          }
+          break;
+        }
         if (typeof value === 'number' && value < rule.value) {
           return rule.message || `${field.label} must be at least ${rule.value}`;
         }
@@ -19,6 +33,13 @@ export function validateField(value: any, field: FormField): string | null {
         }
         break;
       case 'max':
+        if (field.type === 'number') {
+          const numericValue = parseNumberish(value);
+          if (numericValue !== null && numericValue > rule.value) {
+            return rule.message || `${field.label} must be at most ${rule.value}`;
+          }
+          break;
+        }
         if (typeof value === 'number' && value > rule.value) {
           return rule.message || `${field.label} must be at most ${rule.value}`;
         }

package/packages/core/test/utils.test.ts

@@ -0,0 +1,99 @@
+import { describe, it, expect } from 'vitest';
+import { validateField, getDefaultValues } from '../src';
+import { FormField } from '../src/types';
+
+describe('core utils - validateField', () => {
+  it('returns null if there are no validations', () => {
+    const field: FormField = { name: 'f1', label: 'Field 1', type: 'text' };
+    expect(validateField('any value', field)).toBeNull();
+  });
+
+  describe('required', () => {
+    const field: FormField = { name: 'f1', label: 'Field 1', type: 'text', validations: [{ type: 'required', message: 'req' }] };
+    
+    it('fails on undefined, null, empty string, or empty array', () => {
+      expect(validateField(undefined, field)).toBe('req');
+      expect(validateField(null, field)).toBe('req');
+      expect(validateField('', field)).toBe('req');
+      expect(validateField([], field)).toBe('req');
+    });
+
+    it('passes on valid values', () => {
+      expect(validateField('test', field)).toBeNull();
+      expect(validateField(0, field)).toBeNull();
+      expect(validateField(['a'], field)).toBeNull();
+    });
+  });
+
+  describe('min/max', () => {
+    const fieldStr: FormField = { name: 'f1', label: 'F1', type: 'text', validations: [{ type: 'min', value: 3 }, { type: 'max', value: 5 }] };
+    const fieldNum: FormField = { name: 'f2', label: 'F2', type: 'number', validations: [{ type: 'min', value: 10 }, { type: 'max', value: 20 }] };
+
+    it('validates string length', () => {
+      expect(validateField('ab', fieldStr)).toBe('F1 must be at least 3 characters');
+      expect(validateField('abc', fieldStr)).toBeNull();
+      expect(validateField('abcdef', fieldStr)).toBe('F1 must be at most 5 characters');
+    });
+
+    it('validates number value', () => {
+      expect(validateField(9, fieldNum)).toBe('F2 must be at least 10');
+      expect(validateField(10, fieldNum)).toBeNull();
+      expect(validateField(21, fieldNum)).toBe('F2 must be at most 20');
+    });
+
+    it('treats numeric strings as numbers for number fields', () => {
+      expect(validateField('9', fieldNum)).toBe('F2 must be at least 10');
+      expect(validateField('10', fieldNum)).toBeNull();
+      expect(validateField('22', fieldNum)).toBe('F2 must be at most 20');
+    });
+  });
+
+  describe('email', () => {
+    const field: FormField = { name: 'e', label: 'E', type: 'text', validations: [{ type: 'email' }] };
+
+    it('validates email format', () => {
+      expect(validateField('invalid', field)).toBe('Invalid email address');
+      expect(validateField('test@test.com', field)).toBeNull();
+      expect(validateField(undefined, field)).toBeNull(); // Empty check is for required
+    });
+  });
+
+  describe('pattern', () => {
+    const field: FormField = { name: 'p', label: 'P', type: 'text', validations: [{ type: 'pattern', value: '^[0-9]+$' }] };
+
+    it('validates regex', () => {
+      expect(validateField('abc', field)).toBe('Invalid format');
+      expect(validateField('123', field)).toBeNull();
+    });
+  });
+
+  describe('custom', () => {
+    const field: FormField = { 
+      name: 'c', label: 'C', type: 'text', 
+      validations: [{ type: 'custom', validator: (val) => val === 'magic' ? true : 'Not magic' }] 
+    };
+
+    it('uses custom validator', () => {
+      expect(validateField('test', field)).toBe('Not magic');
+      expect(validateField('magic', field)).toBeNull();
+    });
+  });
+});
+
+describe('core utils - getDefaultValues', () => {
+  it('returns correctly mapped default values', () => {
+    const fields: FormField[] = [
+      { name: 't1', label: 'T1', type: 'text', defaultValue: 'default' },
+      { name: 't2', label: 'T2', type: 'text' },
+      { name: 'cb1', label: 'CB1', type: 'checkbox' },
+      { name: 'cb2', label: 'CB2', type: 'checkbox', defaultValue: ['opt1'] }
+    ] as any;
+
+    expect(getDefaultValues(fields)).toEqual({
+      t1: 'default',
+      t2: '',
+      cb1: [],
+      cb2: ['opt1']
+    });
+  });
+});