@thejob/schema 1.0.28 → 1.0.30

package/dist/esm/question/choice-question.schema.js

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { NameIdLogoSchema, OtherValueSchema, } from "../common";
+import { Common, NameIdLogoSchema, OtherValueSchema, } from "../common";
 import { array, lazy, mixed, object, string } from "../yup-extended";
-import { AnswerChoiceType, QuestionType } from "./question.constant";
+import { AnswerChoiceType, QuestionType, SupportedAnswerChoiceTypes, } from "./question.constant";
 import { QuestionSchema } from "./question.schema";
 // TODO: Refactor this to use string instead of objcts for values
 const displayByName = (option) => {
@@ -76,15 +76,15 @@ const ChoicePreferredAnswerSchema = (label = "Preferred answer") => mixed().when
         .optional()
         .label(label),
 });
-const ChoiceAnswerSchema = lazy((question) => {
+const getChoiceAnswerSchema = (answerChoiceType, isOptional) => {
     const commonSchema = mixed().oneOfSchema([
         string().max(500),
         NameIdLogoSchema,
         OtherValueSchema,
     ]);
-    if (question.answerChoiceType === AnswerChoiceType.Multiple) {
+    if (answerChoiceType === AnswerChoiceType.Multiple) {
         const multiAnswerSchema = array().of(commonSchema);
-        if (question.isOptional) {
+        if (isOptional) {
             return multiAnswerSchema.optional().default([]);
         }
         else {
@@ -96,20 +96,23 @@ const ChoiceAnswerSchema = lazy((question) => {
     }
     else {
         // Single choice
-        if (question.isOptional) {
+        if (isOptional) {
             return commonSchema.optional();
         }
         else {
             return commonSchema.required("Select an option.");
         }
     }
-});
+};
 export const ChoiceQuestionSchema = QuestionSchema.concat(object().shape({
     type: string()
         .oneOf([QuestionType.Choice])
         .required()
         .label("Question type"),
-    optionsFrom: string().optional().label("Options From"),
+    optionsFrom: string()
+        .oneOf([Common.Skill, Common.EducationLevel, Common.ExperienceLevel])
+        .optional()
+        .label("Option field"),
     options: array()
         .of(lazy((option) => {
         if (typeof option === "string") {
@@ -125,8 +128,11 @@ export const ChoiceQuestionSchema = QuestionSchema.concat(object().shape({
         .min(1)
         .required()
         .label("Options"),
-    // preferredAnswer uses the existing validation
+    answerChoiceType: string()
+        .oneOf(SupportedAnswerChoiceTypes)
+        .required()
+        .default(AnswerChoiceType.Single)
+        .label("Type"),
     preferredAnswer: ChoicePreferredAnswerSchema("Preferred answer"),
-    // The answers field now has its own complete validation logic
-    answers: ChoiceAnswerSchema,
+    answers: mixed().when(["answerChoiceType", "isOptional"], ([answerChoiceType, isOptional], schema) => getChoiceAnswerSchema(answerChoiceType, isOptional)),
 }));

package/dist/esm/question/input-question.schema.d.ts

@@ -1,6 +1,6 @@
-import { InferType } from "../yup-extended";
+import { InferType, ObjectSchema } from "../yup-extended";
 import { QuestionType } from "./question.constant";
-export declare const InputQuestionSchema: import("yup").ObjectSchema<{
+export declare const InputQuestionSchema: ObjectSchema<{
     label: string | undefined;
     default: boolean;
     title: string;

package/dist/esm/question/input-question.schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input-question.schema.d.ts","sourceRoot":"","sources":["../../../src/question/input-question.schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkB,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;MAgB/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,SAAS,CAAC,OAAO,mBAAmB,CAAC,CAAC"}
+{"version":3,"file":"input-question.schema.d.ts","sourceRoot":"","sources":["../../../src/question/input-question.schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAU,YAAY,EAAU,MAAM,iBAAiB,CAAC;AAE1E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;MAe/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,SAAS,CAAC,OAAO,mBAAmB,CAAC,CAAC"}

package/dist/esm/question/input-question.schema.js

@@ -1,6 +1,7 @@
+// input-question.schema.ts
 import { object, string } from "../yup-extended";
-import { QuestionType } from "./question.constant";
 import { QuestionSchema } from "./question.schema";
+import { QuestionType } from "./question.constant";
 export const InputQuestionSchema = QuestionSchema.concat(object().shape({
     type: string()
         .oneOf([QuestionType.Input])
@@ -13,6 +14,5 @@ export const InputQuestionSchema = QuestionSchema.concat(object().shape({
         is: false,
         then: (schema) => schema.required("This field is required."),
         otherwise: (schema) => schema.optional(),
-    })
-        .label("Answer"),
+    }),
 }));

package/dist/esm/question/question.schema.js

@@ -9,6 +9,11 @@ export const QuestionSchema = object().shape({
     readonly: boolean().optional().label("Readonly"),
     isNew: boolean().optional().label("Is New"),
 });
+// export type TQuestionnaire = (
+//   | TInputQuestionSchema
+//   | TChoiceQuestionSchema
+//   | TReadAndAcknowledgeQuestionSchema
+// )[];
 // Note: The TMixedValue and TQuestionSchema types might need adjustments
 // depending on how you use them downstream, but this is the logical
 // change for the schema itself.

package/dist/esm/question/read-and-acknowledge.schema.d.ts

@@ -1,5 +1,30 @@
-import { InferType, ObjectSchema } from "../yup-extended";
-import { TQuestionSchema } from "./question.schema";
-export declare const ReadAndAcknowledgeQuestionSchema: ObjectSchema<TQuestionSchema>;
+import { Common } from "../common";
+import { InferType } from "../yup-extended";
+import { QuestionType } from "./question.constant";
+export declare const ReadAndAcknowledgeQuestionSchema: import("yup").ObjectSchema<{
+    label: string | undefined;
+    default: boolean;
+    title: string;
+    type: QuestionType.ReadAndAcknowledge;
+    isOptional: boolean | undefined;
+    readonly: boolean | undefined;
+    isNew: boolean | undefined;
+} & {
+    type: QuestionType.ReadAndAcknowledge;
+    description: string;
+    preferredAnswer: NonNullable<Common.Yes | Common.No | undefined>;
+    answers: NonNullable<Common.Yes | Common.No | undefined>;
+}, import("yup").AnyObject, {
+    label: undefined;
+    default: false;
+    title: undefined;
+    type: undefined;
+    isOptional: undefined;
+    readonly: undefined;
+    isNew: undefined;
+    description: undefined;
+    preferredAnswer: undefined;
+    answers: undefined;
+}, "">;
 export type TReadAndAcknowledgeQuestionSchema = InferType<typeof ReadAndAcknowledgeQuestionSchema>;
 //# sourceMappingURL=read-and-acknowledge.schema.d.ts.map

package/dist/esm/question/read-and-acknowledge.schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-and-acknowledge.schema.d.ts","sourceRoot":"","sources":["../../../src/question/read-and-acknowledge.schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAU,YAAY,EAAU,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAkB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpE,eAAO,MAAM,gCAAgC,EAAI,YAAY,CAAC,eAAe,CAU5E,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,SAAS,CACvD,OAAO,gCAAgC,CACxC,CAAC"}
+{"version":3,"file":"read-and-acknowledge.schema.d.ts","sourceRoot":"","sources":["../../../src/question/read-and-acknowledge.schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,SAAS,EAAkB,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAOnD,eAAO,MAAM,gCAAgC;;;;;;;;;;;;;;;;;;;;;;;;MAU5C,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,SAAS,CACvD,OAAO,gCAAgC,CACxC,CAAC"}

package/dist/esm/question/read-and-acknowledge.schema.js

@@ -1,10 +1,17 @@
+// read-and-acknowledge-question.schema.ts
 import { Common } from "../common";
 import { object, string } from "../yup-extended";
+import { QuestionType } from "./question.constant";
 import { QuestionSchema } from "./question.schema";
-export const ReadAndAcknowledgeQuestionSchema = (QuestionSchema.concat(object().shape({
-    description: string().max(10000).required().label("Content"),
-    preferredAnswer: string()
-        .oneOf([Common.Yes, Common.No])
+const AcknowledgeAnswerSchema = string()
+    .oneOf([Common.Yes, Common.No])
+    .required("This question must be acknowledged.");
+export const ReadAndAcknowledgeQuestionSchema = QuestionSchema.concat(object().shape({
+    type: string()
+        .oneOf([QuestionType.ReadAndAcknowledge])
         .required()
-        .label("Preferred Answer"),
-})));
+        .label("Question type"),
+    description: string().max(10000).required().label("Content"),
+    preferredAnswer: AcknowledgeAnswerSchema.label("Preferred Answer"),
+    answers: AcknowledgeAnswerSchema.label("Answer"),
+}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thejob/schema",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",