@tsed/react-formio 3.0.0-rc.1 → 3.0.0-rc.3

package/src/interfaces/SubmissionType.ts

@@ -1,16 +1,12 @@
 import type { Component, Submission } from "@formio/core";
 
-export type JSON = unknown | string | number | boolean | null | undefined | JSON[] | { [key: string]: JSON };
+import type { JSONRecord } from "./JSONRecord.js";
 
-export type SubmissionType<Data extends { [key: string]: JSON } = { [key: string]: JSON }> = Omit<Partial<Submission>, "data"> & {
+export type SubmissionType<Data extends JSONRecord = JSONRecord> = Omit<Partial<Submission>, "data"> & {
   data: Data;
 };
 
-export interface ChangedSubmission<
-  Data extends { [key: string]: JSON } = {
-    [key: string]: JSON;
-  }
-> extends SubmissionType<Data> {
+export interface ChangedSubmission<Data extends JSONRecord = JSONRecord> extends SubmissionType<Data> {
   data: Data;
   changed?: {
     component: Component;

package/src/organisms/form/types.ts

@@ -1,6 +1,6 @@
-import { ComponentType, JSON, SubmissionType } from "../../interfaces";
+import { ComponentType, type JSONRecord, SubmissionType } from "../../interfaces";
 
-export interface FormPageChangeProps<Data extends { [key: string]: JSON } = { [key: string]: JSON }> {
+export interface FormPageChangeProps<Data extends JSONRecord = JSONRecord> {
   page: number;
   submission: SubmissionType<Data>;
 }

package/src/organisms/form/useForm.ts

@@ -2,13 +2,13 @@ import { Form } from "@formio/js";
 import { EventEmitter2 } from "eventemitter2";
 import { type MutableRefObject, useEffect, useRef, useState } from "react";
 
-import type { ChangedSubmission, ComponentType, FormOptions, FormType, JSON, SubmissionType } from "../../interfaces";
+import type { ChangedSubmission, ComponentType, FormOptions, FormType, JSON, JSONRecord, SubmissionType } from "../../interfaces";
 import { FormCustomEvent } from "./types";
 
 type Webform = any;
 type EventError = string | Error | Error[] | { message: string } | { message: string }[];
 
-export interface UseFormProps<Data extends { [key: string]: JSON } = { [key: string]: JSON }> {
+export interface UseFormProps<Data extends JSONRecord = JSONRecord> {
   src?: string;
   url?: string;
   form?: FormType;
@@ -54,7 +54,7 @@ const getDefaultEmitter = () => {
   });
 };
 
-function onAnyEvent<Data extends { [key: string]: JSON } = { [key: string]: JSON }>(
+function onAnyEvent<Data extends JSONRecord = JSONRecord>(
   handlers: Omit<UseFormProps<Data>, "src" | "url" | "form" | "submission" | "options" | "formReady" | "formioform" | "Formio">,
   ...args: [string, ...any[]]
 ) {
@@ -95,7 +95,7 @@ const createWebformInstance = async (
 };
 
 // Define effective props (aka I want to rename these props but also maintain backwards compatibility)
-function getEffectiveProps<Data extends { [key: string]: JSON } = { [key: string]: JSON }>(props: UseFormProps<Data>) {
+function getEffectiveProps<Data extends JSONRecord = JSONRecord>(props: UseFormProps<Data>) {
   const { FormClass = Form, form, src, url, options, submission, onFormReady, onAsyncSubmit, ...handlers } = props;
 
   return {
@@ -126,7 +126,7 @@ function createCustomValidation(customAction: any, ref: MutableRefObject<Webform
   };
 }
 
-export function useForm<Data extends { [key: string]: JSON } = { [key: string]: JSON }>(props: UseFormProps<Data>) {
+export function useForm<Data extends JSONRecord = JSONRecord>(props: UseFormProps<Data>) {
   const webformRef = useRef<Webform | null>(null);
   const renderElement = useRef<HTMLDivElement | null>(null);
   const { formSource, FormClass, options, url, submission, handlers, onFormReady, onAsyncSubmit } = getEffectiveProps(props);

package/vite.config.mts

@@ -6,9 +6,7 @@ import {extname, relative} from "path";
 import preserveDirectives from "rollup-preserve-directives";
 import {defineConfig} from "vite";
 import dts from "vite-plugin-dts";
-
-import pkg from "./package.json" with {type: "json"};
-import {resolve} from "node:path";
+import { resolve } from "node:path";
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -21,6 +19,9 @@ export default defineConfig({
       exclude: ["**/*.spec.{ts,tsx}", "**/*.stories.{ts,tsx}", "**/__*__/**"]
     })
   ],
+  optimizeDeps: {
+    include: ["lodash"]
+  },
   resolve: {
     alias: {}
   },
@@ -33,13 +34,19 @@ export default defineConfig({
     copyPublicDir: false,
     rollupOptions: {
       external: [
-        ...Object.keys(pkg.peerDependencies || {}),
+        "@formio/choices.js",
+        "@tanstack/react-table",
+        "formiojs",
         "react",
         "react-dom",
         "react/jsx-runtime",
-        /lodash\/.*/,
+        "react-select",
+        "react-dnd",
+        "react-dnd-html5-backend",
+        "react-table",
         /formiojs\/.*/,
-        /@tsed\/.*/
+        /@tsed\/.*/,
+        "tooltip.js"
       ],
       plugins: [preserveDirectives() as any],
       input: Object.fromEntries(