@contrail/document-generation 2.0.40 → 2.0.42

package/lib/util/document-dynamic-text-element-util.d.ts

@@ -5,5 +5,4 @@ export declare class DocumentDynamicTextElementUtil {
     static isDynamicText(element: any): any;
     static handleDynamicText(element: DocumentElement, dataGroup: DataGroup): any;
     private static getPropertyValuesForElements;
-    private static getTextValueFromFrameMembers;
 }

package/lib/util/document-dynamic-text-element-util.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentDynamicTextElementUtil = void 0;
-const types_1 = require("@contrail/types");
+const documents_1 = require("@contrail/documents");
 const util_1 = require("@contrail/util");
 const document_text_element_util_1 = require("./document-text-element-util");
 const HARD_CODED_PROPS = {
@@ -38,18 +38,18 @@ class DocumentDynamicTextElementUtil {
                 }
                 type = this.typeMap[entityType];
                 property = type.typeProperties.find(p => p.slug === propertySlug);
-                if (displayFunction === "label") {
+                if (displayFunction === documents_1.DynamicTextDisplayFunction.LABEL) {
                     text = (property === null || property === void 0 ? void 0 : property.label) || HARD_CODED_PROPS[propertySlug] || `${type.label} name`;
                 }
                 else {
-                    let elementValues = this.getPropertyValuesForElements(dataGroup.data, propertyBindingsText);
-                    text = this.getTextValueFromFrameMembers(displayFunction, elementValues, property);
+                    const elementValues = this.getPropertyValuesForElements(dataGroup.data, propertyBindingsText);
+                    text = documents_1.DynamicTextUtil.getTextFromFrameMemberValues(displayFunction, property, elementValues);
                 }
             }
             if (text === undefined || text === null) {
                 text = 'n/a';
             }
-            if (displayLabel && displayFunction !== "label") {
+            if (displayLabel && displayFunction !== documents_1.DynamicTextDisplayFunction.LABEL) {
                 text = `${(property === null || property === void 0 ? void 0 : property.label) || `${type === null || type === void 0 ? void 0 : type.label} name` || HARD_CODED_PROPS[propertySlug]}: ${text}`;
             }
         }
@@ -67,36 +67,5 @@ class DocumentDynamicTextElementUtil {
         });
         return values;
     }
-    static getTextValueFromFrameMembers(displayFunction, elementValues, property) {
-        let text;
-        const formatter = new types_1.PropertyValueFormatter();
-        if (displayFunction === "average") {
-            elementValues = elementValues.filter(e => e !== null);
-            text = formatter.formatValue(elementValues.reduce((a, b) => a + b, 0) / elementValues.length, property.propertyType);
-        }
-        else if (displayFunction === "sum") {
-            elementValues = elementValues.filter(e => e !== null);
-            text = formatter.formatValue(elementValues.reduce((a, b) => a + b, 0), property.propertyType);
-        }
-        else if (displayFunction === "uniqueArray") {
-            text = Array.from(new Set(elementValues.filter(e => e !== null))).join(', ');
-        }
-        else if (!displayFunction ||
-            ["first", "value"].includes(displayFunction)) {
-            text = elementValues[0];
-        }
-        else if (displayFunction === "last") {
-            text = elementValues[elementValues.length - 1];
-        }
-        else if (displayFunction === "min") {
-            elementValues = elementValues.filter(e => e !== null);
-            text = formatter.formatValue(Math.min(...elementValues), property.propertyType);
-        }
-        else if (displayFunction === "max") {
-            elementValues = elementValues.filter(e => e !== null);
-            text = formatter.formatValue(Math.max(...elementValues), property.propertyType);
-        }
-        return text;
-    }
 }
 exports.DocumentDynamicTextElementUtil = DocumentDynamicTextElementUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/document-generation",
-  "version": "2.0.40",
+  "version": "2.0.42",
   "description": "Utilities for automatic generation of documents.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@contrail/data-grouping": "^1.0.24",
-    "@contrail/documents": "^1.0.99",
+    "@contrail/documents": "^1.0.101",
     "@contrail/types": "^3.0.27",
     "@contrail/util": "^1.0.27"
   }