@legalplace/prerenderx 3.9.3 → 3.9.4-staging.0

package/dist/libs/OptionRender.js

@@ -29,7 +29,9 @@ var OptionRender = (function () {
     OptionRender.prototype.isDisplayed = function (optionId) {
         var _this = this;
         if (optionId === void 0) { optionId = this.id; }
-        return (0, referencesparser_1.isOptionDisplayed)(this.references, this.ovc, function (type, entityId, entityIndex) {
+        return (0, referencesparser_1.isOptionDisplayed)(this.references, this.ovc, function (type, entityId, entityIndex, documentSlug) {
+            var _a;
+            if (documentSlug === void 0) { documentSlug = "main"; }
             if (type === "options") {
                 var conditionObject = _this.references.conditions.options[entityId];
                 return conditionObject === undefined
@@ -37,10 +39,10 @@ var OptionRender = (function () {
                     : _this.conditions.executeCondition(conditionObject, entityId, entityIndex, "options");
             }
             if (type === "sections") {
-                var conditionObject = _this.references.conditions.sections.main[entityId];
+                var conditionObject = (_a = _this.references.conditions.sections[documentSlug]) === null || _a === void 0 ? void 0 : _a[entityId];
                 return conditionObject === undefined
                     ? true
-                    : _this.conditions.executeCondition(conditionObject, entityId, entityIndex, "sections");
+                    : _this.conditions.executeCondition(conditionObject, entityId, entityIndex, "sections", documentSlug);
             }
             return true;
         }, optionId, this.index);

package/dist/libs/SectionRender.js

@@ -44,7 +44,7 @@ var SectionRender = (function () {
         var conditionObject = this.references.conditions.sections[this.documentName][this.currentSection];
         var condition = conditionObject === undefined
             ? true
-            : this.conditions.executeCondition(conditionObject, 0, this.baseIndex, "sections");
+            : this.conditions.executeCondition(conditionObject, 0, this.baseIndex, "sections", this.documentName);
         if (condition !== true)
             return;
         var documentMultipleSource = this.getDocumentMultipleSource();

package/dist/libs/misc/FillPdfFormBase.js

@@ -4,12 +4,12 @@ var referencesparser_1 = require("@legalplace/referencesparser");
 var FillPdfFormBase = (function () {
     function FillPdfFormBase(references, conditions, ovc) {
         var _this = this;
-        this.conditionEvaluator = function (type, id, index) {
+        this.conditionEvaluator = function (type, id, index, documentSlug) {
             if (type === "options")
                 return _this.getOptionCondition(id, index);
             if (type === "variables")
                 return _this.getVariableCondition(id, index);
-            return _this.getSectionCondition(id);
+            return _this.getSectionCondition(id, documentSlug);
         };
         this.references = references;
         this.conditions = conditions;
@@ -33,11 +33,13 @@ var FillPdfFormBase = (function () {
             ? true
             : this.conditions.executeCondition(conditionObject, id, index, "options");
     };
-    FillPdfFormBase.prototype.getSectionCondition = function (id) {
-        var conditionObject = this.references.conditions.sections.main[id];
+    FillPdfFormBase.prototype.getSectionCondition = function (id, documentSlug) {
+        var _a;
+        if (documentSlug === void 0) { documentSlug = "main"; }
+        var conditionObject = (_a = this.references.conditions.sections[documentSlug]) === null || _a === void 0 ? void 0 : _a[id];
         return conditionObject === undefined
             ? true
-            : this.conditions.executeCondition(conditionObject, id, 0, "sections");
+            : this.conditions.executeCondition(conditionObject, id, 0, "sections", documentSlug);
     };
     return FillPdfFormBase;
 }());

package/dist/libs/outputTableRendering.d.ts

@@ -0,0 +1,16 @@
+import type { OptionV3 } from "@legalplace/models-v3-types";
+export type OutputTableCellStyle = Record<string, string>;
+export type OutputTableStyle = {
+    columnWidths?: number[];
+    width?: number;
+    borderStyle?: string;
+    borderColor?: string;
+    borderWidth?: number;
+};
+export declare const expandOutputTableCellStyle: (styles: OutputTableCellStyle) => OutputTableCellStyle;
+export declare const serializeInlineStyle: (styles: OutputTableCellStyle) => string;
+export declare const buildOutputTableStyleAttr: (tableStyle?: OutputTableStyle) => string;
+export declare const buildOutputTableCellStyleAttr: (cellStyle?: OutputTableCellStyle | null) => string;
+export declare const getOutputTableCellStyle: (option: OptionV3) => OutputTableCellStyle | undefined;
+export declare const replaceOutputTableMarkers: (html: string, renderTable: (tableId: number) => string) => string;
+export declare const stripOutputTableMarkers: (html: string) => string;

package/dist/libs/outputTableRendering.js

@@ -0,0 +1,130 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripOutputTableMarkers = exports.replaceOutputTableMarkers = exports.getOutputTableCellStyle = exports.buildOutputTableCellStyleAttr = exports.buildOutputTableStyleAttr = exports.serializeInlineStyle = exports.expandOutputTableCellStyle = void 0;
+var DEFAULT_OUTPUT_TABLE_CELL_STYLE = {
+    paddingTop: "4px",
+    paddingRight: "4px",
+    paddingBottom: "4px",
+    paddingLeft: "4px",
+    borderTopWidth: "1px",
+    borderTopStyle: "solid",
+    borderTopColor: "#000000",
+    borderRightWidth: "1px",
+    borderRightStyle: "solid",
+    borderRightColor: "#000000",
+    borderBottomWidth: "1px",
+    borderBottomStyle: "solid",
+    borderBottomColor: "#000000",
+    borderLeftWidth: "1px",
+    borderLeftStyle: "solid",
+    borderLeftColor: "#000000",
+};
+var BORDER_SIDES = ["Top", "Right", "Bottom", "Left"];
+var parseBoxShorthand = function (parts) {
+    var first = parts[0], second = parts[1], third = parts[2], fourth = parts[3];
+    if (parts.length === 1) {
+        return [first, first, first, first];
+    }
+    if (parts.length === 2) {
+        return [first, second, first, second];
+    }
+    if (parts.length === 3) {
+        return [first, second, third, second];
+    }
+    return [first, second, third, fourth];
+};
+var parseBorderShorthand = function (border) {
+    var parts = border.trim().split(/\s+/);
+    var width = parts.find(function (part) { return /^[0-9.]+(px|pt|em|rem|%)?$/i.test(part); }) || "1px";
+    var style = parts.find(function (part) {
+        return ["solid", "dashed", "dotted", "double", "none"].includes(part.toLowerCase());
+    }) || "solid";
+    var color = parts.find(function (part) { return part.startsWith("#") || part.startsWith("rgb"); }) ||
+        "#000000";
+    return { width: width, style: style, color: color };
+};
+var expandOutputTableCellStyle = function (styles) {
+    var expanded = __assign({}, styles);
+    if (expanded.padding) {
+        var _a = parseBoxShorthand(expanded.padding.trim().split(/\s+/)), top_1 = _a[0], right = _a[1], bottom = _a[2], left = _a[3];
+        delete expanded.padding;
+        expanded.paddingTop = expanded.paddingTop || top_1;
+        expanded.paddingRight = expanded.paddingRight || right;
+        expanded.paddingBottom = expanded.paddingBottom || bottom;
+        expanded.paddingLeft = expanded.paddingLeft || left;
+    }
+    if (expanded.border) {
+        var _b = parseBorderShorthand(expanded.border), width_1 = _b.width, style_1 = _b.style, color_1 = _b.color;
+        delete expanded.border;
+        BORDER_SIDES.forEach(function (side) {
+            var widthKey = "border".concat(side, "Width");
+            var styleKey = "border".concat(side, "Style");
+            var colorKey = "border".concat(side, "Color");
+            expanded[widthKey] = expanded[widthKey] || width_1;
+            expanded[styleKey] = expanded[styleKey] || style_1;
+            expanded[colorKey] = expanded[colorKey] || color_1;
+        });
+    }
+    return expanded;
+};
+exports.expandOutputTableCellStyle = expandOutputTableCellStyle;
+var camelToKebab = function (property) {
+    return property.replace(/[A-Z]/g, function (match) { return "-".concat(match.toLowerCase()); });
+};
+var serializeInlineStyle = function (styles) {
+    return Object.entries(styles)
+        .filter(function (_a) {
+        var value = _a[1];
+        return value !== undefined && value !== "";
+    })
+        .map(function (_a) {
+        var property = _a[0], value = _a[1];
+        return "".concat(camelToKebab(property), ":").concat(value);
+    })
+        .join(";");
+};
+exports.serializeInlineStyle = serializeInlineStyle;
+var buildOutputTableStyleAttr = function (tableStyle) {
+    var styles = [
+        "table-layout:fixed",
+        "border-spacing:0",
+        "border-collapse:collapse",
+    ];
+    if (typeof (tableStyle === null || tableStyle === void 0 ? void 0 : tableStyle.width) === "number") {
+        styles.push("width:".concat(tableStyle.width, "%"));
+    }
+    return " style=\"".concat(styles.join(";"), "\"");
+};
+exports.buildOutputTableStyleAttr = buildOutputTableStyleAttr;
+var buildOutputTableCellStyleAttr = function (cellStyle) {
+    var styles = (0, exports.expandOutputTableCellStyle)(__assign(__assign({}, DEFAULT_OUTPUT_TABLE_CELL_STYLE), (cellStyle || {})));
+    var serialized = (0, exports.serializeInlineStyle)(styles);
+    return serialized.length > 0 ? " style=\"".concat(serialized, "\"") : "";
+};
+exports.buildOutputTableCellStyleAttr = buildOutputTableCellStyleAttr;
+var getOutputTableCellStyle = function (option) {
+    return option.meta.cellStyle;
+};
+exports.getOutputTableCellStyle = getOutputTableCellStyle;
+var OUTPUT_TABLE_MARKER_REGEX = /<output-table\s+data-id="(\d+)"\s*><\/output-table>/gi;
+var replaceOutputTableMarkers = function (html, renderTable) {
+    return html.replace(OUTPUT_TABLE_MARKER_REGEX, function (_match, tableId) {
+        return renderTable(parseInt(tableId, 10));
+    });
+};
+exports.replaceOutputTableMarkers = replaceOutputTableMarkers;
+var stripOutputTableMarkers = function (html) {
+    return html.replace(OUTPUT_TABLE_MARKER_REGEX, "");
+};
+exports.stripOutputTableMarkers = stripOutputTableMarkers;

package/dist/libs/regionHelpers.d.ts

@@ -0,0 +1,5 @@
+import type { SectionRoleV3, SectionV3 } from "@legalplace/models-v3-types";
+export type OutputRegionRole = SectionRoleV3;
+export declare const isBodySection: (section: SectionV3) => boolean;
+export declare const isRegionSection: (section: SectionV3, role: OutputRegionRole) => boolean;
+export declare const getSectionIdsForRole: (sections: Record<string, SectionV3>, role: OutputRegionRole) => number[];

package/dist/libs/regionHelpers.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSectionIdsForRole = exports.isRegionSection = exports.isBodySection = void 0;
+var isBodySection = function (section) {
+    return !section.role || section.role === "body";
+};
+exports.isBodySection = isBodySection;
+var isRegionSection = function (section, role) {
+    if (role === "body")
+        return (0, exports.isBodySection)(section);
+    return section.role === role;
+};
+exports.isRegionSection = isRegionSection;
+var getSectionIdsForRole = function (sections, role) {
+    return Object.keys(sections)
+        .map(function (sectionId) { return parseInt(sectionId, 10); })
+        .filter(function (sectionId) {
+        var section = sections[sectionId];
+        return section && (0, exports.isRegionSection)(section, role);
+    });
+};
+exports.getSectionIdsForRole = getSectionIdsForRole;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/prerenderx",
-  "version": "3.9.3",
+  "version": "3.9.4-staging.0",
   "description": "PrerenderX",
   "main": "dist/index.js",
   "repository": "https://git.legalplace.eu/legalplace/prerenderx",
@@ -16,26 +16,25 @@
     "release": "standard-version -a --no-verify"
   },
   "dependencies": {
-    "@legalplace/conditions-runner": "^2.3.3",
+    "@legalplace/conditions-runner": "2.3.4-staging.0",
     "@legalplace/lplogic": "2.4.1",
-    "@legalplace/models-v3-types": "^5.18.2",
-    "@legalplace/ovc-converter": "^2.2.24",
-    "@legalplace/referencesparser": "^3.3.4",
+    "@legalplace/models-v3-types": "5.18.3-staging.0",
+    "@legalplace/ovc-converter": "2.2.25-staging.0",
+    "@legalplace/referencesparser": "3.3.5-staging.0",
     "@legalplace/yousign": "^0.9.23",
     "crypto": "^1.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.7.2",
     "@babel/preset-typescript": "^7.7.2",
-    "@legalplace/eslint-config-base": "^1.2.0",
-    "@legalplace/prettier-config": "^2.1.3",
-    "@legalplace/types": "^2.22.13",
+    "@legalplace/eslint-config-base": "1.2.1-staging.0",
+    "@legalplace/prettier-config": "2.1.4-staging.0",
+    "@legalplace/types": "2.22.15-staging.0",
     "@types/jest": "^24.0.15",
     "jest": "^24.8.0",
     "redux-mock-store": "^1.5.3",
     "standard-version": "^9.3.1",
     "ts-jest": "^24.0.2"
   },
-  "prettier": "@legalplace/prettier-config",
-  "gitHead": "051ddec22eba44657f3a7fbab9356209e8ab476a"
+  "prettier": "@legalplace/prettier-config"
 }

package/src/libs/OptionRender.ts

@@ -67,7 +67,7 @@ class OptionRender {
     return isOptionDisplayed(
       this.references,
       this.ovc,
-      (type, entityId, entityIndex) => {
+      (type, entityId, entityIndex, documentSlug = "main") => {
         if (type === "options") {
           const conditionObject = this.references.conditions.options[entityId];
           return conditionObject === undefined
@@ -81,14 +81,15 @@ class OptionRender {
         }
         if (type === "sections") {
           const conditionObject =
-            this.references.conditions.sections.main[entityId];
+            this.references.conditions.sections[documentSlug]?.[entityId];
           return conditionObject === undefined
             ? true
             : this.conditions.executeCondition(
                 conditionObject,
                 entityId,
                 entityIndex,
-                "sections"
+                "sections",
+                documentSlug
               );
         }
         return true;

package/src/libs/SectionRender.ts

@@ -77,7 +77,8 @@ class SectionRender {
             conditionObject,
             0,
             this.baseIndex,
-            "sections"
+            "sections",
+            this.documentName
           );
 
     if (condition !== true) return;

package/src/libs/misc/FillPdfFormBase.ts

@@ -29,11 +29,12 @@ class FillPdfFormBase {
   private readonly conditionEvaluator: ConditionEvaluator = (
     type,
     id,
-    index
+    index,
+    documentSlug
   ) => {
     if (type === "options") return this.getOptionCondition(id, index);
     if (type === "variables") return this.getVariableCondition(id, index);
-    return this.getSectionCondition(id);
+    return this.getSectionCondition(id, documentSlug);
   };
 
   /**
@@ -90,11 +91,18 @@ class FillPdfFormBase {
   /**
    * Returns a section's conditions.
    */
-  private getSectionCondition(id: number) {
-    const conditionObject = this.references.conditions.sections.main[id];
+  private getSectionCondition(id: number, documentSlug = "main") {
+    const conditionObject =
+      this.references.conditions.sections[documentSlug]?.[id];
     return conditionObject === undefined
       ? true
-      : this.conditions.executeCondition(conditionObject, id, 0, "sections");
+      : this.conditions.executeCondition(
+          conditionObject,
+          id,
+          0,
+          "sections",
+          documentSlug
+        );
   }
 }
 

package/tests/Prerender.documentMultiple.test.ts

@@ -6,9 +6,7 @@ import Prerender from "../src/libs/Prerender";
  * (`params.multiple.enabled = true`, source = option #2). The output
  * `[var:3]` interpolates the partner name at each occurrence.
  */
-const buildMultipleDocumentModel = (
-  filenameTemplate?: string
-): ModelV3 => ({
+const buildMultipleDocumentModel = (filenameTemplate?: string): ModelV3 => ({
   documents: {
     main: {
       name: "Contract",
@@ -160,8 +158,8 @@ describe("Prerender — document multiple", () => {
         ((b[1].occurrenceIndex ?? 0) as number)
     );
 
-    const rendered = entries.map(([hash]) =>
-      prerender.getDocument(hash) as string
+    const rendered = entries.map(
+      ([hash]) => prerender.getDocument(hash) as string
     );
 
     expect(rendered[0]).toContain("Hello Alice");