@smvtech/x-flux 1.0.6 → 1.0.7

package/dist/index.d.mts

@@ -5280,12 +5280,12 @@ declare const EDCFlowProvider: react__default.FC<TEDCFlowProviderProps>;
 declare const useEDCFlow: () => TEDCFlowContext;
 
 declare const createAllQuestionsWithAnswers: (questionnaire: TQuestionnaire, answers?: TAnswer[]) => TQuestionWithAnswer[];
-declare const filterConditionalQuestions: (questions: TQuestionWithAnswer[], order: TVisaOrder) => TQuestionWithAnswer[];
-declare const getVisibleQuestions: (questions: TQuestionWithAnswer[], order: TVisaOrder) => TQuestionWithAnswer[];
+declare const filterConditionalQuestions: (questions: TQuestionWithAnswer[], application: TApplication) => TQuestionWithAnswer[];
+declare const getVisibleQuestions: (questions: TQuestionWithAnswer[], application: TApplication) => TQuestionWithAnswer[];
 declare const formatTravellerFromResponse: (traveller: TTraveller) => TTraveller;
 declare const formatAnswerFromResponse: (updatedAnswer: TAnswer, orderId: string) => TAnswer;
-declare const updateApplicantWithAnswer: (applicant: TEDCApplicant, question_id: string, answer: TAnswer, questionnaire: TQuestionnaire, order: TVisaOrder) => TEDCApplicant;
-declare const createApplicantData: (traveller: TTraveller, answers: TAnswer[], questionnaire: TQuestionnaire, application: TApplication, order: TVisaOrder) => TEDCApplicant | null;
+declare const updateApplicantWithAnswer: (applicant: TEDCApplicant, question_id: string, answer: TAnswer, questionnaire: TQuestionnaire) => TEDCApplicant;
+declare const createApplicantData: (traveller: TTraveller, answers: TAnswer[], questionnaire: TQuestionnaire, application: TApplication) => TEDCApplicant | null;
 declare function getSignedUrlFromAsset(docId: string): Promise<string | null>;
 
 declare const initializeEDCFlow: (config: EDCConfig) => void;

package/dist/index.d.ts

@@ -5280,12 +5280,12 @@ declare const EDCFlowProvider: react__default.FC<TEDCFlowProviderProps>;
 declare const useEDCFlow: () => TEDCFlowContext;
 
 declare const createAllQuestionsWithAnswers: (questionnaire: TQuestionnaire, answers?: TAnswer[]) => TQuestionWithAnswer[];
-declare const filterConditionalQuestions: (questions: TQuestionWithAnswer[], order: TVisaOrder) => TQuestionWithAnswer[];
-declare const getVisibleQuestions: (questions: TQuestionWithAnswer[], order: TVisaOrder) => TQuestionWithAnswer[];
+declare const filterConditionalQuestions: (questions: TQuestionWithAnswer[], application: TApplication) => TQuestionWithAnswer[];
+declare const getVisibleQuestions: (questions: TQuestionWithAnswer[], application: TApplication) => TQuestionWithAnswer[];
 declare const formatTravellerFromResponse: (traveller: TTraveller) => TTraveller;
 declare const formatAnswerFromResponse: (updatedAnswer: TAnswer, orderId: string) => TAnswer;
-declare const updateApplicantWithAnswer: (applicant: TEDCApplicant, question_id: string, answer: TAnswer, questionnaire: TQuestionnaire, order: TVisaOrder) => TEDCApplicant;
-declare const createApplicantData: (traveller: TTraveller, answers: TAnswer[], questionnaire: TQuestionnaire, application: TApplication, order: TVisaOrder) => TEDCApplicant | null;
+declare const updateApplicantWithAnswer: (applicant: TEDCApplicant, question_id: string, answer: TAnswer, questionnaire: TQuestionnaire) => TEDCApplicant;
+declare const createApplicantData: (traveller: TTraveller, answers: TAnswer[], questionnaire: TQuestionnaire, application: TApplication) => TEDCApplicant | null;
 declare function getSignedUrlFromAsset(docId: string): Promise<string | null>;
 
 declare const initializeEDCFlow: (config: EDCConfig) => void;

package/dist/index.js

@@ -234,7 +234,7 @@ var createAllQuestionsWithAnswers = (questionnaire, answers = []) => {
   });
   return questionsWithAnswers;
 };
