@thejob/schema 1.0.29 → 1.0.31

package/dist/esm/job-role-template/job-role-template.schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"job-role-template.schema.d.ts","sourceRoot":"","sources":["../../../src/job-role-template/job-role-template.schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAQhC,CAAC;AAEH,MAAM,MAAM,sBAAsB,GAAG,SAAS,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"job-role-template.schema.d.ts","sourceRoot":"","sources":["../../../src/job-role-template/job-role-template.schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAQhC,CAAC;AAEH,MAAM,MAAM,sBAAsB,GAAG,SAAS,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

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

@@ -23,14 +23,7 @@ export declare const ChoiceQuestionSchema: import("yup").ObjectSchema<{
     } | undefined)[];
     answerChoiceType: NonNullable<AnswerChoiceType | undefined>;
     preferredAnswer: TMixedValue | TMixedValue[] | undefined;
-    answers: TMixedValue | (string | number | boolean | {
-        logo?: string | undefined;
-        name: string;
-        id: string;
-    } | {
-        value: "others" | (string | undefined)[];
-        otherValue: string | string[];
-    } | undefined)[] | undefined;
+    answers: TMixedValue | TMixedValue[] | undefined;
 }, import("yup").AnyObject, {
     label: undefined;
     default: false;

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

@@ -1 +1 @@
-{"version":3,"file":"choice-question.schema.d.ts","sourceRoot":"","sources":["../../../src/question/choice-question.schema.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAKP,MAAM,WAAW,CAAC;AACnB,OAAO,EAAS,SAAS,EAA+B,MAAM,iBAAiB,CAAC;AAChF,OAAO,EACL,gBAAgB,EAChB,YAAY,EAEb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAkB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA6HhE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAkChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,SAAS,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"choice-question.schema.d.ts","sourceRoot":"","sources":["../../../src/question/choice-question.schema.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EAKP,MAAM,WAAW,CAAC;AACnB,OAAO,EAAS,SAAS,EAA+B,MAAM,iBAAiB,CAAC;AAChF,OAAO,EACL,gBAAgB,EAChB,YAAY,EAEb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAkB,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA+HhE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAsChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,SAAS,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

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

@@ -76,16 +76,15 @@ const ChoicePreferredAnswerSchema = (label = "Preferred answer") => mixed().when
         .optional()
         .label(label),
 });
-const ChoiceAnswerSchema = lazy((question) => {
+const getChoiceAnswerSchema = (answerChoiceType, isOptional) => {
     const commonSchema = mixed().oneOfSchema([
-        // Note: this can be string, boolean, number, or other complex types
         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 {
@@ -97,14 +96,14 @@ 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])
@@ -135,5 +134,5 @@ export const ChoiceQuestionSchema = QuestionSchema.concat(object().shape({
         .default(AnswerChoiceType.Single)
         .label("Type"),
     preferredAnswer: ChoicePreferredAnswerSchema("Preferred answer"),
-    answers: ChoiceAnswerSchema,
+    answers: mixed().when(["answerChoiceType", "isOptional"], ([answerChoiceType, isOptional], schema) => getChoiceAnswerSchema(answerChoiceType, isOptional)),
 }));

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":"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"}
+{"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;;;;;;;;;;;;;;;;;;;;;;MAgB/B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,SAAS,CAAC,OAAO,mBAAmB,CAAC,CAAC"}

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

@@ -11,8 +11,9 @@ export const InputQuestionSchema = QuestionSchema.concat(object().shape({
     answers: string()
         .max(500)
         .when("isOptional", {
-        is: false,
-        then: (schema) => schema.required("This field is required."),
-        otherwise: (schema) => schema.optional(),
-    }),
+        is: (isOptional) => Boolean(isOptional),
+        then: (schema) => schema.optional(),
+        otherwise: (schema) => schema.required(),
+    })
+        .label("Answer"),
 }));

package/package.json

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