@legalplace/prerenderx 3.8.24-staging.0 → 3.8.24

package/src/libs/SectionRender.ts

@@ -17,13 +17,6 @@ class SectionRender {
 
   ovc: InputsType;
 
-  /**
-   * Occurrence index injected by the parent DocumentRender when the document
-   * is multiple (`params.multiple.enabled === true`). For non-multiple
-   * documents this is always 0.
-   */
-  baseIndex: number;
-
   private NumAuto: NumAuto;
 
   constructor(options: {
@@ -33,7 +26,6 @@ class SectionRender {
     documentName: string;
     currentSection: number;
     numauto: NumAuto;
-    baseIndex?: number;
   }) {
     this.references = options.references;
     this.conditions = options.conditions;
@@ -41,7 +33,6 @@ class SectionRender {
     this.currentSection = options.currentSection;
     this.ovc = options.ovc;
     this.NumAuto = options.numauto;
-    this.baseIndex = options.baseIndex ?? 0;
 
     this.renderSection();
   }
@@ -50,19 +41,6 @@ class SectionRender {
     return this.outputs;
   }
 
-  /**
-   * Returns the multiple source option id for the current document if any.
-   * Returns `undefined` for non-multiple documents.
-   */
-  private getDocumentMultipleSource(): number | undefined {
-    const docMultiple =
-      this.references.documents[this.documentName]?.params?.multiple;
-    if (docMultiple?.enabled !== true) return undefined;
-    return typeof docMultiple.repeatOption === "number"
-      ? docMultiple.repeatOption
-      : undefined;
-  }
-
   private renderSection() {
     const section =
       this.references.sections[this.documentName][this.currentSection];
@@ -73,106 +51,45 @@ class SectionRender {
     const condition =
       conditionObject === undefined
         ? true
-        : this.conditions.executeCondition(
-            conditionObject,
-            0,
-            this.baseIndex,
-            "sections"
-          );
-
-    if (condition !== true) return;
-
-    const documentMultipleSource = this.getDocumentMultipleSource();
-
-    section.options.forEach((optionId) => {
-      const option = this.references.options[optionId];
-
-      // Detect a `repeated` wrapper that points to the same source as the
-      // document multiple. In that case, iterating over `repeatOption` here
-      // would double the loop (the document is already rendered N times by
-      // Prerender). Instead, render the wrapper's children once at the
-      // document's current occurrence index.
-      if (
-        option.meta.type === "repeated" &&
-        documentMultipleSource !== undefined &&
-        option.meta.repeatOption === documentMultipleSource
-      ) {
-        option.options.forEach((childId) => {
+        : this.conditions.executeCondition(conditionObject, 0, 0, "sections");
+
+    // Rendering documents sections
+    if (condition === true) {
+      section.options.forEach((optionId) => {
+        const option = this.references.options[optionId];
+        let repeatOption = optionId;
+        if (option.meta.type === "repeated") {
+          if (option.meta.repeatOption === undefined) return;
+          repeatOption =
+            typeof option.meta.repeatOption === "number"
+              ? option.meta.repeatOption
+              : parseInt(option.meta.repeatOption, 10);
+        }
+
+        // Option inputs
+        const inputs = this.ovc.options[repeatOption] || [
+          !["radio", "checkbox"].includes(option.meta.type),
+        ]; // Falling back on a single value array if option doesn't exist in ovc
+
+        // Looping through inputs
+        inputs.forEach((value, index) => {
+          // If value is false we stop here
+          if (value !== true) return;
+
           this.outputs = [
             ...this.outputs,
             ...new OptionRender({
               references: this.references,
-              id: childId,
+              id: optionId,
               ovc: this.ovc,
-              index: this.baseIndex,
+              index,
               conditions: this.conditions,
               numauto: this.NumAuto,
             }).getOutputs(),
           ];
         });
-        return;
-      }
-
-      let repeatOption = optionId;
-      if (option.meta.type === "repeated") {
-        if (option.meta.repeatOption === undefined) return;
-        repeatOption =
-          typeof option.meta.repeatOption === "number"
-            ? option.meta.repeatOption
-            : parseInt(option.meta.repeatOption, 10);
-      }
-
-      // Option inputs
-      const inputs = this.ovc.options[repeatOption] || [
-        !["radio", "checkbox"].includes(option.meta.type),
-      ]; // Falling back on a single value array if option doesn't exist in ovc
-
-      // Inside a multiple document, every non-`repeated` root option is
-      // rendered at the document's occurrence index instead of looping
-      // through every input slot. We pick the value at `baseIndex` (or
-      // fall back to slot 0 for non-multiplied options whose inputs are
-      // a single-element array).
-      if (
-        documentMultipleSource !== undefined &&
-        option.meta.type !== "repeated"
-      ) {
-        const valueAtIndex =
-          this.baseIndex < inputs.length ? inputs[this.baseIndex] : inputs[0];
-        if (valueAtIndex !== true) return;
-
-        this.outputs = [
-          ...this.outputs,
-          ...new OptionRender({
-            references: this.references,
-            id: optionId,
-            ovc: this.ovc,
-            index: this.baseIndex,
-            conditions: this.conditions,
-            numauto: this.NumAuto,
-          }).getOutputs(),
-        ];
-        return;
-      }
-
-      // Looping through inputs (default behaviour, also used for `repeated`
-      // wrappers whose source differs from the document multiple source).
-      inputs.forEach((value, index) => {
-        // If value is false we stop here
-        if (value !== true) return;
-
-        this.outputs = [
-          ...this.outputs,
-          ...new OptionRender({
-            references: this.references,
-            id: optionId,
-            ovc: this.ovc,
-            index,
-            conditions: this.conditions,
-            numauto: this.NumAuto,
-          }).getOutputs(),
-        ];
       });
-    });
+    }
   }
 }
 

package/src/libs/misc/FillPdfFormBase.ts

@@ -1,11 +1,6 @@
 import type { Types } from "@legalplace/referencesparser";
 import type ConditionsRunner from "@legalplace/conditions-runner";
 import type InputsType from "@legalplace/types/dist/inputs";
-import {
-  isOptionDisplayed as sharedIsOptionDisplayed,
-  isVariableDisplayed as sharedIsVariableDisplayed,
-  type ConditionEvaluator,
-} from "@legalplace/referencesparser";
 
 class FillPdfFormBase {
   references: Types.ReferencesType;
@@ -25,46 +20,59 @@ class FillPdfFormBase {
   }
 
   /**
-   * Evaluates a stored condition for options, variables or sections.
-   */
-  private readonly conditionEvaluator: ConditionEvaluator = (
-    type,
-    id,
-    index
-  ) => {
-    if (type === "options") return this.getOptionCondition(id, index);
-    if (type === "variables") return this.getVariableCondition(id, index);
-    return this.getSectionCondition(id);
-  };
-
-  /**
-   * Checks whether a variable is displayed at a given index.
+   * Checks whether a variable is displayed at a given index
+   * @param id Variable's ID
+   * @param index Index
    */
   isVariableDisplayed(id: number, index: number) {
-    return sharedIsVariableDisplayed(
-      this.references,
-      this.ovc,
-      this.conditionEvaluator,
-      id,
+    // Getting variable's conditions & executing it if any
+    const variableCondition = this.getVariableCondition(id, index);
+    const variableParents =
+      this.references.relations.variables[id]?.parents || [];
+    const parentOptionIsDisplayed = this.isOptionDisplayed(
+      variableParents[0],
       index
     );
+
+    return (
+      [variableCondition, parentOptionIsDisplayed].filter((c) => c !== true)
+        .length === 0
+    );
   }
 
   /**
-   * Checks whether an option is displayed at a given index.
+   * Checks whether an option is displayed at a given index
+   * @param id Option's ID
+   * @param index Index
    */
   isOptionDisplayed(id: number, index: number) {
-    return sharedIsOptionDisplayed(
-      this.references,
-      this.ovc,
-      this.conditionEvaluator,
-      id,
-      index
+    // Getting variable's conditions & executing it if any
+    const optionCondition = this.getOptionCondition(id, index);
+    const optionParents = this.references.relations.options[id]?.parents || [];
+    const parentsConditions = optionParents.map(
+      (optionId) => this.getOptionCondition(optionId, index) !== false
+    );
+    const parentsInputs = optionParents.map(
+      (optionId) => this.ovc.options[optionId][index]
+    );
+    const parentSectionId = this.getOptionParentSection(id);
+    const parentSectionCondition =
+      this.getSectionCondition(parentSectionId) !== false;
+
+    return (
+      [
+        optionCondition,
+        parentSectionCondition,
+        ...parentsConditions,
+        ...parentsInputs,
+      ].filter((c) => c !== true).length === 0
     );
   }
 
   /**
-   * Returns a variable's conditions.
+   * Returns a variable's conditions
+   * @param id Variable's id
+   * @param index Variable's index
    */
   private getVariableCondition(id: number, index: number) {
     const conditionObject = this.references.conditions.variables[id];
@@ -79,7 +87,9 @@ class FillPdfFormBase {
   }
 
   /**
-   * Returns an option's conditions.
+   * Returns an option's conditions
+   * @param id Option's id
+   * @param index Option's index
    */
   private getOptionCondition(id: number, index: number) {
     const conditionObject = this.references.conditions.options[id];
@@ -89,7 +99,8 @@ class FillPdfFormBase {
   }
 
   /**
-   * Returns a section's conditions.
+   * Returns a section's conditions
+   * @param id Section's id
    */
   private getSectionCondition(id: number) {
     const conditionObject = this.references.conditions.sections.main[id];
@@ -97,6 +108,28 @@ class FillPdfFormBase {
       ? true
       : this.conditions.executeCondition(conditionObject, id, 0, "sections");
   }
+
+  /**
+   * Returns option's parent section
+   * @param id Option's id
+   */
+  private getOptionParentSection(id: number) {
+    const { parents } = this.references.relations.options[id];
+
+    // Getting root option id
+    const rootId = parents.length > 0 ? parents[parents.length - 1] : id;
+
+    // Looking for section
+    const sections = Object.values(this.references.sections.main);
+
+    for (let i = 0; i < sections.length; i += 1) {
+      if (sections[i].options.includes(rootId)) return sections[i].id;
+    }
+
+    throw new Error(
+      `Cannot find parent section for option ${id} (Root option id: ${rootId})`
+    );
+  }
 }
 
 export default FillPdfFormBase;

package/src/types/types.ts

@@ -1,27 +1,14 @@
-import type { DocumentLayoutV3 } from "@legalplace/models-v3-types";
-
 export type DocumentOutputIndex = {
   name: string;
   slug: string;
   pdf: boolean;
   docx: boolean;
-  /**
-   * Occurrence index of the document when the document is multiple
-   * (`params.multiple.enabled === true`). `undefined` for non-multiple
-   * documents (treated as 0 internally).
-   */
-  occurrenceIndex?: number;
 };
-
 export type DocumentPdfFormIndex = {
   name: string;
   slug: string;
   form: boolean;
   fdf: FDFType;
-  /**
-   * Occurrence index of the document when the document is multiple.
-   */
-  occurrenceIndex?: number;
 };
 
 export type DocumentIndex = Record<
@@ -33,17 +20,3 @@ export type FDFType = {
   id: string;
   fields: Record<string, string>;
 };
-
-/**
- * Rendered header/footer regions and page layout for DOCX generation.
- */
-export type DocumentLayout = {
-  header?: string;
-  footer?: string;
-  firstPageHeader?: string;
-  firstPageFooter?: string;
-  differentFirstPage: boolean;
-  margins?: DocumentLayoutV3["margins"];
-  headerDistance?: number;
-  footerDistance?: number;
-};

package/.yalc/@legalplace/models-v3-types/.eslintrc

@@ -1,3 +0,0 @@
-{
-  "extends": ["@legalplace/eslint-config"]
-}

package/.yalc/@legalplace/models-v3-types/.gitlab-ci.yml

@@ -1,30 +0,0 @@
-image: node:24-alpine
-
-
-stages:
-  - deploy
-
-before_script:
-- export PATH=$PATH:./node_modules/.bin/
-
-variables: 
-  DOCKER_DRIVER: overlay2
-
-publish:
-  image: node:24-alpine
-  stage: deploy
-  id_tokens:
-    NPM_ID_TOKEN:
-      aud: "npm:registry.npmjs.org"
-  except:
-    variables:
-      - $CI_COMMIT_MESSAGE =~ /skip-publishFi/
-  script:
-    - npm install -g npm@latest
-    - echo "//registry.npmjs.org/:_authToken=${NPM_ID_TOKEN}" > ~/.npmrc
-    - npm publish
-    - echo "PUBLISHED SUCCESSFULLY"
-  environment:
-    name: development
-  only:
-  - master