-var filterConditionalQuestions = (questions, order) => {
+var filterConditionalQuestions = (questions, application) => {
   const questionMap = /* @__PURE__ */ new Map();
   questions.forEach((q) => {
     questionMap.set(q.id, q);
@@ -245,7 +245,7 @@ var filterConditionalQuestions = (questions, order) => {
     if (!question) return;
     const answerValue = question.answer_data?.answer || [];
     question.question.renders?.forEach((render) => {
-      if (shouldRenderQuestion(render, answerValue, order)) {
+      if (shouldRenderQuestion(render, answerValue, application)) {
         render.question_ids.forEach((id) => {
           if (!visibleQuestionIds.has(id)) {
             visibleQuestionIds.add(id);
@@ -267,29 +267,21 @@ var extractDynamicFieldName = (value) => {
   const match = value.match(/^\{\{([^}]+)\}\}$/);
   return match ? match[1].trim() : null;
 };
-var isMinor = (dateOfBirth, travelStartDate) => {
-  if (!dateOfBirth || !travelStartDate) return false;
-  let dob;
-  if (dateOfBirth.includes("/")) {
-    const [day, month, year] = dateOfBirth.split("/").map(Number);
-    dob = new Date(year, month - 1, day);
-  } else {
-    dob = new Date(dateOfBirth);
-  }
-  const travelDate = new Date(travelStartDate);
-  if (isNaN(dob.getTime()) || isNaN(travelDate.getTime())) return false;
-  const ageDiff = travelDate.getFullYear() - dob.getFullYear();
-  const monthDiff = travelDate.getMonth() - dob.getMonth();
-  const dayDiff = travelDate.getDate() - dob.getDate();
-  const actualAge = monthDiff < 0 || monthDiff === 0 && dayDiff < 0 ? ageDiff - 1 : ageDiff;
-  return actualAge < 18;
-};
-var shouldRenderQuestion = (render, answerValue, order) => {
+var shouldRenderQuestion = (render, answerValue, application) => {
   const dynamicFieldName = extractDynamicFieldName(render.value);
   if (dynamicFieldName) {
     switch (dynamicFieldName) {
-      case "travel_start_date":
-        return isMinor(answerValue[0], order.travel_start_date);
+      case "minor": {
+        const hasMinorTag = application.tags?.includes("MINOR" /* MINOR */) ?? false;
+        switch (render.operation) {
+          case "eq":
+            return hasMinorTag;
+          case "neq":
+            return !hasMinorTag;
+          default:
+            return false;
+        }
+      }
       default:
         return false;
     }
@@ -317,8 +309,8 @@ var shouldRenderQuestion = (render, answerValue, order) => {
       return false;
   }
 };
-var getVisibleQuestions = (questions, order) => {
-  return filterConditionalQuestions(questions, order);
+var getVisibleQuestions = (questions, application) => {
+  return filterConditionalQuestions(questions, application);
 };
 var formatApplicationFromResponse = (application) => {
   return {
@@ -366,7 +358,7 @@ var formatAnswerFromResponse = (updatedAnswer, orderId) => {
     updated_at: updatedAnswer.updated_at
   };
 };
-var updateApplicantWithAnswer = (applicant, question_id, answer, questionnaire, order) => {
+var updateApplicantWithAnswer = (applicant, question_id, answer, questionnaire) => {
   const answerMap = /* @__PURE__ */ new Map();
   applicant.questions.forEach((q) => {
     if (q.answer_data) {
@@ -376,16 +368,16 @@ var updateApplicantWithAnswer = (applicant, question_id, answer, questionnaire,
   answerMap.set(question_id, answer);
   const answers = Array.from(answerMap.values());
   const questions = createAllQuestionsWithAnswers(questionnaire, answers);
-  const visibleQuestions = getVisibleQuestions(questions, order);
+  const visibleQuestions = getVisibleQuestions(questions, applicant.application);
   return {
     ...applicant,
     questions: visibleQuestions
   };
 };
-var createApplicantData = (traveller, answers, questionnaire, application, order) => {
+var createApplicantData = (traveller, answers, questionnaire, application) => {
   if (!questionnaire) return null;
   const questions = createAllQuestionsWithAnswers(questionnaire, answers);
-  const visibleQuestions = getVisibleQuestions(questions, order);
+  const visibleQuestions = getVisibleQuestions(questions, application);
   return {
     application_id: application._id,
     application,
@@ -400,7 +392,7 @@ var transformApplicationResponse = (response) => {
     answers: (response.answers || []).map((answer) => formatAnswerFromResponse(answer, response.application.visa_order_id))
   };
 };
-var createApplicantsFromApplications = (applications, questionnaire, order) => {
+var createApplicantsFromApplications = (applications, questionnaire) => {
   if (!applications || !Array.isArray(applications)) {
     return {};
   }
@@ -410,8 +402,7 @@ var createApplicantsFromApplications = (applications, questionnaire, order) => {
       applicationData.traveller,
       applicationData.answers,
       questionnaire,
-      applicationData.application,
-      order
+      applicationData.application
     );
     if (applicant) {
       applicants[applicationData.application._id] = applicant;
@@ -688,8 +679,7 @@ var EDCFlowProvider = ({ children, orderId }) => {
           newApplicant.traveller,
           newApplicant.answers,
           questionnaire,
-          newApplicant.application,
-          order
+          newApplicant.application
         );
         if (!applicant) {
           setError("Failed to create applicant data");
@@ -723,8 +713,7 @@ var EDCFlowProvider = ({ children, orderId }) => {
           refreshedApplicantData.traveller,
           refreshedApplicantData.answers,
           questionnaire,
-          refreshedApplicantData.application,
-          order
+          refreshedApplicantData.application
         );
         if (!applicant) return;
         setApplicants((prev) => {
@@ -769,8 +758,7 @@ var EDCFlowProvider = ({ children, orderId }) => {
               currentApplicant,
               updatedAnswerData.answers.visa_questions_id,
               updatedAnswerData.answers,
-              questionnaire,
-              order
+              questionnaire
             );
             const updatedApplicants = {
               ...prev,
@@ -875,8 +863,7 @@ var EDCFlowProvider = ({ children, orderId }) => {
         if (orderData && questionnaireData && applications) {
           const applicants2 = createApplicantsFromApplications(
             applications,
-            questionnaireData,
-            orderData
+            questionnaireData
           );
           const dynamicMap = buildDynamicQuestionMap(questionnaireData);
           const { updatedQuestionnaire, updatedApplicants } = runApplicantSideEffects(applicants2, questionnaireData, dynamicMap);

package/dist/index.mjs

@@ -208,7 +208,7 @@ var createAllQuestionsWithAnswers = (questionnaire, answers = []) => {
   });
   return questionsWithAnswers;
 };
-var filterConditionalQuestions = (questions, order) => {
+var filterConditionalQuestions = (questions, application) => {
   const questionMap = /* @__PURE__ */ new Map();
   questions.forEach((q) => {
     questionMap.set(q.id, q);
@@ -219,7 +219,7 @@ var filterConditionalQuestions = (questions, order) => {
     if (!question) return;
     const answerValue = question.answer_data?.answer || [];
     question.question.renders?.forEach((render) => {
-      if (shouldRenderQuestion(render, answerValue, order)) {
+      if (shouldRenderQuestion(render, answerValue, application)) {
         render.question_ids.forEach((id) => {
           if (!visibleQuestionIds.has(id)) {
             visibleQuestionIds.add(id);
@@ -241,29 +241,21 @@ var extractDynamicFieldName = (value) => {
   const match = value.match(/^\{\{([^}]+)\}\}$/);
   return match ? match[1].trim() : null;
 };
-var isMinor = (dateOfBirth, travelStartDate) => {
-  if (!dateOfBirth || !travelStartDate) return false;
-  let dob;
-  if (dateOfBirth.includes("/")) {
-    const [day, month, year] = dateOfBirth.split("/").map(Number);
-    dob = new Date(year, month - 1, day);
-  } else {
-    dob = new Date(dateOfBirth);
-  }
-  const travelDate = new Date(travelStartDate);
-  if (isNaN(dob.getTime()) || isNaN(travelDate.getTime())) return false;
-  const ageDiff = travelDate.getFullYear() - dob.getFullYear();
-  const monthDiff = travelDate.getMonth() - dob.getMonth();
-  const dayDiff = travelDate.getDate() - dob.getDate();
-  const actualAge = monthDiff < 0 || monthDiff === 0 && dayDiff < 0 ? ageDiff - 1 : ageDiff;
-  return actualAge < 18;
-};
-var shouldRenderQuestion = (render, answerValue, order) => {
+var shouldRenderQuestion = (render, answerValue, application) => {
   const dynamicFieldName = extractDynamicFieldName(render.value);
   if (dynamicFieldName) {
     switch (dynamicFieldName) {
-      case "travel_start_date":
-        return isMinor(answerValue[0], order.travel_start_date);
+      case "minor": {
+        const hasMinorTag = application.tags?.includes("MINOR" /* MINOR */) ?? false;
+        switch (render.operation) {
+          case "eq":
+            return hasMinorTag;
+          case "neq":
+            return !hasMinorTag;
+          default:
+            return false;
+        }
+      }
       default:
         return false;
     }
@@ -291,8 +283,8 @@ var shouldRenderQuestion = (render, answerValue, order) => {
       return false;
   }
 };
-var getVisibleQuestions = (questions, order) => {
-  return filterConditionalQuestions(questions, order);
+var getVisibleQuestions = (questions, application) => {
+  return filterConditionalQuestions(questions, application);
 };
 var formatApplicationFromResponse = (application) => {
   return {
@@ -340,7 +332,7 @@ var formatAnswerFromResponse = (updatedAnswer, orderId) => {
     updated_at: updatedAnswer.updated_at
   };
 };
-var updateApplicantWithAnswer = (applicant, question_id, answer, questionnaire, order) => {
+var updateApplicantWithAnswer = (applicant, question_id, answer, questionnaire) => {
   const answerMap = /* @__PURE__ */ new Map();
   applicant.questions.forEach((q) => {
     if (q.answer_data) {
@@ -350,16 +342,16 @@ var updateApplicantWithAnswer = (applicant, question_id, answer, questionnaire,
   answerMap.set(question_id, answer);
   const answers = Array.from(answerMap.values());
   const questions = createAllQuestionsWithAnswers(questionnaire, answers);
-  const visibleQuestions = getVisibleQuestions(questions, order);
+  const visibleQuestions = getVisibleQuestions(questions, applicant.application);
   return {
     ...applicant,
     questions: visibleQuestions
   };
 };
-var createApplicantData = (traveller, answers, questionnaire, application, order) => {
+var createApplicantData = (traveller, answers, questionnaire, application) => {
   if (!questionnaire) return null;
   const questions = createAllQuestionsWithAnswers(questionnaire, answers);
-  const visibleQuestions = getVisibleQuestions(questions, order);
+  const visibleQuestions = getVisibleQuestions(questions, application);
   return {
     application_id: application._id,
     application,
@@ -374,7 +366,7 @@ var transformApplicationResponse = (response) => {
     answers: (response.answers || []).map((answer) => formatAnswerFromResponse(answer, response.application.visa_order_id))
   };
 };
-var createApplicantsFromApplications = (applications, questionnaire, order) => {
+var createApplicantsFromApplications = (applications, questionnaire) => {
   if (!applications || !Array.isArray(applications)) {
     return {};
   }
@@ -384,8 +376,7 @@ var createApplicantsFromApplications = (applications, questionnaire, order) => {
       applicationData.traveller,
       applicationData.answers,
       questionnaire,
-      applicationData.application,
-      order
+      applicationData.application
     );
     if (applicant) {
       applicants[applicationData.application._id] = applicant;
@@ -662,8 +653,7 @@ var EDCFlowProvider = ({ children, orderId }) => {
           newApplicant.traveller,
           newApplicant.answers,
           questionnaire,
-          newApplicant.application,
-          order
+          newApplicant.application
         );
         if (!applicant) {
           setError("Failed to create applicant data");
@@ -697,8 +687,7 @@ var EDCFlowProvider = ({ children, orderId }) => {
           refreshedApplicantData.traveller,
           refreshedApplicantData.answers,
           questionnaire,
-          refreshedApplicantData.application,
-          order
+          refreshedApplicantData.application
         );
         if (!applicant) return;
         setApplicants((prev) => {
@@ -743,8 +732,7 @@ var EDCFlowProvider = ({ children, orderId }) => {
               currentApplicant,
               updatedAnswerData.answers.visa_questions_id,
               updatedAnswerData.answers,
-              questionnaire,
-              order
+              questionnaire
             );
             const updatedApplicants = {
               ...prev,
@@ -849,8 +837,7 @@ var EDCFlowProvider = ({ children, orderId }) => {
         if (orderData && questionnaireData && applications) {
           const applicants2 = createApplicantsFromApplications(
             applications,
-            questionnaireData,
-            orderData
+            questionnaireData
           );
           const dynamicMap = buildDynamicQuestionMap(questionnaireData);
           const { updatedQuestionnaire, updatedApplicants } = runApplicantSideEffects(applicants2, questionnaireData, dynamicMap);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smvtech/x-flux",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "x-flux - A powerful React package for managing effective document collection flows, visa questionnaires, travellers, and applications",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",