@uides/stepwise 2.0.0-a594a958 → 2.0.0-a64dc016

package/src/schemas/field/amka/index.ts

@@ -4,15 +4,20 @@ import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 const AmkaDisplaySchema = createFieldDisplay(
   v.strictObject({
     component: v.literal('amka'),
+    'component-params': v.nullish(
+      v.strictObject({
+        textColor: v.nullish(v.string()),
+      })
+    ),
   })
 );
 
 const AmkaSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required']),
-  'default-value': v.nullish(v.string()),
-  attribute: v.optional(v.null_()),
+  attribute: v.nullish(v.string()),
   display: AmkaDisplaySchema,
   datatype: v.nullish(v.literal('amka')),
+  'default-value': v.nullish(v.string()),
 });
 
 export type AmkaType = v.InferOutput<typeof AmkaSchema>;

package/src/schemas/field/attachment/index.ts

@@ -1,13 +1,18 @@
 import * as v from 'valibot';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
+const CommonAttachmentComponentParamsSchema = v.strictObject({
+  filetype: v.nullish(v.picklist(['pdf', 'pdf-for-mark'])),
+  'file-max-size': v.nullish(v.number()),
+});
+
 const AttachmentDisplaySchema = createFieldDisplay(
   v.strictObject({
     component: v.literal('attachment'),
     'component-params': v.nullish(
       v.strictObject({
-        filetype: v.nullish(v.picklist(['pdf', 'pdf-for-mark'])),
-        'file-max-size': v.nullish(v.number()),
+        ...CommonAttachmentComponentParamsSchema.entries,
+        multiplicity: v.nullish(v.number()),
       })
     ),
   }),
@@ -16,38 +21,21 @@ const AttachmentDisplaySchema = createFieldDisplay(
     'component-params': v.nullish(
       // TODO: Make pdf component-params also inherit default component-params
       v.strictObject({
-        filetype: v.nullish(v.picklist(['pdf', 'pdf-for-mark'])),
-        'file-max-size': v.nullish(v.number()),
+        ...CommonAttachmentComponentParamsSchema.entries,
         coordinates: v.nullish(v.array(v.nullable(v.number()))),
       })
     ),
   })
 );
 
-const AttachmentAttributeSchema = v.nullish(
-  v.picklist([
-    'cert_registry:pdf',
-    'cert_registry_v2:certificate',
-    'document_submission:uploaded_attachments/fieldatt1',
-    'document_submission:uploaded_attachments/fieldatt2',
-    'file_for_pdfmark:attachment',
-    'find_idiotiko_sym:attachment',
-    'find_idiotiko_sym_service:attachments/attachment',
-    'find_yde:attachment',
-    'gov_wallet_crop_id_photo:cropped_police_id_photo',
-    'gov_wallet_id_photo:original_police_id_photo',
-    'medcert_bebaiosi:pdf',
-    'find_evaluation_b:agreement',
-    'find_evaluation_b:first_meeting_objections',
-    'find_evaluation_b:second_meeting_objections',
-  ])
-);
-
 const AttachmentSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required', 'display']),
   datatype: v.nullish(v.literal('attachment')),
-  attribute: AttachmentAttributeSchema,
+  attribute: v.nullish(v.string()),
   display: AttachmentDisplaySchema,
+  sources: v.nullish(v.string()),
+  'value-constructor': v.nullish(v.string()),
+  'validation-download-attachment-fn': v.nullish(v.string()),
 });
 
 export type AttachmentType = v.InferOutput<typeof AttachmentSchema>;

package/src/schemas/field/choice/index.ts

@@ -16,23 +16,12 @@ const ChoiceDisplaySchema = createFieldDisplay(
   })
 );
 
-const ChoicesSourceFnSchema = v.nullish(
-  v.picklist([
-    'dilosi.applications.deddie.claims.common.get_groups',
-    'dilosi.applications.diplomas.claims.common.get_didactic_years',
-    'dilosi.applications.labdata_results.claims.common.get_exam_choices',
-    'dilosi.applications.vevaiosi_nosileias.claims.common.get_domes_choices',
-    'dilosi.interop_logic.covid_self_tests.common.get_test_choices',
-    'dilosi.interop_logic.certs.get_child_choices',
-  ])
-);
-
 const ChoiceSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required']),
   display: ChoiceDisplaySchema,
   'default-value': v.nullish(v.string()),
