@uides/stepwise 1.1.0-d0adc9fb → 2.0.0-2a26e869

package/src/schemas/validation-context/validation-context.ts

@@ -1,71 +1,72 @@
 import * as v from 'valibot';
 import {
-  ComponentLayout,
-  DisplayLang,
-  DisplayMode,
-  nullish,
-  object,
+  ComponentLayoutSchema,
+  DisplayLangSchema,
+  DisplayModeSchema,
 } from '@uides/stepwise/schemas/common';
 import {
-  UserInputMode,
-  ValidationFieldComponent,
+  UserInputModeSchema,
+  ValidationFieldComponentSchema,
 } from '@uides/stepwise/schemas/validation-context/enums';
 
-export const ValidationComponentParams = object({
-  title: nullish(v.string()),
-  label: nullish(v.string()),
-  text: nullish(v.string()),
-  helptext: nullish(v.string()),
-  'action-label': nullish(v.string()),
-  'action-cancel-label': nullish(v.string()),
-  'error-messages': nullish(v.record(v.string())),
-  note: v.record(v.any()),
+export const ValidationComponentParamsSchema = v.strictObject({
+  title: v.nullish(v.string()),
+  label: v.nullish(v.string()),
+  text: v.nullish(v.string()),
+  helptext: v.nullish(v.string()),
+  'action-label': v.nullish(v.string()),
+  'action-cancel-label': v.nullish(v.string()),
+  'error-messages': v.nullish(v.record(v.string(), v.string())),
+  note: v.record(v.string(), v.any()),
 });
 
-const ValidationFieldDisplay = object({
-  component: nullish(ValidationFieldComponent),
-  'component-params': nullish(
-    v.union([ValidationComponentParams, v.record(v.any())])
+const ValidationFieldDisplaySchema = v.strictObject({
+  component: v.nullish(ValidationFieldComponentSchema),
+  'component-params': v.nullish(
+    v.union([ValidationComponentParamsSchema, v.record(v.string(), v.any())])
   ),
-  layout: nullish(ComponentLayout),
+  layout: v.nullish(ComponentLayoutSchema),
 });
-export const ValidationField = object({
-  display: v.record(DisplayMode, v.record(DisplayLang, ValidationFieldDisplay)),
-  'user-input-mode': UserInputMode,
+export const ValidationFieldSchema = v.strictObject({
+  display: v.record(
+    DisplayModeSchema,
+    v.record(DisplayLangSchema, ValidationFieldDisplaySchema)
+  ),
+  'user-input-mode': UserInputModeSchema,
 });
 
-const ValidationFieldsetDisplay = object({
-  component: nullish(v.literal('form')),
-  layout: nullish(ComponentLayout),
+const ValidationFieldsetDisplaySchema = v.strictObject({
+  component: v.nullish(v.literal('form')),
+  layout: v.nullish(ComponentLayoutSchema),
 });
-export const ValidationFieldset = object({
+export const ValidationFieldsetSchema = v.strictObject({
   display: v.record(
-    DisplayMode,
-    v.record(DisplayLang, ValidationFieldsetDisplay)
+    DisplayModeSchema,
+    v.record(DisplayLangSchema, ValidationFieldsetDisplaySchema)
   ),
   'field-order': v.string(),
 });
 
-const I18n = object({
-  languages: v.record(DisplayLang, object({ label: v.string() })),
+const I18nSchema = v.strictObject({
+  languages: v.record(DisplayLangSchema, v.strictObject({ label: v.string() })),
   'language-order': v.string(),
-  'default-language': DisplayLang,
+  'default-language': DisplayLangSchema,
 });
-export const ValidationContextDisplay = object({
-  serviceName: nullish(v.string()),
-  serviceURL: nullish(v.string()),
-  backlink: nullish(v.boolean()),
-  layout: nullish(ComponentLayout),
-  i18n: nullish(I18n),
+export const ValidationContextDisplaySchema = v.strictObject({
+  serviceName: v.nullish(v.string()),
+  serviceURL: v.nullish(v.string()),
+  backlink: v.nullish(v.boolean()),
+  layout: v.nullish(ComponentLayoutSchema),
+  i18n: v.nullish(I18nSchema),
 });
 
-export const ValidationContext = object({
+export const ValidationContextSchema = v.strictObject({
   display: v.record(
-    DisplayMode,
-    v.record(DisplayLang, ValidationContextDisplay)
+    DisplayModeSchema,
+    v.record(DisplayLangSchema, ValidationContextDisplaySchema)
   ),
-  fields: v.record(ValidationField),
-  fieldsets: v.record(ValidationFieldset),
+  fields: v.record(v.string(), ValidationFieldSchema),
+  fieldsets: v.record(v.string(), ValidationFieldsetSchema),
   'action-order': v.string(),
   'fieldset-order': v.string(),
 });

package/src/utils/index.spec.ts

@@ -3,6 +3,7 @@ import { collectIssues } from '@uides/stepwise/utils';
 
 const fieldSchema = v.object({
   fields: v.record(
+    v.string(),
     v.object({
       value: v.string(),
       label: v.string(),
@@ -12,6 +13,7 @@ const fieldSchema = v.object({
 
 const actionSchema = v.object({
   actions: v.record(
+    v.string(),
     v.object({
       value: v.string(),
       label: v.string(),

package/src/utils/index.ts

@@ -1,9 +1,9 @@
-import { SchemaIssues, SchemaIssue } from 'valibot';
+import { BaseIssue } from 'valibot';
 
 const RECORD_LEVELS = ['fields', 'fieldsets', 'actions'];
 
 export function collectIssues(
-  issues: SchemaIssues
+  issues: BaseIssue<unknown>[]
 ): Record<string, Record<string, string>> {
   const formattedIssues: Record<string, Record<string, string>> = {};
   issues.forEach((issue) => {
@@ -46,7 +46,9 @@ export function collectIssues(
   return formattedIssues;
 }
 
-function getNestedIssueMessage(issue: SchemaIssue): Record<string, string> {
+function getNestedIssueMessage(
+  issue: BaseIssue<unknown>
+): Record<string, string> {
   const path = (issue.path?.map((p) => String(p.key)) ?? []).join('/');
   if (issue.issues && issue.issues.length > 0) {
     const nestedIssues: Record<string, string> = {};