@uides/stepwise 1.1.0-d0adc9fb → 2.0.0-07ee8440

package/src/schemas/document.ts

@@ -1,5 +1,4 @@
 import * as v from 'valibot';
-import { nullish, object } from '@uides/stepwise/schemas/common';
 
 /**
  * Describes the state of a document.
@@ -10,7 +9,7 @@ import { nullish, object } from '@uides/stepwise/schemas/common';
  * @value 'extracted' Document has been extracted.
  * @value 'submitting' Document is being submitted.
  */
-export const DocumentState = v.picklist([
+export const DocumentStateSchema = v.picklist([
   'editing',
   'issued',
   'revoked',
@@ -21,84 +20,84 @@ export const DocumentState = v.picklist([
 /**
  * The template of a document.
  */
-export const DocumentTemplate = object({
+export const DocumentTemplateSchema = v.strictObject({
   /** Unique identifier of the template */
   refname: v.string(),
-  'digest-sha256': nullish(v.string()),
+  'digest-sha256': v.nullish(v.string()),
 });
 
 /**
  * Describes a document attachment.
  */
-export const DocumentAttachment = object({
+export const DocumentAttachmentSchema = v.strictObject({
   /** The name of the uploaded file. */
   filename: v.string(),
   /** The cryptographic hash created using the SHA-256 algorithm. */
-  digest_sha256: nullish(v.string()),
+  digest_sha256: v.nullish(v.string()),
   /** The encoding with which the file's content is encoded. */
-  'content-encoding': nullish(v.string()),
+  'content-encoding': v.nullish(v.string()),
   /**
    * The file's encoded content
    *
    * The content is encoded using the encoding specified in the `content-encoding` field.
    * Either this field or the `content-uri` field must be specified, but not both.
    */
-  content: nullish(v.string()),
+  content: v.nullish(v.string()),
   /**
    * The URI for fetching the file's contents
    *
    * This URI will be used to fetch the file's content, in case it is not stored in the `content` field.
    * Either this field or the `content` field must be specified, but not both.
    */
-  'content-uri': nullish(v.string()),
+  'content-uri': v.nullish(v.string()),
 });
 
 /**
  * Describes a document attachment used for input.
  */
-export const DocumentInputAttachment = object({
+export const DocumentInputAttachmentSchema = v.strictObject({
   /** The name of the uploaded file. */
   filename: v.string(),
   /** The cryptographic hash created using the SHA-256 algorithm. */
-  digest_sha256: nullish(v.string()),
+  digest_sha256: v.nullish(v.string()),
   /** The encoding with which the file's content is encoded. */
-  'content-encoding': nullish(v.string()),
+  'content-encoding': v.nullish(v.string()),
   /**
    * The file's content
    */
   content: v.string(),
 });
 
-const BaseDocumentData = object({
+const BaseDocumentDataSchema = v.strictObject({
   /**
    * The statements of the document.
    *
    * Contains the fields of the document, represented as key-value pairs.
    * The keys are the field identifiers.
    */
-  statements: v.record(v.string()),
+  statements: v.record(v.string(), v.string()),
   /**
    * The attachments of the document.
    *
    * Contains the attachments of the document, represented as key-value pairs.
    * The keys are the attachment identifiers, specified in the template.
    */
-  attachments: v.record(DocumentAttachment),
+  attachments: v.record(v.string(), DocumentAttachmentSchema),
   /** The template of the document. */
-  template: DocumentTemplate,
+  template: DocumentTemplateSchema,
   /** The identifier of the case to which the document belongs. */
-  case_id: nullish(v.string()),
-  'declaration-id': nullish(v.string()),
+  case_id: v.nullish(v.string()),
+  'declaration-id': v.nullish(v.string()),
 });
 
 /**
  * Describes the data of a document to be created.
  */
-export const DocumentApiInput = object({
-  ...BaseDocumentData.entries,
-  attachments: v.record(DocumentInputAttachment),
-  step: nullish(v.string()),
-  state: nullish(v.picklist(['issued', 'revoked'])),
+export const DocumentApiInputSchema = v.strictObject({
+  ...BaseDocumentDataSchema.entries,
+  attachments: v.record(v.string(), DocumentInputAttachmentSchema),
+  step: v.nullish(v.string()),
+  state: v.nullish(v.picklist(['issued', 'revoked'])),
 });
 
 /**
@@ -106,28 +105,28 @@ export const DocumentApiInput = object({
  *
  * @see {@link Document}
  */
-export const DocumentSubmission = object({
-  ...BaseDocumentData.entries,
-  attachments: v.record(DocumentInputAttachment),
-  template: nullish(DocumentTemplate),
+export const DocumentSubmissionSchema = v.strictObject({
+  ...BaseDocumentDataSchema.entries,
+  attachments: v.record(v.string(), DocumentInputAttachmentSchema),
+  template: v.nullish(DocumentTemplateSchema),
 });
 
 /**
  * Describes the data of a document.
  */
-export const DocumentData = object({
-  ...BaseDocumentData.entries,
+export const DocumentDataSchema = v.strictObject({
+  ...BaseDocumentDataSchema.entries,
   /**
    * Object containing extra information regarding the document's display.
    */
-  displaying: nullish(v.record(v.any())),
+  displaying: v.nullish(v.record(v.string(), v.any())),
   /**
    * Object containing extra information regarding the document's display.
    * @deprecated
    */
-  display: nullish(v.record(v.any())),
+  display: v.nullish(v.record(v.string(), v.any())),
   /** Timestamp of the document's issuance in ISO format */
-  timestamp: nullish(v.string()),
+  timestamp: v.nullish(v.string()),
   /**
    * The document's issuer.
    * @default 'services.gov.gr'
@@ -136,39 +135,41 @@ export const DocumentData = object({
   /** Whether the document is issued and therefore official, or a draft. */
   is_official: v.boolean(),
   /** The fill-in step of the document, in case the document is being filled in gradually. */
-  step: nullish(v.string()),
+  step: v.nullish(v.string()),
   /** The identifier of the issued document. */
-  'document-id': nullish(v.string()),
+  'document-id': v.nullish(v.string()),
   /** The document's title. */
-  'document-title': nullish(v.string()),
-  'digest-sha256': nullish(v.string()),
-  state: nullish(DocumentState),
+  'document-title': v.nullish(v.string()),
+  'digest-sha256': v.nullish(v.string()),
+  state: v.nullish(DocumentStateSchema),
 });
 
 /**
  * Describes a full document
  */
-export const DocumentFull = object({
-  declaration: DocumentData,
-  'document-refs': nullish(v.record(v.record(v.any()))),
-  'digest-sha256': nullish(v.string()),
-  state: DocumentState,
-  info: nullish(v.record(v.any())),
+export const DocumentFullSchema = v.strictObject({
+  declaration: DocumentDataSchema,
+  'document-refs': v.nullish(
+    v.record(v.string(), v.record(v.string(), v.any()))
+  ),
+  'digest-sha256': v.nullish(v.string()),
+  state: DocumentStateSchema,
+  info: v.nullish(v.record(v.string(), v.any())),
 });
 
-export const DocumentRevokedData = object({
+export const DocumentRevokedDataSchema = v.strictObject({
   'document-id': v.string(),
   /** @default 'revoked' */
-  state: DocumentState,
+  state: DocumentStateSchema,
 });
 
 /**
  * Describes a revoked document.
  */
-export const DocumentRevoked = object({
-  declaration: nullish(DocumentRevokedData),
+export const DocumentRevokedSchema = v.strictObject({
+  declaration: v.nullish(DocumentRevokedDataSchema),
   /** @default 'revoked' */
-  state: DocumentState,
+  state: DocumentStateSchema,
 });
 
 /**
@@ -179,4 +180,7 @@ export const DocumentRevoked = object({
  *
  * @see {@link BaseDocumentData}
  */
-export const Document = v.union([DocumentFull, DocumentRevoked]);
+export const DocumentSchema = v.union([
+  DocumentFullSchema,
+  DocumentRevokedSchema,
+]);

package/src/schemas/edupass-healthstate.ts

@@ -1,25 +1,24 @@
 import * as v from 'valibot';
-import { nullish, object } from '@uides/stepwise/schemas/common';
 
-export const Result = object({
+export const ResultSchema = v.strictObject({
   code: v.number(),
   description: v.picklist(['ΘΕΤΙΚΟ', 'ΑΡΝΗΤΙΚΟ']),
 });
 
-export const IdikaState = object({
+export const IdikaStateSchema = v.strictObject({
   amka: v.string(),
-  birthDate: nullish(v.string()),
-  dateOfFirstDose: nullish(v.string()),
-  dateOfFirstPositiveResult: nullish(v.string()),
-  dateOfResult: nullish(v.string()),
-  dateOfSample: nullish(v.string()),
-  dateOfSecondDose: nullish(v.string()),
-  diagnosisMethodEnum: nullish(v.picklist(['PCR', 'RAPID'])),
-  requiredDoses: nullish(v.number()),
-  result: nullish(Result),
+  birthDate: v.nullish(v.string()),
+  dateOfFirstDose: v.nullish(v.string()),
+  dateOfFirstPositiveResult: v.nullish(v.string()),
+  dateOfResult: v.nullish(v.string()),
+  dateOfSample: v.nullish(v.string()),
+  dateOfSecondDose: v.nullish(v.string()),
+  diagnosisMethodEnum: v.nullish(v.picklist(['PCR', 'RAPID'])),
+  requiredDoses: v.nullish(v.number()),
+  result: v.nullish(ResultSchema),
 });
 
-const UserStatus = v.picklist([
+const UserStatusSchema = v.picklist([
   'ΜέλοςΔ.Ε.Π.',
   'ΜέλοςΕ.Ε.Π.',
   'ΜέλοςΕ.ΔΙ.Π.',
@@ -29,41 +28,45 @@ const UserStatus = v.picklist([
   'Άλλο–Επιστημονικός-ήσυνεργάτης',
 ]);
 
-const StudyCycle = v.picklist(['Προπτυχιακό', 'Μεταπτυχιακό', 'Διδακτορικό']);
+const StudyCycleSchema = v.picklist([
+  'Προπτυχιακό',
+  'Μεταπτυχιακό',
+  'Διδακτορικό',
+]);
 
-export const Metadata = object({
-  aft: nullish(v.string()),
-  am: nullish(v.string()),
+export const MetadataSchema = v.strictObject({
+  aft: v.nullish(v.string()),
+  am: v.nullish(v.string()),
   firstname: v.string(),
   lastname: v.string(),
-  birthdate: nullish(v.string()),
-  user_status: nullish(UserStatus),
-  study_cycle: nullish(StudyCycle),
+  birthdate: v.nullish(v.string()),
+  user_status: v.nullish(UserStatusSchema),
+  study_cycle: v.nullish(StudyCycleSchema),
 });
 
-export const Healthstate = object({
+export const HealthstateSchema = v.strictObject({
   valid_until: v.string(),
-  declaration_last_updated_at: nullish(v.string()),
-  declaration_last_updated_origin: nullish(v.number()),
-  monitored_last_updated_at: nullish(v.string()),
-  monitored_since: nullish(v.string()),
-  monitored_status: nullish(v.picklist(['ΚΟΝΤΙΝΗ ΘΕΣΗ', 'ΣΤΕΝΗ ΕΠΑΦΗ'])),
-  self_test_amka: nullish(v.string()),
-  self_test_amka_origin: nullish(v.number()),
-  self_test_date: nullish(v.string()),
-  self_test_origin: nullish(v.number()),
-  self_test_result: nullish(v.string()),
-  quarantine_start_date: nullish(v.string()),
-  idika_state: nullish(IdikaState),
-  idika_state_call_id: nullish(v.string()),
-  idika_state_last_updated_at: nullish(v.string()),
-  amka: nullish(v.string()),
-  amka_origin: nullish(v.number()),
-  can_use_amka: nullish(v.boolean()),
-  can_use_amka_origin: nullish(v.number()),
-  metadata: nullish(Metadata),
-  metadata_origin: nullish(v.number()),
-  amka_crosschecked_with_idika: nullish(v.string()),
-  unverified_amka: nullish(v.string()),
-  unverified_amka_origin: nullish(v.string()),
+  declaration_last_updated_at: v.nullish(v.string()),
+  declaration_last_updated_origin: v.nullish(v.number()),
+  monitored_last_updated_at: v.nullish(v.string()),
+  monitored_since: v.nullish(v.string()),
+  monitored_status: v.nullish(v.picklist(['ΚΟΝΤΙΝΗ ΘΕΣΗ', 'ΣΤΕΝΗ ΕΠΑΦΗ'])),
+  self_test_amka: v.nullish(v.string()),
+  self_test_amka_origin: v.nullish(v.number()),
+  self_test_date: v.nullish(v.string()),
+  self_test_origin: v.nullish(v.number()),
+  self_test_result: v.nullish(v.string()),
+  quarantine_start_date: v.nullish(v.string()),
+  idika_state: v.nullish(IdikaStateSchema),
+  idika_state_call_id: v.nullish(v.string()),
+  idika_state_last_updated_at: v.nullish(v.string()),
+  amka: v.nullish(v.string()),
+  amka_origin: v.nullish(v.number()),
+  can_use_amka: v.nullish(v.boolean()),
+  can_use_amka_origin: v.nullish(v.number()),
+  metadata: v.nullish(MetadataSchema),
+  metadata_origin: v.nullish(v.number()),
+  amka_crosschecked_with_idika: v.nullish(v.string()),
+  unverified_amka: v.nullish(v.string()),
+  unverified_amka_origin: v.nullish(v.string()),
 });

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

@@ -1,14 +1,13 @@
 import * as v from 'valibot';
-import { nullish, object } from '@uides/stepwise/schemas/common';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
-const AfmDisplay = createFieldDisplay(
-  object({
+const AfmDisplaySchema = createFieldDisplay(
+  v.strictObject({
     component: v.literal('afm'),
   })
 );
 
-const AfmAttribute = nullish(
+const AfmAttributeSchema = v.nullish(
   v.picklist([
     'afm',
     'confirm_signatories:afm',
@@ -25,14 +24,14 @@ const AfmAttribute = nullish(
   ])
 );
 
-const Afm = object({
+const AfmSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required', 'display']),
-  attribute: AfmAttribute,
-  datatype: nullish(v.literal('afm')),
-  display: AfmDisplay,
-  'default-value': nullish(v.string()),
+  attribute: AfmAttributeSchema,
+  datatype: v.nullish(v.literal('afm')),
+  display: AfmDisplaySchema,
+  'default-value': v.nullish(v.string()),
 });
-export type AfmType = v.Output<typeof Afm>;
-export type AfmSchemaType = v.BaseSchema<AfmType, AfmType>;
+export type AfmType = v.InferOutput<typeof AfmSchema>;
+export type AfmSchemaType = v.GenericSchema<AfmType>;
 
-export default Afm as AfmSchemaType;
+export default AfmSchema as AfmSchemaType;

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

@@ -1,20 +1,21 @@
 import * as v from 'valibot';
-import { object, nullish } from '@uides/stepwise/schemas/common';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
-const AmkaDisplay = createFieldDisplay(
-  object({
+const AmkaDisplaySchema = createFieldDisplay(
+  v.strictObject({
     component: v.literal('amka'),
   })
 );
 
-const Amka = object({
+const AmkaSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required']),
-  'default-value': nullish(v.string()),
+  'default-value': v.nullish(v.string()),
   attribute: v.optional(v.null_()),
-  display: AmkaDisplay,
-  datatype: nullish(v.literal('amka')),
+  display: AmkaDisplaySchema,
+  datatype: v.nullish(v.literal('amka')),
 });
-export type AmkaType = v.BaseSchema<v.Output<typeof Amka>>;
 
-export default Amka as AmkaType;
+export type AmkaType = v.InferOutput<typeof AmkaSchema>;
+export type AmkaSchemaType = v.GenericSchema<AmkaType>;
+
+export default AmkaSchema as AmkaSchemaType;

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

@@ -1,31 +1,30 @@
 import * as v from 'valibot';
-import { nullish, object } from '@uides/stepwise/schemas/common';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
-const AttachmentDisplay = createFieldDisplay(
-  object({
+const AttachmentDisplaySchema = createFieldDisplay(
+  v.strictObject({
     component: v.literal('attachment'),
-    'component-params': nullish(
-      object({
-        filetype: nullish(v.picklist(['pdf', 'pdf-for-mark'])),
-        'file-max-size': nullish(v.number()),
+    'component-params': v.nullish(
+      v.strictObject({
+        filetype: v.nullish(v.picklist(['pdf', 'pdf-for-mark'])),
+        'file-max-size': v.nullish(v.number()),
       })
     ),
   }),
-  object({
+  v.strictObject({
     component: v.literal('attachment'),
-    'component-params': nullish(
+    'component-params': v.nullish(
       // TODO: Make pdf component-params also inherit default component-params
-      object({
-        filetype: nullish(v.picklist(['pdf', 'pdf-for-mark'])),
-        'file-max-size': nullish(v.number()),
-        coordinates: nullish(v.array(v.nullable(v.number()))),
+      v.strictObject({
+        filetype: v.nullish(v.picklist(['pdf', 'pdf-for-mark'])),
+        'file-max-size': v.nullish(v.number()),
+        coordinates: v.nullish(v.array(v.nullable(v.number()))),
       })
     ),
   })
 );
 
-const AttachmentAttribute = nullish(
+const AttachmentAttributeSchema = v.nullish(
   v.picklist([
     'cert_registry:pdf',
     'cert_registry_v2:certificate',
@@ -44,12 +43,14 @@ const AttachmentAttribute = nullish(
   ])
 );
 
-const Attachment = object({
+const AttachmentSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required', 'display']),
-  datatype: nullish(v.literal('attachment')),
-  attribute: AttachmentAttribute,
-  display: AttachmentDisplay,
+  datatype: v.nullish(v.literal('attachment')),
+  attribute: AttachmentAttributeSchema,
+  display: AttachmentDisplaySchema,
 });
-export type AttachmentType = v.BaseSchema<v.Output<typeof Attachment>>;
 
-export default Attachment as AttachmentType;
+export type AttachmentType = v.InferOutput<typeof AttachmentSchema>;
+export type AttachmentSchemaType = v.GenericSchema<AttachmentType>;
+
+export default AttachmentSchema as AttachmentSchemaType;

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

@@ -1,17 +1,18 @@
 import * as v from 'valibot';
-import { object } from '@uides/stepwise/schemas/common';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
-const CaptchaDisplay = createFieldDisplay(
-  object({
+const CaptchaDisplaySchema = createFieldDisplay(
+  v.strictObject({
     component: v.literal('captcha'),
   })
 );
 
-const Captcha = object({
+const CaptchaSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required']),
-  display: CaptchaDisplay,
+  display: CaptchaDisplaySchema,
 });
-export type CaptchaType = v.BaseSchema<v.Output<typeof Captcha>>;
 
-export default Captcha as CaptchaType;
+export type CaptchaType = v.InferOutput<typeof CaptchaSchema>;
+export type CaptchaSchemaType = v.GenericSchema<CaptchaType>;
+
+export default CaptchaSchema as CaptchaSchemaType;

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

@@ -1,23 +1,22 @@
 import * as v from 'valibot';
-import { nullish, object } from '@uides/stepwise/schemas/common';
 import { createFieldDisplay } from '@uides/stepwise/schemas/field/common';
 
-const ChoiceDisplay = createFieldDisplay(
-  object({
+const ChoiceDisplaySchema = createFieldDisplay(
+  v.strictObject({
     component: v.literal('choice'),
-    choices: nullish(v.union([v.string(), v.record(v.string())])),
-    'choices-order': nullish(v.string()),
-    'component-params': nullish(
-      object({
-        autocomplete: nullish(v.boolean()),
-        'legacy-mode': nullish(v.boolean()),
-        'format-title': nullish(v.boolean()),
+    choices: v.nullish(v.union([v.string(), v.record(v.string(), v.string())])),
+    'choices-order': v.nullish(v.string()),
+    'component-params': v.nullish(
+      v.strictObject({
+        autocomplete: v.nullish(v.boolean()),
+        'legacy-mode': v.nullish(v.boolean()),
+        'format-title': v.nullish(v.boolean()),
       })
     ),
   })
 );
 
-const ChoicesSourceFn = nullish(
+const ChoicesSourceFnSchema = v.nullish(
   v.picklist([
     'dilosi.applications.deddie.claims.common.get_groups',
     'dilosi.applications.diplomas.claims.common.get_didactic_years',
@@ -28,14 +27,16 @@ const ChoicesSourceFn = nullish(
   ])
 );
 
-const Choice = object({
+const ChoiceSchema = v.strictObject({
   'user-input-mode': v.picklist(['noinput', 'optional', 'required']),
-  display: ChoiceDisplay,
-  'default-value': nullish(v.string()),
-  'choices-source-fn': ChoicesSourceFn,
-  attribute: nullish(v.literal('find_onomatodosia:contact_confirm')),
-  datatype: nullish(v.picklist(['choice', 'string'])),
+  display: ChoiceDisplaySchema,
+  'default-value': v.nullish(v.string()),
+  'choices-source-fn': ChoicesSourceFnSchema,
+  attribute: v.nullish(v.literal('find_onomatodosia:contact_confirm')),
+  datatype: v.nullish(v.picklist(['choice', 'string'])),
 });
-export type ChoiceType = v.BaseSchema<v.Output<typeof Choice>>;
 
-export default Choice as ChoiceType;
+export type ChoiceType = v.InferOutput<typeof ChoiceSchema>;
+export type ChoiceSchemaType = v.GenericSchema<ChoiceType>;
+
+export default ChoiceSchema as ChoiceSchemaType;

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

@@ -36,19 +36,13 @@ const fiedlWithAllDisplays = {
 };
 
 const DisplaySchema = createFieldDisplay(
-  v.object(
-    {
-      label: v.string(),
-      value: v.number(),
-    },
-    v.never()
-  ),
-  v.object(
-    {
-      flag: v.boolean(),
-    },
-    v.never()
-  )
+  v.strictObject({
+    label: v.string(),
+    value: v.number(),
+  }),
+  v.strictObject({
+    flag: v.boolean(),
+  })
 );
 
 describe('field display schema', () => {