-  'choices-source-fn': ChoicesSourceFnSchema,
-  attribute: v.nullish(v.literal('find_onomatodosia:contact_confirm')),
+  'choices-source-fn': v.nullish(v.string()),
+  attribute: v.nullish(v.string()),
   datatype: v.nullish(v.picklist(['choice', 'string'])),
 });
 

package/src/schemas/field/common.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import * as v from 'valibot';
 import {
   DisplayLang,
@@ -5,6 +6,7 @@ import {
   DisplayLangSchema as BaseDisplayLangSchema,
 } from '@uides/stepwise/schemas/common';
 import { resolveDisplay } from '@uides/stepwise/schemas/resolve';
+import { isFailureDataset } from '@uides/stepwise/utils';
 
 // TODO: Make default lang mandatory?
 const FieldDisplayLangSchema = v.pipe(
@@ -54,14 +56,41 @@ export interface DisplayType<
 }
 
 // TODO: Is type too big?
+/**
+ * Creates a field display schema with specified default and PDF display properties.
+ *
+ * Defaults are:
+ * - title
+ * - title_md
+ * - value_md
+ * - hint
+ * - hint_md
+ * - template_hint
+ * - layout
+ *   - md
+ * - example
+ */
 export function createFieldDisplay<
   D extends v.ObjectEntries,
   P extends v.ObjectEntries = never,
 >(
-  DefaultDisplay: v.StrictObjectSchema<D, undefined>,
-  PdfDisplay?: v.StrictObjectSchema<P, undefined>
+  DefaultDisplay:
+    | v.StrictObjectSchema<D, undefined>
+    | v.LooseObjectSchema<D, undefined>,
+  // TODO: Add PDF validation
+
+  // @ts-expect-error value not used
+  PdfDisplay?:
+    | v.StrictObjectSchema<P, undefined>
+    | v.LooseObjectSchema<P, undefined>
 ) {
-  const defaultDisplayContent = v.strictObject({
+  // Base schema for display modes
+  // Use loose or strict object based on DefaultDisplay schema type
+  const baseObjectSchema = (isLooseObject(DefaultDisplay)
+    ? v.looseObject
+    : v.strictObject) as unknown as typeof v.object;
+
+  const defaultDisplayContent = baseObjectSchema({
     ...FieldDisplayModeBaseSchema.entries,
     ...DefaultDisplay.entries,
   });
@@ -70,76 +99,71 @@ export function createFieldDisplay<
     v.record(v.string(), defaultDisplayContent)
   );
 
-  const pdfDisplayContent = v.strictObject({
-    ...FieldDisplayModeBaseSchema.entries,
-    ...v.partial(DefaultDisplay).entries,
-    ...PdfDisplay?.entries,
-  });
-  const pdfDisplaySchema = v.record(
-    v.string(),
-    v.record(v.string(), pdfDisplayContent)
-  );
+  // const pdfDisplayContent = v.strictObject({
+  //   ...FieldDisplayModeBaseSchema.entries,
+  //   ...v.partial(DefaultDisplay).entries,
+  //   ...PdfDisplay?.entries,
+  // });
+  // const pdfDisplaySchema = v.record(
+  //   v.string(),
+  //   v.record(v.string(), pdfDisplayContent)
+  // );
 
   const DisplaySchema = v.pipe(
-    v.record(v.string(), v.any()), // TODO: Unnecessary?
+    v.record(v.string(), v.any()),
     v.rawCheck<
       DisplayType<
         typeof defaultDisplayContent,
         typeof defaultDisplayContent,
-        typeof pdfDisplayContent
+        typeof defaultDisplayContent
       >
     >(({ addIssue, dataset }) => {
+      if (isFailureDataset(dataset)) return;
       const display = dataset.value;
-      if (!(display && typeof display === 'object')) {
-        addIssue({
-          message: 'Display must be an object.',
-        });
-        return;
-      }
 
       DisplayModeSchema.options.forEach((displayMode) => {
         if (
-          !(
-            displayMode in display &&
-            display[displayMode as keyof typeof display]
-          )
+          !(displayMode in display && display[displayMode]) ||
+          displayMode === 'pdf' // TODO: Add PDF validation
         )
           return;
-        Object.keys(display[displayMode as keyof typeof display]).forEach(
-          (displayLang) => {
-            const resolvedDisplay = resolveDisplay(
-              displayMode,
-              displayLang as DisplayLang,
-              display
-            );
-            const displaySchema =
-              displayMode === 'pdf' ? pdfDisplaySchema : defaultDisplaySchema;
-            const result = v.safeParse(displaySchema, {
-              [displayMode]: {
-                [displayLang]: resolvedDisplay,
-              },
-            });
-            if (result.issues) {
-              // TODO: Add subissues
-              result.issues.forEach((issue) => {
-                addIssue({
-                  message: issue.message,
-                  path: issue.path,
-                  input: issue.input,
-                  expected: issue.expected ?? undefined,
-                  received: issue.received,
-                  label: 'Display schema',
-                });
+        Object.keys(display[displayMode]).forEach((displayLang) => {
+          const resolvedDisplay = resolveDisplay(
+            displayMode,
+            displayLang as DisplayLang,
+            display
+          );
+          const displaySchema = defaultDisplaySchema;
+          const result = v.safeParse(displaySchema, {
+            [displayMode]: {
+              [displayLang]: resolvedDisplay,
+            },
+          });
+          if (result.issues) {
+            // TODO: Add subissues
+            result.issues.forEach((issue) => {
+              addIssue({
+                message: issue.message,
+                path: issue.path,
+                input: issue.input,
+                expected: issue.expected ?? undefined,
+                received: issue.received,
+                label: 'Display schema',
               });
-            }
+            });
           }
-        );
+        });
       });
     })
   );
   return DisplaySchema;
 }
 
+const isLooseObject = <T extends v.ObjectEntries>(
+  schema: v.StrictObjectSchema<T, undefined> | v.LooseObjectSchema<T, undefined>
+): schema is v.LooseObjectSchema<T, undefined> =>
+  schema.type === 'loose_object';
+
 const FieldDisplayModeBaseSchema = v.strictObject({
   title: v.nullish(v.string()),
   title_md: v.nullish(v.number()),

package/src/schemas/field/consent-content/index.ts

@@ -0,0 +1,28 @@
+import * as v from 'valibot';
+import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
+
+const ConsentContentDisplaySchema = createFieldDisplay(
+  v.strictObject({
+    component: v.literal('consent-content'),
+    'component-params': v.nullish(
+      v.strictObject({
+        'display-values': v.nullish(v.boolean()),
+        'data-label': v.nullish(v.string()),
+        'recipient-label': v.nullish(v.string()),
+        'transaction-label': v.nullish(v.string()),
+      })
+    ),
+  })
+);
+
+const ConsentContentSchema = v.strictObject({
+  'user-input-mode': v.literal('display'),
+  display: ConsentContentDisplaySchema,
+  sources: v.nullish(v.string()),
+  'value-constructor': v.nullish(v.string()),
+});
+
+export type ConsentContentType = v.InferOutput<typeof ConsentContentSchema>;
+export type ConsentContentSchemaType = v.GenericSchema<ConsentContentType>;
+
+export default ConsentContentSchema as ConsentContentSchemaType;

package/src/schemas/field/date/index.ts

@@ -23,40 +23,13 @@ const DateDisplaySchema = createFieldDisplay(
   })
 );
 
-const DateAttributeSchema = v.nullish(
-  v.picklist([
-    'covid19_negative_test_2:birthDate',
-    'covid19_negative_test_2:dateOfResult',
-    'covid19_rat:birthDate',
-    'covid19_rat:dateOfResult',
-    'covid19_recovery_2:birthDate',
-    'covid19_recovery_2:dateOfResult',
-    'covid_vaccine:first_shot_date',
-    'covid_vaccine:second_shot_date',
-    'covid_vaccine_3:event_1_date',
-    'covid_vaccine_3:event_2_date',
-    'covid_vaccine_3:event_3_date',
-    'covid_vaccine_3:event_4_date',
-    'covid_vaccine_3:event_5_date',
-    'covid_vaccine_3:event_6_date',
-    'yme_kteo:ImerominiaOraDTE',
-    'birth_date',
-  ])
-);
-
 const DateSchema = v.strictObject({
-  'user-input-mode': v.picklist(['noinput', 'required']),
+  'user-input-mode': v.picklist(['noinput', 'required', 'optional']),
   display: DateDisplaySchema,
-  attribute: DateAttributeSchema,
-  sources: v.nullish(v.literal('declaration:timestamp')),
-  datatype: v.nullish(v.picklist(['date', 'string'])),
-  'value-constructor': v.nullish(
-    v.picklist([
-      'dilosi.interop_logic.common.get_local_date',
-      'dilosi.interop_logic.common.get_local_date_time',
-      'dilosi.interop_logic.common.get_local_date_time_sec',
-    ])
-  ),
+  attribute: v.nullish(v.string()),
+  sources: v.nullish(v.string()),
+  datatype: v.nullish(v.literal('date')),
+  'value-constructor': v.nullish(v.string()),
   value: v.nullish(v.string()),
   'is-display-field': v.nullish(v.boolean()),
 });

package/src/schemas/field/doc_subtitle/index.ts

@@ -12,6 +12,7 @@ const DocSubtitleSchema = v.strictObject({
   'user-input-mode': v.literal('noinput'),
   value: v.nullish(v.string()),
   datatype: v.nullish(v.literal('string')),
+  attribute: v.nullish(v.string()),
 });
 
 export type DocSubtitleType = v.InferOutput<typeof DocSubtitleSchema>;

package/src/schemas/field/doc_title/index.ts

@@ -1,36 +1,29 @@
 import * as v from 'valibot';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
+const CommonDocTitleParamsSchema = v.nullish(
+  v.strictObject({
+    leading: v.nullish(v.number()),
+  })
+);
+
 const DocTitleDisplaySchema = createFieldDisplay(
   v.strictObject({
     component: v.literal('doc_title'),
+    'component-params': CommonDocTitleParamsSchema,
   }),
   v.strictObject({
     component: v.literal('doc_title'),
-    'component-params': v.nullish(
-      v.strictObject({
-        leading: v.nullish(v.number()),
-      })
-    ),
+    'component-params': CommonDocTitleParamsSchema,
   })
 );
 
-const DocTitleAttributeSchema = v.nullish(
-  v.picklist([
-    'chosen_degree:pdf_title',
-    'digital_diploma:pdfTitle',
-    'vevaiosi_nosileias:doc_title',
-  ])
-);
-
 const DocTitleSchema = v.strictObject({
   display: DocTitleDisplaySchema,
   'user-input-mode': v.literal('noinput'),
   value: v.nullish(v.string()),
   'default-value': v.nullish(v.string()),
-  'value-constructor': v.nullish(v.string()),
-  sources: v.nullish(v.string()),
-  attribute: DocTitleAttributeSchema,
+  attribute: v.nullish(v.string()),
 });
 
 export type DocTitleType = v.InferOutput<typeof DocTitleSchema>;

package/src/schemas/field/dynamically-filled-text/index.ts

@@ -24,12 +24,11 @@ const DynamicallyFilledTextSchema = v.strictObject({
   display: DynamicallyFilledTextDisplaySchema,
   'user-input-mode': v.picklist(['noinput', 'display']),
   'default-value': v.nullish(v.string()),
-  sources: v.nullish(v.literal('field:page_3_year')),
-  'value-constructor': v.nullish(
-    v.literal('dilosi.interop_logic.metavivasi_akinitou.get_page_3_text')
-  ),
-  'is-display-field': v.nullish(v.boolean()),
+  sources: v.nullish(v.string()),
+  'value-constructor': v.nullish(v.string()),
   attribute: v.nullish(v.string()),
+  datatype: v.nullish(v.literal('string')),
+  'is-display-field': v.nullish(v.boolean()),
 });
 
 export type DynamicallyFilledTextType = v.InferOutput<

package/src/schemas/field/email/index.ts

@@ -4,21 +4,18 @@ import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 const EmailDisplaySchema = createFieldDisplay(
   v.strictObject({
     component: v.literal('email'),
+    'component-params': v.nullish(
+      v.strictObject({
+        multiplicity: v.nullish(v.number()),
+      })
+    ),
   })
 );
 
-const EmailAttributeSchema = v.nullish(
-  v.picklist([
-    'civil_registry:email',
-    'find_onomatodosia:email',
-    'kep:entity_email',
-  ])
-);
-
 const EmailSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required']),
   display: EmailDisplaySchema,
-  attribute: EmailAttributeSchema,
+  attribute: v.nullish(v.string()),
   'default-value': v.nullish(v.string()),
   datatype: v.nullish(v.literal('email')),
 });

package/src/schemas/field/fillable-string/index.ts

@@ -13,7 +13,7 @@ const FillableStringDisplaySchema = createFieldDisplay(
 );
 
 const FillableStringSchema = v.strictObject({
-  'user-input-mode': v.picklist(['noinput', 'display']),
+  'user-input-mode': v.picklist(['noinput', 'display', 'optional']),
   display: FillableStringDisplaySchema,
   attribute: v.nullish(v.string()),
   'default-value': v.nullish(v.string()),

package/src/schemas/field/hidden/index.ts

@@ -1,24 +1,10 @@
 import * as v from 'valibot';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
-// const DatasetSchema = v.nullish(
-//   v.picklist([
-//     '/api/datasets/aako',
-//     '/api/datasets/dimos-lixiarcheio-all',
-//     '/api/datasets/dogma_to_codes',
-//     '/api/datasets/ekab',
-//     '/api/datasets/lixiarheia',
-//     '/api/datasets/troxaia',
-//     '/api/datasets/vas',
-//     '/api/datasets/police-hierarchy',
-//     '/api/datasets/dimos-dimotologio-all',
-//     '/api/datasets/ianos-hierarchy',
-//   ])
-// );
-
 const HiddenDisplaySchema = createFieldDisplay(
-  v.strictObject({
+  v.looseObject({
     component: v.literal('hidden'),
+    'component-params': v.nullish(v.object({})),
     // choices: v.nullish(v.record(v.string())),
     // 'choices-order': v.nullish(v.string()),
     // 'component-params': v.nullish(
@@ -48,32 +34,7 @@ const HiddenDisplaySchema = createFieldDisplay(
   })
 );
 
-// const HiddenDatatypeSchema = v.nullish(
-//   v.picklist([
-//     'attachment',
-//     'entity_recipient',
-//     'multiple-choice',
-//     'postal_code',
-//     'string',
-//   ])
-// );
-
-// [
-// v.custom((values) => {
-//   const datatype = values.datatype;
-//   const display = values.display;
-//   if (!datatype) {
-//     if (display.default?.el) {
-//       const node = display.default.el;
-//       if (node.component === 'hidden') {
-//         return false;
-//       }
-//     }
-//   }
-//   return true;
-// }, "Component 'hidden' with datatype not set"),
-// ]
-const HiddenSchema = v.strictObject({
+const HiddenSchema = v.looseObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required', 'display']),
   display: HiddenDisplaySchema,
   datatype: v.nullish(v.string()),
@@ -82,8 +43,8 @@ const HiddenSchema = v.strictObject({
   value: v.nullish(v.string()),
   attribute: v.nullish(v.string()),
   'default-value': v.nullish(v.string()),
-  'dataset-source-fn': v.nullish(v.string()),
   'is-display-field': v.nullish(v.boolean()),
+  'default-on-empty': v.nullish(v.string()),
 });
 
 export type HiddenType = v.InferOutput<typeof HiddenSchema>;

package/src/schemas/field/hierarchical-selector/index.ts

@@ -27,16 +27,10 @@ const HierarchicalSelectorSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required']),
   display: HierarchicalSelectorDisplaySchema,
   attribute: v.nullish(v.string()),
-  sources: v.nullish(v.literal('field:operator_syllogos_choice')),
-  'value-constructor': v.nullish(
-    v.literal(
-      'dilosi.applications.pistopoiitiko_polyteknias.claims.common.prefill_syllogos_choice'
-    )
-  ),
+  sources: v.nullish(v.string()),
+  'value-constructor': v.nullish(v.string()),
   datatype: v.nullish(v.picklist(['entity_recipient', 'string'])),
-  'dataset-source-fn': v.nullish(
-    v.literal('dilosi.applications.foreis.claims.common.get_dimos_dataset')
-  ),
+  'dataset-source-fn': v.nullish(v.string()),
 });
 
 export type HierarchicalSelectorType = v.InferOutput<

package/src/schemas/field/image/index.ts

@@ -6,7 +6,7 @@ const ImageDisplaySchema = createFieldDisplay(
     component: v.literal('image'),
     'component-params': v.nullish(
       v.strictObject({
-        attachment_retrieval: v.nullish(v.literal('content')),
+        attachment_retrieval: v.nullish(v.picklist(['content', 'content-uri'])),
         position: v.nullish(v.picklist(['left', 'right', 'center', 'justify'])),
         coordinates: v.nullish(v.array(v.nullable(v.number()))),
       })
@@ -14,33 +14,14 @@ const ImageDisplaySchema = createFieldDisplay(
   })
 );
 
-const ImageAttributeSchema = v.nullish(
-  v.picklist([
-    'amea_card_crop_photo:cropped_amea_card_photo',
-    'gov_wallet_academic_id_full_photo:photo',
-    'gov_wallet_amea_card:amea_card/ameaCardPhoto',
-    'gov_wallet_karta_aimodoti:karta_aimodoti/karta_aimodoti_photo',
-    'gov_wallet_crop_id_photo:cropped_police_id_photo',
-  ])
-);
-
 const ImageSchema = v.strictObject({
-  'user-input-mode': v.picklist(['noinput', 'required']),
+  'user-input-mode': v.picklist(['noinput', 'required', 'display']),
   display: ImageDisplaySchema,
   datatype: v.nullish(v.picklist(['attachment', 'string'])),
-  attribute: ImageAttributeSchema,
+  attribute: v.nullish(v.string()),
   value: v.nullish(v.string()),
-  'value-constructor': v.nullish(
-    v.literal(
-      'dilosi.applications.pistopoiitiko_spoudon.claims.branching.get_institution_logo_asset_path'
-    )
-  ),
-  sources: v.nullish(
-    v.picklist([
-      'ref:gov_wallet_id:field:id_photo',
-      'declaration:template_refname field:institution_choice field:locale',
-    ])
-  ),
+  'value-constructor': v.nullish(v.string()),
+  sources: v.nullish(v.string()),
 });
 
 export type ImageType = v.InferOutput<typeof ImageSchema>;

package/src/schemas/field/image-crop/index.ts

@@ -0,0 +1,25 @@
+import * as v from 'valibot';
+import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
+
+const ImageCropDisplaySchema = createFieldDisplay(
+  v.strictObject({
+    component: v.literal('image-crop'),
+    'component-params': v.nullish(
+      v.strictObject({
+        'image-src-field-name': v.nullish(v.string()),
+      })
+    ),
+  })
+);
+
+const ImageCropSchema = v.strictObject({
+  'user-input-mode': v.picklist(['noinput', 'required']),
+  display: ImageCropDisplaySchema,
+  datatype: v.nullish(v.literal('image-crop')),
+  attribute: v.nullish(v.string()),
+});
+
+export type ImageCropType = v.InferOutput<typeof ImageCropSchema>;
+export type ImageCropSchemaType = v.GenericSchema<ImageCropType>;
+
+export default ImageCropSchema as ImageCropSchemaType;