libmodulor 0.4.0 → 0.6.0

package/dist/esm/target/lib/server/ServerManager.d.ts

@@ -31,9 +31,28 @@ export interface ServerManagerSettings extends ServerManagerAuthSettings, Settin
 }
 export interface ServerManager extends Initializable {
     overrideUCManager(ucManager: UCManager): void;
+    /**
+     * Mount the use case as an endpoint
+     * @param appManifest
+     * @param ucd
+     * @param contract
+     */
     mount<I extends UCInput | undefined = undefined, OPI0 extends UCOPIBase | undefined = undefined, OPI1 extends UCOPIBase | undefined = undefined>(appManifest: AppManifest, ucd: UCDef<I, OPI0, OPI1>, contract: UCHTTPContract): Promise<void>;
+    /**
+     * Mount the static directory at `/`
+     * @param dirPath
+     */
     mountStaticDir(dirPath: DirPath): Promise<void>;
+    /**
+     * Start listening on the specific host and port
+     */
     start(): Promise<void>;
+    /**
+     * Stop listening
+     */
     stop(): Promise<void>;
+    /**
+     * Warm up with things that must be done after the routes have been defined (e.g. error middleware, etc.)
+     */
     warmUp(): Promise<void>;
 }

package/dist/esm/target/lib/server/consts.d.ts

@@ -1,2 +1,5 @@
 import type { ServerManagerSettings } from './ServerManager.js';
+/**
+ * @see TARGET_DEFAULT_SERVER_CLIENT_MANAGER_SETTINGS
+ */
 export declare const TARGET_DEFAULT_SERVER_MANAGER_SETTINGS: ServerManagerSettings;

package/dist/esm/target/lib/server/consts.js

