@uides/stepwise 1.1.0-rc.26 → 2.0.0-b15d5d44

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

@@ -1,8 +1,7 @@
 import * as v from 'valibot';
-import { nullish, object } from '@uides/stepwise/schemas/common';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
-// const Dataset = nullish(
+// const DatasetSchema = v.nullish(
 //   v.picklist([
 //     '/api/datasets/aako',
 //     '/api/datasets/dimos-lixiarcheio-all',
@@ -17,39 +16,39 @@ import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 //   ])
 // );
 
-const HiddenDisplay = createFieldDisplay(
-  object({
+const HiddenDisplaySchema = createFieldDisplay(
+  v.strictObject({
     component: v.literal('hidden'),
-    // choices: nullish(v.record(v.string())),
-    // 'choices-order': nullish(v.string()),
-    // 'component-params': nullish(
-    //   object({
-    //     bold: nullish(v.boolean()),
-    //     cell_valign: nullish(v.picklist(['BOTTOM', 'MIDDLE', 'TOP'])),
-    //     coordinates: nullish(v.array(v.nullable(v.number()))),
-    //     country: nullish(v.literal('gr')),
-    //     dependencies: nullish(v.record(v.string())),
-    //     'dependencies-error-message': nullish(v.string()),
+    // choices: v.nullish(v.record(v.string())),
+    // 'choices-order': v.nullish(v.string()),
+    // 'component-params': v.nullish(
+    //   v.strictObject({
+    //     bold: v.nullish(v.boolean()),
+    //     cell_valign: v.nullish(v.picklist(['BOTTOM', 'MIDDLE', 'TOP'])),
+    //     coordinates: v.nullish(v.array(v.nullable(v.number()))),
+    //     country: v.nullish(v.literal('gr')),
+    //     dependencies: v.nullish(v.record(v.string())),
+    //     'dependencies-error-message': v.nullish(v.string()),
     //     dataset: Dataset,
-    //     enforceUppercase: nullish(v.boolean()),
-    //     filetype: nullish(v.picklist(['pdf', 'pdf-for-mark'])),
-    //     'file-max-size': nullish(v.number()),
-    //     fontSize: nullish(v.number()),
-    //     format: nullish(v.literal('plaintext')),
-    //     'format-title': nullish(v.boolean()),
-    //     level: nullish(v.literal('Q')),
-    //     mode: nullish(v.picklist(['warning', 'info'])),
-    //     position: nullish(v.picklist(['left', 'right', 'center', 'justify'])),
-    //     size: nullish(v.number()),
-    //     textColor: nullish(v.string()),
-    //     'later-pages': nullish(v.boolean()),
-    //     'legacy-mode': nullish(v.boolean()),
+    //     enforceUppercase: v.nullish(v.boolean()),
+    //     filetype: v.nullish(v.picklist(['pdf', 'pdf-for-mark'])),
+    //     'file-max-size': v.nullish(v.number()),
+    //     fontSize: v.nullish(v.number()),
+    //     format: v.nullish(v.literal('plaintext')),
+    //     'format-title': v.nullish(v.boolean()),
+    //     level: v.nullish(v.literal('Q')),
+    //     mode: v.nullish(v.picklist(['warning', 'info'])),
+    //     position: v.nullish(v.picklist(['left', 'right', 'center', 'justify'])),
+    //     size: v.nullish(v.number()),
+    //     textColor: v.nullish(v.string()),
+    //     'later-pages': v.nullish(v.boolean()),
+    //     'legacy-mode': v.nullish(v.boolean()),
     //   })
     // ),
   })
 );
 
-// const HiddenDatatype = nullish(
+// const HiddenDatatypeSchema = v.nullish(
 //   v.picklist([
 //     'attachment',
 //     'entity_recipient',
@@ -59,40 +58,35 @@ const HiddenDisplay = createFieldDisplay(
 //   ])
 // );
 
-const Hidden = object(
-  {
-    'user-input-mode': v.picklist([
-      'noinput',
-      'optional',
-      'required',
-      'display',
-    ]),
-    display: HiddenDisplay,
-    datatype: nullish(v.string()),
-    sources: nullish(v.string()),
-    'value-constructor': nullish(v.string()),
-    value: nullish(v.string()),
-    attribute: nullish(v.string()),
-    'default-value': nullish(v.string()),
-    'dataset-source-fn': nullish(v.string()),
-    'is-display-field': nullish(v.boolean()),
-  },
-  [
-    // 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"),
-  ]
-);
-export type HiddenType = v.BaseSchema<v.Output<typeof Hidden>>;
+// [
+// 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({
+  'user-input-mode': v.picklist(['noinput', 'optional', 'required', 'display']),
+  display: HiddenDisplaySchema,
+  datatype: v.nullish(v.string()),
+  sources: v.nullish(v.string()),
+  'value-constructor': v.nullish(v.string()),
+  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()),
+});
+
+export type HiddenType = v.InferOutput<typeof HiddenSchema>;
+export type HiddenSchemaType = v.GenericSchema<HiddenType>;
 
-export default Hidden as HiddenType;
+export default HiddenSchema as HiddenSchemaType;

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

@@ -1,22 +1,21 @@
 import * as v from 'valibot';
-import { nullish, object } from '@uides/stepwise/schemas/common';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
-const HierarchicalSelectorDisplay = createFieldDisplay(
-  object({
+const HierarchicalSelectorDisplaySchema = createFieldDisplay(
+  v.strictObject({
     component: v.literal('hierarchical-selector'),
-    'component-params': nullish(
-      object({
-        dataset: nullish(v.string()),
-        'dataset-filter-field': nullish(v.string()),
-        format: nullish(v.literal('plaintext')),
-        initial_loading_levels: nullish(v.number()),
-        multiplicity: nullish(v.number()),
-        multiplicityLabels: nullish(
-          object({
-            addItem: nullish(v.string()),
-            empty: nullish(v.string()),
-            emptyValueDisplay: nullish(v.string()),
+    'component-params': v.nullish(
+      v.strictObject({
+        dataset: v.nullish(v.string()),
+        'dataset-filter-field': v.nullish(v.string()),
+        format: v.nullish(v.literal('plaintext')),
+        initial_loading_levels: v.nullish(v.number()),
+        multiplicity: v.nullish(v.number()),
+        multiplicityLabels: v.nullish(
+          v.strictObject({
+            addItem: v.nullish(v.string()),
+            empty: v.nullish(v.string()),
+            emptyValueDisplay: v.nullish(v.string()),
           })
         ),
       })
@@ -24,23 +23,26 @@ const HierarchicalSelectorDisplay = createFieldDisplay(
   })
 );
 
-const HierarchicalSelector = object({
+const HierarchicalSelectorSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required']),
-  display: HierarchicalSelectorDisplay,
-  attribute: nullish(v.string()),
-  sources: nullish(v.literal('field:operator_syllogos_choice')),
-  'value-constructor': nullish(
+  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'
     )
   ),
-  datatype: nullish(v.picklist(['entity_recipient', 'string'])),
-  'dataset-source-fn': nullish(
+  datatype: v.nullish(v.picklist(['entity_recipient', 'string'])),
+  'dataset-source-fn': v.nullish(
     v.literal('dilosi.applications.foreis.claims.common.get_dimos_dataset')
   ),
 });
-export type HierarchicalSelectorType = v.BaseSchema<
-  v.Output<typeof HierarchicalSelector>
+
+export type HierarchicalSelectorType = v.InferOutput<
+  typeof HierarchicalSelectorSchema
 >;
+export type HierarchicalSelectorSchemaType =
+  v.GenericSchema<HierarchicalSelectorType>;
 
-export default HierarchicalSelector as HierarchicalSelectorType;
+export default HierarchicalSelectorSchema as HierarchicalSelectorSchemaType;

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

@@ -1,23 +1,24 @@
 import * as v from 'valibot';
-import { nullish, object } from '@uides/stepwise/schemas/common';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
-const IbanDisplay = createFieldDisplay(
-  object({
+const IbanDisplaySchema = createFieldDisplay(
+  v.strictObject({
     component: v.literal('iban'),
-    'component-params': nullish(
-      object({
+    'component-params': v.nullish(
+      v.strictObject({
         country: v.literal('gr'),
       })
     ),
   })
 );
 
-const Iban = object({
+const IbanSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required']),
-  display: IbanDisplay,
-  'default-value': nullish(v.string()),
+  display: IbanDisplaySchema,
+  'default-value': v.nullish(v.string()),
 });
-export type IbanType = v.BaseSchema<v.Output<typeof Iban>>;
 
-export default Iban as IbanType;
+export type IbanType = v.InferOutput<typeof IbanSchema>;
+export type IbanSchemaType = v.GenericSchema<IbanType>;
+
+export default IbanSchema as IbanSchemaType;

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

@@ -1,21 +1,20 @@
 import * as v from 'valibot';
-import { nullish, object } from '@uides/stepwise/schemas/common';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
-const ImageDisplay = createFieldDisplay(
-  object({
+const ImageDisplaySchema = createFieldDisplay(
+  v.strictObject({
     component: v.literal('image'),
-    'component-params': nullish(
-      object({
-        attachment_retrieval: nullish(v.literal('content')),
-        position: nullish(v.picklist(['left', 'right', 'center', 'justify'])),
-        coordinates: nullish(v.array(v.nullable(v.number()))),
+    'component-params': v.nullish(
+      v.strictObject({
+        attachment_retrieval: v.nullish(v.literal('content')),
+        position: v.nullish(v.picklist(['left', 'right', 'center', 'justify'])),
+        coordinates: v.nullish(v.array(v.nullable(v.number()))),
       })
     ),
   })
 );
 
-const ImageAttribute = nullish(
+const ImageAttributeSchema = v.nullish(
   v.picklist([
     'amea_card_crop_photo:cropped_amea_card_photo',
     'gov_wallet_academic_id_full_photo:photo',
@@ -25,24 +24,26 @@ const ImageAttribute = nullish(
   ])
 );
 
-const Image = object({
+const ImageSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'required']),
-  display: ImageDisplay,
-  datatype: nullish(v.picklist(['attachment', 'string'])),
-  attribute: ImageAttribute,
-  value: nullish(v.string()),
-  'value-constructor': nullish(
+  display: ImageDisplaySchema,
+  datatype: v.nullish(v.picklist(['attachment', 'string'])),
+  attribute: ImageAttributeSchema,
+  value: v.nullish(v.string()),
+  'value-constructor': v.nullish(
     v.literal(
       'dilosi.applications.pistopoiitiko_spoudon.claims.branching.get_institution_logo_asset_path'
     )
   ),
-  sources: nullish(
+  sources: v.nullish(
     v.picklist([
       'ref:gov_wallet_id:field:id_photo',
       'declaration:template_refname field:institution_choice field:locale',
     ])
   ),
 });
-export type ImageType = v.BaseSchema<v.Output<typeof Image>>;
 
-export default Image as ImageType;
+export type ImageType = v.InferOutput<typeof ImageSchema>;
+export type ImageSchemaType = v.GenericSchema<ImageType>;
+
+export default ImageSchema as ImageSchemaType;

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

@@ -1,9 +1,7 @@
 import * as v from 'valibot';
-import Field from '@uides/stepwise/schemas/field';
+import FieldSchema, { Field } from '@uides/stepwise/schemas/field';
 
-type FieldType = v.Output<typeof Field>;
-
-const afmField: FieldType = {
+const afmField: Field = {
   'user-input-mode': 'noinput',
   display: {
     default: {
@@ -16,15 +14,15 @@ const afmField: FieldType = {
 
 describe('field schema', () => {
   it('should validate a simple field', () => {
-    const result = v.safeParse(Field, afmField);
+    const result = v.safeParse(FieldSchema, afmField);
     expect(result.issues).toBeUndefined();
   });
   it('should validate that a field with a value cannot be editable', () => {
-    const field: FieldType = {
+    const field: Field = {
       'user-input-mode': 'required',
       value: 'some-value',
     };
-    const result = v.safeParse(Field, field);
+    const result = v.safeParse(FieldSchema, field);
     expect(result.issues).toBeDefined();
     expect(result.issues?.length).toBeGreaterThan(0);
     expect(result.issues?.[0].message).toBe(
@@ -33,7 +31,7 @@ describe('field schema', () => {
   });
   describe('display validation', () => {
     it('should fail, given default display mode that is incompatible with specific display mode', () => {
-      const field: FieldType = {
+      const field: Field = {
         'user-input-mode': 'noinput',
         display: {
           default: {
@@ -51,11 +49,11 @@ describe('field schema', () => {
           },
         },
       };
-      const result = v.safeParse(Field, field);
+      const result = v.safeParse(FieldSchema, field);
       expect(result.issues).toBeDefined();
     });
     it('should fail, given default display lang that is incompatible with specific display lang', () => {
-      const field: FieldType = {
+      const field: Field = {
         'user-input-mode': 'noinput',
         display: {
           default: {
@@ -71,15 +69,15 @@ describe('field schema', () => {
           },
         },
       };
-      const result = v.safeParse(Field, field);
+      const result = v.safeParse(FieldSchema, field);
       expect(result.issues).toBeDefined();
     });
     it('should fail, given empty display', () => {
-      const field: FieldType = {
+      const field: Field = {
         'user-input-mode': 'noinput',
         display: {},
       };
-      const result = v.safeParse(Field, field);
+      const result = v.safeParse(FieldSchema, field);
       expect(result?.issues).toBeDefined();
       expect(result?.issues?.length).toBeGreaterThan(0);
       expect(result?.issues?.[0].message).toBe(
@@ -87,11 +85,11 @@ describe('field schema', () => {
       );
     });
     it('should fail, given empty display mode', () => {
-      const field: FieldType = {
+      const field: Field = {
         'user-input-mode': 'noinput',
         display: { default: {} },
       };
-      const result = v.safeParse(Field, field);
+      const result = v.safeParse(FieldSchema, field);
       expect(result?.issues).toBeDefined();
       expect(result?.issues?.length).toBeGreaterThan(0);
       expect(result?.issues?.[0].message).toBe(
@@ -99,7 +97,7 @@ describe('field schema', () => {
       );
     });
     it('should pass, given default display mode that is compatible with specific display mode', () => {
-      const field: FieldType = {
+      const field: Field = {
         'user-input-mode': 'noinput',
         display: {
           default: {
@@ -114,11 +112,11 @@ describe('field schema', () => {
           },
         },
       };
-      const result = v.safeParse(Field, field);
+      const result = v.safeParse(FieldSchema, field);
       expect(result.issues).toBeUndefined();
     });
     it('should pass, given default display lang that is compatible with specific display lang', () => {
-      const field: FieldType = {
+      const field: Field = {
         'user-input-mode': 'noinput',
         display: {
           default: {
@@ -131,7 +129,7 @@ describe('field schema', () => {
           },
         },
       };
-      const result = v.safeParse(Field, field);
+      const result = v.safeParse(FieldSchema, field);
       expect(result.issues).toBeUndefined();
     });
   });