@@ -1,3 +1,6 @@
+/**
+ * @see TARGET_DEFAULT_SERVER_CLIENT_MANAGER_SETTINGS
+ */
 export const TARGET_DEFAULT_SERVER_MANAGER_SETTINGS = {
     server_basic_auth_entries: {},
     server_binding_host: 'localhost',

package/dist/esm/target/lib/web/input.d.ts

@@ -1,9 +1,30 @@
 import { type DataType, type ErrorMessage, type HTMLInputType } from '../../../dt/index.js';
 import { type UCExecState, type UCInputField } from '../../../uc/index.js';
 export interface HTMLInputDef {
+    /**
+     * Internal types that are not part of the W3C spec
+     *
+     * @see node_modules/@types/react/index.d.ts#InputHTMLAttributes
+     */
     internal?: {
+        /**
+         * When a fiels is `multiline`, you should probably render a `<textarea />` in place of an `<input />`.
+         */
         multiline?: boolean | undefined;
     };
+    /**
+     * Fields that are part of the W3C spec
+     *
+     * These are safe to destructure directly in an `<input />` component.
+     *
+     * Note that they come with their camel case form, à la React.
+     * The reason is that it's easier to transform this to the original spec (`maxLength` => `maxlength`) vs doing the opposite (`maxlength` > `maxLength`).
+     * In the first case, we can simply call `.toLowerCase()` on the keys, while in the second, we'd need a dedicated function that "camel-cases" a string.
+     *
+     * @example `<input {...attrs.spec} />`
+     * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#attributes
+     * @see node_modules/@types/react/index.d.ts `InputHTMLAttributes`
+     */
     spec?: {
         'aria-errormessage'?: string | undefined;
         'aria-invalid'?: boolean | undefined;

package/dist/esm/target/lib/web/input.js

@@ -6,6 +6,7 @@ export function htmlInputDef(field, execState, errMsg) {
         spec: {},
     };
     if (!def.internal || !def.spec) {
+        // Just a guard to safely type the rest of the function without using !
         return def;
     }
     const { key, def: fDef } = field;
@@ -13,11 +14,14 @@ export function htmlInputDef(field, execState, errMsg) {
     def.spec.disabled = ucIsDisabled(execState);
     def.spec.id = ucifId(key);
     def.spec.name = key;
+    // Testing the types by usage probability to make the if/else evaluation stop ideally earlier
     if (fType instanceof TString) {
         const constraints = fType.getConstraints();
         if (constraints) {
             def.spec.maxLength = constraints.maxLength;
             def.spec.minLength = constraints.minLength;
+            // https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/pattern
+            // > No forward slashes should be specified around the pattern text
             def.spec.pattern = constraints.format?.regexp?.source;
         }
         def.internal.multiline = fType.isPotentiallyLong();

package/dist/esm/target/node-core-cli/NodeCoreCLIManager.js

@@ -57,7 +57,7 @@ let NodeCoreCLIManager = class NodeCoreCLIManager {
     }
     parseArgsConfig(uc) {
         const config = {
-            allowPositionals: true,
+            allowPositionals: true, // For the command name
             strict: true,
         };
         if (uc.inputFields.length === 0) {
@@ -68,7 +68,7 @@ let NodeCoreCLIManager = class NodeCoreCLIManager {
             const { def } = f;
             let defaultValue = def.type.getDefaultValue();
             if (typeof defaultValue === 'number') {
-                defaultValue = defaultValue.toString();
+                defaultValue = defaultValue.toString(); // parseArgs does not accept numbers as default value
             }
             const [isRepeatable, _max] = ucifRepeatability(def);
             const type = def.type instanceof TBoolean ? 'boolean' : 'string';

package/dist/esm/target/node-express-server/NodeExpressServerManager.js

@@ -77,6 +77,8 @@ let NodeExpressServerManager = class NodeExpressServerManager {
     async init() {
         this.runtime = express();
         this.runtime.use(this.helmetMB.exec({}));
+        // TODO : Add FileStorageManager (Local, S3, FSBucket)
+        // Right now, the files are only stored locally. We need more flexibility. Maybe we can also install https://imgproxy.net.
         this.runtime.use(fileUpload({
             createParentPath: true,
             debug: this.s().logger_level === 'trace',
@@ -125,6 +127,8 @@ let NodeExpressServerManager = class NodeExpressServerManager {
         if (!this.server?.listening) {
             return;
         }
+        // As stated in the docs of `close`, only awaiting `.close` is not enough to make sure all the connections are closed.
+        // Hence the wrapping in a promise, where the callback is called when the 'close' event is emitted.
         return new Promise((resolve, reject) => {
             if (!this.server) {
                 return resolve();
@@ -138,6 +142,7 @@ let NodeExpressServerManager = class NodeExpressServerManager {
         });
     }
     async warmUp() {
+        // Always at the "almost" last position to handle all the errors (from other middlewares and request handlers)
         this.runtime.use(this.errorMB.exec({}));
     }
     async createServer() {

package/dist/esm/target/node-express-server/lib/AuthCookieCreator.js

@@ -35,7 +35,7 @@ let AuthCookieCreator = class AuthCookieCreator {
                 httpOnly: this.s().server_cookies_http_only,
                 sameSite: this.s().server_cookies_same_site,
                 secure: this.s().server_cookies_secure,
-                signed: false,
+                signed: false, // Not signing to keep it simple and btw, the JWT is already signed
             },
             val: jwt,
         };

package/dist/esm/target/node-express-server/middlewares/AuthenticationCheckerMiddlewareBuilder.js

@@ -51,6 +51,7 @@ let AuthenticationCheckerMiddlewareBuilder = class AuthenticationCheckerMiddlewa
                 nextFn();
             }
             catch (err) {
+                // Always catch otherwise it breaks the middleware chain and hangs forever
                 nextFn(err);
             }
         };

package/dist/esm/target/node-express-server/middlewares/PublicApiKeyCheckerMiddlewareBuilder.js

@@ -35,6 +35,7 @@ let PublicApiKeyCheckerMiddlewareBuilder = class PublicApiKeyCheckerMiddlewareBu
                 nextFn();
             }
             catch (err) {
+                // Always catch otherwise it breaks the middleware chain and hangs forever
                 nextFn(err);
             }
         };

package/dist/esm/target/node-express-server/middlewares/RequestCheckerMiddlewareBuilder.js

@@ -28,6 +28,7 @@ let RequestCheckerMiddlewareBuilder = class RequestCheckerMiddlewareBuilder {
                 nextFn();
             }
             catch (err) {
+                // Always catch otherwise it breaks the middleware chain and hangs forever
                 nextFn(err);
             }
         };

package/dist/esm/target/node-express-server/middlewares/RequestHandlerMiddlewareBuilder.js

@@ -49,6 +49,8 @@ let RequestHandlerMiddlewareBuilder = class RequestHandlerMiddlewareBuilder {
                     if (ucor.canItem00()) {
                         item = ucor.item00().item;
                     }
+                    // Be careful with this, as some are incompatible.
+                    // For instance, if there is a REDIRECT and then a CLEAR_AUTH, the latter won't be executed as we return after the redirect.
                     for (const se of sideEffects) {
                         const { type } = se;
                         switch (type) {
@@ -74,6 +76,7 @@ let RequestHandlerMiddlewareBuilder = class RequestHandlerMiddlewareBuilder {
                 res.send(output && transform ? transform(output) : output);
             }
             catch (err) {
+                // Always catch otherwise it breaks the middleware chain and hangs forever
                 nextFn(err);
             }
         };
@@ -82,6 +85,7 @@ let RequestHandlerMiddlewareBuilder = class RequestHandlerMiddlewareBuilder {
         switch (envelope) {
             case 'form-data': {
                 const input = req.body;
+                // files is present when using express-fileupload
                 if ('files' in req && req.files) {
                     for (const [field, value] of Object.entries(req.files)) {
                         input[field] = Array.isArray(value)
@@ -89,6 +93,8 @@ let RequestHandlerMiddlewareBuilder = class RequestHandlerMiddlewareBuilder {
                             : this.toFile(value);
                     }
                 }
+                // TODO : Change this ugly code
+                // When a field has multiple values, they key is `field[]` and not `field`
                 const sanitized = {};
                 for (const [k, v] of Object.entries(input)) {
                     const sanitizedKey = k.split('[')[0];
@@ -96,6 +102,8 @@ let RequestHandlerMiddlewareBuilder = class RequestHandlerMiddlewareBuilder {
                         continue;
                     }
                     sanitized[sanitizedKey] = v;
+                    // For some reason, when there is only one value, it is received as scalar and not as an array
+                    // Even if there is only one, we want an array
                     if (k.includes('[') && !Array.isArray(v)) {
                         sanitized[sanitizedKey] = [v];
                     }

package/dist/esm/target/node-express-server/middlewares/RequestLoggerMiddlewareBuilder.js

@@ -31,6 +31,7 @@ let RequestLoggerMiddlewareBuilder = class RequestLoggerMiddlewareBuilder {
             }
             catch (err) {
                 this.logger.error(err);
+                // Continue as usual : the user shouldn't be impacted if we have issues logging the requests
                 nextFn();
             }
         };

package/dist/esm/target/node-mcp-server/NodeLocalStdioMCPServerManager.d.ts

@@ -7,6 +7,16 @@ import type { Configurable, LoggerSettings, SettingsManager } from '../../std/in
 import { UCBuilder, type UCDef, type UCHTTPContract, type UCInput, type UCManager, type UCOPIBase } from '../../uc/index.js';
 import type { ServerManager } from '../lib/server/ServerManager.js';
 type S = Pick<LoggerSettings, 'logger_level'>;
+/**
+ * A simple MCP Server implementation
+ *
+ * Although it implements {@link ServerManager}, this implementation is not necessarily a "server".
+ * Indeed, it uses a local `Transport` so it must be considered the same as a {@link NodeCoreCLIManager}.
+ * Therefore, it calls `execClient` and not `execServer`.
+ * This way, Claude AI, or any other client is just a wrapper on top of it.
+ *
+ * @alpha This implementation still has lots of TODOs and has not been tested in real conditions. It needs to be stabilized before usage.
+ */
 export declare class NodeLocalStdioMCPServerManager implements Configurable<S>, ServerManager {
     private productManifest;
     private settingsManager;

package/dist/esm/target/node-mcp-server/NodeLocalStdioMCPServerManager.js

@@ -17,6 +17,16 @@ import { inject, injectable } from 'inversify';
 import { WordingManager } from '../../i18n/index.js';
 import { UCBuilder, ucMountingPoint, ucifIsMandatory, } from '../../uc/index.js';
 import { propertyType, resError, resObj } from './funcs.js';
+/**
+ * A simple MCP Server implementation
+ *
+ * Although it implements {@link ServerManager}, this implementation is not necessarily a "server".
+ * Indeed, it uses a local `Transport` so it must be considered the same as a {@link NodeCoreCLIManager}.
+ * Therefore, it calls `execClient` and not `execServer`.
+ * This way, Claude AI, or any other client is just a wrapper on top of it.
+ *
+ * @alpha This implementation still has lots of TODOs and has not been tested in real conditions. It needs to be stabilized before usage.
+ */
 let NodeLocalStdioMCPServerManager = class NodeLocalStdioMCPServerManager {
     productManifest;
     settingsManager;
@@ -55,6 +65,9 @@ let NodeLocalStdioMCPServerManager = class NodeLocalStdioMCPServerManager {
         });
         if (this.s().logger_level !== 'error') {
             const message = 'Set the logging_level to "error" as MCP does not want the server to log to stdout (see https://modelcontextprotocol.io/docs/tools/debugging#implementing-logging)';
+            // Depending on the `Logger` implementation, this.logger.error() might not write to stderr (e.g. can write to a file).
+            // That's why we explicitly write to stdout by calling console.error().
+            // biome-ignore lint/suspicious/noConsole: we want it
             console.error(new Error(message));
         }
     }
@@ -112,6 +125,7 @@ let NodeLocalStdioMCPServerManager = class NodeLocalStdioMCPServerManager {
     }
     async execRequest(request) {
         const { name, arguments: args } = request.params;
+        // TODO : Check authentication in some way (see if MCP handles it)
         const auth = null;
         try {
             const route = this.tools.get(name);

package/dist/esm/target/react-native-pure/UCForm.js

@@ -1,13 +1,13 @@
 import React, {} from 'react';
 import { View } from 'react-native';
 import { UCFormField } from './UCFormField.js';
-import { UCFormSubmitControl, } from './UCFormSubmitControl.js';
+import { UCFormSubmitControl } from './UCFormSubmitControl.js';
 export function UCForm({ disabled, execState, onChange, onSubmit, uc, }) {
     const onPress = async () => {
         await onSubmit();
     };
     return (React.createElement(View, null,
         uc.inputFieldsForForm().map((f) => (React.createElement(View, { key: f.key },
-            React.createElement(UCFormField, { disabled: disabled, execState: execState, field: f, onChange: onChange })))),
+            React.createElement(UCFormField, { disabled: disabled, execState: execState, f: f, onChange: onChange })))),
         React.createElement(UCFormSubmitControl, { execState: execState, disabled: disabled, onPress: onPress, uc: uc })));
 }

package/dist/esm/target/react-native-pure/UCFormField.d.ts

@@ -1,11 +1,4 @@
 import { type ReactElement } from 'react';
 import type { DataType } from '../../dt/index.js';
-import { type Props as FormFieldControlProps } from './UCFormFieldControl.js';
-import { type Props as FormFieldLabelProps } from './UCFormFieldLabel.js';
-declare const ELEMENTS: readonly ["control", "desc", "err", "label"];
-type Element = (typeof ELEMENTS)[number];
-type Props<T extends DataType> = FormFieldControlProps<T> & FormFieldLabelProps<T> & {
-    only?: Element[];
-};
-export declare function UCFormField<T extends DataType>({ disabled, execState, field, onChange: onChangeBase, only, }: Props<T>): ReactElement;
-export {};
+import { type UCFormFieldProps } from '../lib/react/form.js';
+export declare function UCFormField<T extends DataType>({ disabled, execState, f, onChange: onChangeBase, only, }: UCFormFieldProps<T>): ReactElement;

package/dist/esm/target/react-native-pure/UCFormField.js

@@ -1,32 +1,21 @@
 import React, { useState } from 'react';
 import { useDIContext } from '../lib/react/DIContextProvider.js';
-import { UCFormFieldControl, } from './UCFormFieldControl.js';
+import { UC_FORM_FIELD_ELEMENTS, validateFormField, } from '../lib/react/form.js';
+import { UCFormFieldControl } from './UCFormFieldControl.js';
 import { UCFormFieldDesc } from './UCFormFieldDesc.js';
 import { UCFormFieldErr } from './UCFormFieldErr.js';
-import { UCFormFieldLabel, } from './UCFormFieldLabel.js';
-const ELEMENTS = ['control', 'desc', 'err', 'label'];
-export function UCFormField({ disabled, execState, field, onChange: onChangeBase, only, }) {
+import { UCFormFieldLabel } from './UCFormFieldLabel.js';
+export function UCFormField({ disabled, execState, f, onChange: onChangeBase, only, }) {
     const { i18nManager } = useDIContext();
-    const { type } = field.def;
     const [errMsg, setErrMsg] = useState(null);
-    const elements = only ?? ELEMENTS;
     const onChange = (f, op, v) => {
-        setErrMsg(null);
-        const vArr = Array.isArray(v) ? v : [v];
-        for (const vv of vArr) {
-            const validation = type.assign(vv).validate();
-            const violation = validation.get();
-            if (violation) {
-                const [key, expected] = violation;
-                setErrMsg(i18nManager.t(key, { vars: { expected } }));
-                break;
-            }
-        }
+        setErrMsg(validateFormField(i18nManager, f, v));
         onChangeBase(f, op, v);
     };
+    const elements = only ?? UC_FORM_FIELD_ELEMENTS;
     return (React.createElement(React.Fragment, null,
-        elements.includes('label') && React.createElement(UCFormFieldLabel, { field: field }),
-        elements.includes('control') && (React.createElement(UCFormFieldControl, { disabled: disabled, execState: execState, field: field, onChange: onChange })),
+        elements.includes('label') && React.createElement(UCFormFieldLabel, { f: f }),
+        elements.includes('control') && (React.createElement(UCFormFieldControl, { disabled: disabled, execState: execState, f: f, onChange: onChange })),
         elements.includes('err') && errMsg && (React.createElement(UCFormFieldErr, { errMsg: errMsg })),
-        elements.includes('desc') && React.createElement(UCFormFieldDesc, { field: field })));
+        elements.includes('desc') && React.createElement(UCFormFieldDesc, { f: f })));
 }

package/dist/esm/target/react-native-pure/UCFormFieldControl.d.ts

@@ -1,11 +1,4 @@
 import { type ReactElement } from 'react';
-import type { DataType, ErrorMessage } from '../../dt/index.js';
-import { type UCInputField } from '../../uc/index.js';
-import type { UCFormFieldControlOnChange } from '../lib/react/form.js';
-import type { UCPanelState } from '../lib/react/panel.js';
-export type Props<T extends DataType> = UCPanelState & {
-    errMsg?: ErrorMessage | null;
-    field: UCInputField<T>;
-    onChange: UCFormFieldControlOnChange<T>;
-};
-export declare function UCFormFieldControl<T extends DataType>({ errMsg, execState, field, onChange: onChangeBase, }: Props<T>): ReactElement;
+import type { DataType } from '../../dt/index.js';
+import type { UCFormFieldControlProps } from '../lib/react/form.js';
+export declare function UCFormFieldControl<T extends DataType>({ errMsg, execState, f, onChange: onChangeBase, }: UCFormFieldControlProps<T>): ReactElement;

package/dist/esm/target/react-native-pure/UCFormFieldControl.js

@@ -4,22 +4,23 @@ import { UCInputFieldChangeOperator, ucifRepeatability, } from '../../uc/index.j
 import { isBlank } from '../../utils/index.js';
 import { rnInputDef } from '../lib/rn/input.js';
 const MULTIPLE_VALUES_SEPARATOR = ',';
-export function UCFormFieldControl({ errMsg = null, execState, field, onChange: onChangeBase, }) {
-    const [internalValue, setInternalValue] = useState(field.getValue());
+export function UCFormFieldControl({ errMsg = null, execState, f, onChange: onChangeBase, }) {
+    const [internalValue, setInternalValue] = useState(f.getValue());
+    // biome-ignore lint/correctness/useExhaustiveDependencies: false positive : It is actually necessary (only `field` does not trigger the effect)
     useEffect(() => {
-        setInternalValue(field.getValue());
-    }, [field.getValue()]);
-    const attrs = rnInputDef(field, execState, errMsg);
+        setInternalValue(f.getValue());
+    }, [f.getValue()]);
+    const attrs = rnInputDef(f, execState, errMsg);
     const onChangeText = (value) => {
-        const [isRepeatable] = ucifRepeatability(field.def);
+        const [isRepeatable] = ucifRepeatability(f.def);
         if (isRepeatable && typeof value === 'string') {
             const valueArr = value
                 .split(MULTIPLE_VALUES_SEPARATOR)
                 .map((v) => v.trim());
-            onChangeBase(field, UCInputFieldChangeOperator.SET, valueArr);
+            onChangeBase(f, UCInputFieldChangeOperator.SET, valueArr);
         }
         else {
-            onChangeBase(field, UCInputFieldChangeOperator.SET, value);
+            onChangeBase(f, UCInputFieldChangeOperator.SET, value);
         }
         setInternalValue(value);
     };

package/dist/esm/target/react-native-pure/UCFormFieldDesc.d.ts

@@ -1,7 +1,4 @@
 import { type ReactElement } from 'react';
 import type { DataType } from '../../dt/index.js';
-import type { UCInputField } from '../../uc/index.js';
-export interface Props<T extends DataType> {
-    field: UCInputField<T>;
-}
-export declare function UCFormFieldDesc<T extends DataType>({ field, }: Props<T>): ReactElement | null;
+import type { UCFormFieldDescProps } from '../lib/react/form.js';
+export declare function UCFormFieldDesc<T extends DataType>({ f, }: UCFormFieldDescProps<T>): ReactElement | null;

package/dist/esm/target/react-native-pure/UCFormFieldDesc.js

@@ -1,9 +1,9 @@
 import React, {} from 'react';
 import { Text } from 'react-native';
 import { useDIContext } from '../lib/react/DIContextProvider.js';
-export function UCFormFieldDesc({ field, }) {
+export function UCFormFieldDesc({ f, }) {
     const { wordingManager } = useDIContext();
-    const { desc } = wordingManager.ucif(field);
+    const { desc } = wordingManager.ucif(f);
     if (!desc) {
         return null;
     }

package/dist/esm/target/react-native-pure/UCFormFieldErr.d.ts

@@ -1,7 +1,3 @@
 import { type ReactElement } from 'react';
-import type { ErrorMessage } from '../../dt/index.js';
-interface Props {
-    errMsg: ErrorMessage;
-}
-export declare function UCFormFieldErr({ errMsg }: Props): ReactElement;
-export {};
+import type { UCFormFieldErrProps } from '../lib/react/form.js';
+export declare function UCFormFieldErr({ errMsg }: UCFormFieldErrProps): ReactElement;

package/dist/esm/target/react-native-pure/UCFormFieldLabel.d.ts

@@ -1,7 +1,4 @@
 import { type ReactElement } from 'react';
 import type { DataType } from '../../dt/index.js';
-import type { UCInputField } from '../../uc/index.js';
-export interface Props<T extends DataType> {
-    field: UCInputField<T>;
-}
-export declare function UCFormFieldLabel<T extends DataType>({ field, }: Props<T>): ReactElement;
+import type { UCFormFieldLabelProps } from '../lib/react/form.js';
+export declare function UCFormFieldLabel<T extends DataType>({ f, }: UCFormFieldLabelProps<T>): ReactElement;

package/dist/esm/target/react-native-pure/UCFormFieldLabel.js

@@ -1,8 +1,8 @@
 import React, {} from 'react';
 import { Text } from 'react-native';
 import { useDIContext } from '../lib/react/DIContextProvider.js';
-export function UCFormFieldLabel({ field, }) {
+export function UCFormFieldLabel({ f, }) {
     const { wordingManager } = useDIContext();
-    const { label } = wordingManager.ucif(field);
+    const { label } = wordingManager.ucif(f);
     return React.createElement(Text, null, label);
 }

package/dist/esm/target/react-native-pure/UCFormSubmitControl.d.ts

@@ -1,9 +1,4 @@
 import { type ReactElement } from 'react';
 import type { UCInput, UCOPIBase } from '../../uc/index.js';
-import type { UCPanelCtx } from '../lib/react/panel.js';
-export type UCFormSubmitOnPress = () => Promise<void>;
-type Props<I extends UCInput | undefined = undefined, OPI0 extends UCOPIBase | undefined = undefined, OPI1 extends UCOPIBase | undefined = undefined> = UCPanelCtx<I, OPI0, OPI1> & {
-    onPress?: UCFormSubmitOnPress;
-};
-export declare function UCFormSubmitControl<I extends UCInput | undefined = undefined, OPI0 extends UCOPIBase | undefined = undefined, OPI1 extends UCOPIBase | undefined = undefined>({ execState, disabled, onPress, uc }: Props<I, OPI0, OPI1>): ReactElement;
-export {};
+import type { UCFormSubmitControlProps } from '../lib/react/form.js';
+export declare function UCFormSubmitControl<I extends UCInput | undefined = undefined, OPI0 extends UCOPIBase | undefined = undefined, OPI1 extends UCOPIBase | undefined = undefined>({ execState, disabled, onPress, uc, }: UCFormSubmitControlProps<I, OPI0, OPI1>): ReactElement;

package/dist/esm/target/react-native-pure/UCFormSubmitControl.js

@@ -1,7 +1,7 @@
 import React, {} from 'react';
 import { Pressable, Text } from 'react-native';
 import { useDIContext } from '../lib/react/DIContextProvider.js';
-export function UCFormSubmitControl({ execState, disabled, onPress, uc }) {
+export function UCFormSubmitControl({ execState, disabled, onPress, uc, }) {
     const { wordingManager } = useDIContext();
     return (React.createElement(Pressable, { onPress: onPress, disabled: disabled },
         React.createElement(Text, null, wordingManager.ucISubmit(uc.def, execState))));

package/dist/esm/target/react-web-pure/UCForm.js

@@ -12,6 +12,6 @@ export function UCForm({ clearAfterExec, disabled, execState, onChange, onSubmit
     };
     return (React.createElement("form", { onSubmit: onSubmit, ref: formRef },
         uc.inputFieldsForForm().map((f) => (React.createElement("div", { key: f.key },
-            React.createElement(UCFormField, { disabled: disabled, execState: execState, field: f, onChange: onChange })))),
+            React.createElement(UCFormField, { disabled: disabled, execState: execState, f: f, onChange: onChange })))),
         React.createElement(UCFormSubmitControl, { execState: execState, disabled: disabled, uc: uc })));
 }

package/dist/esm/target/react-web-pure/UCFormField.d.ts

@@ -1,11 +1,4 @@
 import { type ReactElement } from 'react';
 import type { DataType } from '../../dt/index.js';
-import { type Props as FormFieldControlProps } from './UCFormFieldControl.js';
-import { type Props as FormFieldLabelProps } from './UCFormFieldLabel.js';
-declare const ELEMENTS: readonly ["control", "desc", "err", "label"];
-type Element = (typeof ELEMENTS)[number];
-type Props<T extends DataType> = FormFieldControlProps<T> & FormFieldLabelProps<T> & {
-    only?: Element[];
-};
-export declare function UCFormField<T extends DataType>({ disabled, execState, field, onChange: onChangeBase, only, }: Props<T>): ReactElement;
-export {};
+import { type UCFormFieldProps } from '../lib/react/form.js';
+export declare function UCFormField<T extends DataType>({ disabled, execState, f, onChange: onChangeBase, only, }: UCFormFieldProps<T>): ReactElement;

package/dist/esm/target/react-web-pure/UCFormField.js

@@ -1,32 +1,21 @@
 import React, { useState } from 'react';
 import { useDIContext } from '../lib/react/DIContextProvider.js';
-import { UCFormFieldControl, } from './UCFormFieldControl.js';
+import { UC_FORM_FIELD_ELEMENTS, validateFormField, } from '../lib/react/form.js';
+import { UCFormFieldControl } from './UCFormFieldControl.js';
 import { UCFormFieldDesc } from './UCFormFieldDesc.js';
 import { UCFormFieldErr } from './UCFormFieldErr.js';
-import { UCFormFieldLabel, } from './UCFormFieldLabel.js';
-const ELEMENTS = ['control', 'desc', 'err', 'label'];
-export function UCFormField({ disabled, execState, field, onChange: onChangeBase, only, }) {
+import { UCFormFieldLabel } from './UCFormFieldLabel.js';
+export function UCFormField({ disabled, execState, f, onChange: onChangeBase, only, }) {
     const { i18nManager } = useDIContext();
-    const { type } = field.def;
     const [errMsg, setErrMsg] = useState(null);
-    const elements = only ?? ELEMENTS;
     const onChange = (f, op, v) => {
-        setErrMsg(null);
-        const vArr = Array.isArray(v) ? v : [v];
-        for (const vv of vArr) {
-            const validation = type.assign(vv).validate();
-            const violation = validation.get();
-            if (violation) {
-                const [key, expected] = violation;
-                setErrMsg(i18nManager.t(key, { vars: { expected } }));
-                break;
-            }
-        }
+        setErrMsg(validateFormField(i18nManager, f, v));
         onChangeBase(f, op, v);
     };
+    const elements = only ?? UC_FORM_FIELD_ELEMENTS;
     return (React.createElement(React.Fragment, null,
-        elements.includes('label') && React.createElement(UCFormFieldLabel, { field: field }),
-        elements.includes('control') && (React.createElement(UCFormFieldControl, { disabled: disabled, execState: execState, field: field, onChange: onChange })),
+        elements.includes('label') && React.createElement(UCFormFieldLabel, { f: f }),
+        elements.includes('control') && (React.createElement(UCFormFieldControl, { disabled: disabled, execState: execState, f: f, onChange: onChange })),
         elements.includes('err') && errMsg && (React.createElement(UCFormFieldErr, { errMsg: errMsg })),
-        elements.includes('desc') && React.createElement(UCFormFieldDesc, { field: field })));
+        elements.includes('desc') && React.createElement(UCFormFieldDesc, { f: f })));
 }

package/dist/esm/target/react-web-pure/UCFormFieldControl.d.ts

@@ -1,11 +1,4 @@
 import { type ReactElement } from 'react';
-import type { DataType, ErrorMessage } from '../../dt/index.js';
-import { type UCInputField } from '../../uc/index.js';
-import type { UCFormFieldControlOnChange } from '../lib/react/form.js';
-import type { UCPanelState } from '../lib/react/panel.js';
-export type Props<T extends DataType> = UCPanelState & {
-    errMsg?: ErrorMessage | null;
-    field: UCInputField<T>;
-    onChange: UCFormFieldControlOnChange<T>;
-};
-export declare function UCFormFieldControl<T extends DataType>({ errMsg, execState, field, onChange: onChangeBase, }: Props<T>): ReactElement;
+import type { DataType } from '../../dt/index.js';
+import type { UCFormFieldControlProps } from '../lib/react/form.js';
+export declare function UCFormFieldControl<T extends DataType>({ errMsg, execState, f, onChange: onChangeBase, }: UCFormFieldControlProps<T>): ReactElement;