@contrail/documents 2.1.0-alpha.ab97680 → 2.1.0-alpha.c922865

package/CHANGELOG.md

@@ -20,11 +20,6 @@ Versioning follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - `SECTION_ELEMENT_TYPE`, `FRAME_ELEMENT_TYPE` and `SHAPE_ELEMENT_TYPES` in
   `document-element-constants`, so the rule above has one definition rather than one per app.
 
-### Changed (breaking)
-
-- `isContainerBinding()` becomes `DynamicTextUtil.takesValueFromContainer()`. Same rule, named for
-  what it decides: whether the binding's value comes from the container rather than a type property.
-
 ### Fixed
 
 - `DynamicTextUtil.calculateSize` threw on an element that reached it without a `size`, which on

package/lib/containers/document-container-index.d.ts

@@ -12,13 +12,12 @@ export declare class DocumentContainerIndex {
     });
     getContainer(containerId: string): DocumentContainer | null;
     containersOf(documentElementId: string, elementType: ContainerElementType): DocumentContainer[];
-    containerIdsOf(documentElementId: string, elementType: ContainerElementType): readonly string[];
+    containerIdsOf(documentElementId: string, elementType: ContainerElementType): string[];
     innermostContainerIdOf(documentElementId: string, elementType: ContainerElementType): string | null;
-    memberIdsOf(containerId: string): readonly string[];
+    memberIdsOf(containerId: string): string[];
     memberDocumentElementsOf(containerId: string): DocumentElement[];
-    containerPathAtPoint(point: PositionDefinition, elementType: ContainerElementType): readonly string[];
+    containerPathAtPoint(point: PositionDefinition, elementType: ContainerElementType): string[];
     maxDepth(elementType: ContainerElementType): number;
     private containersOfType;
-    private resolveAll;
     private containerPath;
 }

package/lib/containers/document-container-index.js

@@ -11,7 +11,9 @@ class DocumentContainerIndex {
         return (_a = this.data.containersById.get(containerId)) !== null && _a !== void 0 ? _a : null;
     }
     containersOf(documentElementId, elementType) {
-        return this.resolveAll(this.containerIdsOf(documentElementId, elementType));
+        return this.containerIdsOf(documentElementId, elementType)
+            .map((containerId) => this.data.containersById.get(containerId))
+            .filter(Boolean);
     }
     containerIdsOf(documentElementId, elementType) {
         return this.containerPath(documentElementId, elementType);
@@ -25,14 +27,9 @@ class DocumentContainerIndex {
         return (_a = this.data.memberIdsByContainerId.get(containerId)) !== null && _a !== void 0 ? _a : [];
     }
     memberDocumentElementsOf(containerId) {
-        const members = [];
-        for (const memberId of this.memberIdsOf(containerId)) {
-            const member = this.data.documentElementsById.get(memberId);
-            if (member) {
-                members.push(member);
-            }
-        }
-        return members;
+        return this.memberIdsOf(containerId)
+            .map((memberId) => this.data.documentElementsById.get(memberId))
+            .filter(Boolean);
     }
     containerPathAtPoint(point, elementType) {
         const covering = this.containersOfType(elementType).filter((container) => (0, document_container_1.containsPoint)(container.box, point));
@@ -43,17 +40,9 @@ class DocumentContainerIndex {
     }
     containersOfType(elementType) {
         var _a;
-        return this.resolveAll((_a = this.data.containerIdsByElementType.get(elementType)) !== null && _a !== void 0 ? _a : []);
-    }
-    resolveAll(containerIds) {
-        const containers = [];
-        for (const containerId of containerIds) {
-            const container = this.data.containersById.get(containerId);
-            if (container) {
-                containers.push(container);
-            }
-        }
-        return containers;
+        return ((_a = this.data.containerIdsByElementType.get(elementType)) !== null && _a !== void 0 ? _a : [])
+            .map((containerId) => this.data.containersById.get(containerId))
+            .filter(Boolean);
     }
     containerPath(documentElementId, elementType) {
         var _a, _b;

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

@@ -48,8 +48,8 @@ export declare const HARD_CODED_TEXT: {
     'section.itemOptionCount': string;
     'section.colorCount': string;
 };
+export declare function isContainerBinding(bindingProperty: string | null | undefined): boolean;
 export declare class DynamicTextUtil {
-    static takesValueFromContainer(bindingProperty: string | null | undefined): boolean;
     static getDynamicTextValue(dynamicTextElement: DocumentElement, property: TypeProperty, propertyLevel: PropertyLevel, container: DynamicTextContainer | null, componentModels: any[], ownerReferenceModel?: any): string;
     static calculateSize(dynamicTextElement: DocumentElement, entityType: any, text: string): import("../..").SizeDefinition;
     static getTextFromFrameMemberValues(displayFunction: string, property: any, memberValues: any[]): string;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicTextUtil = exports.HARD_CODED_TEXT = exports.CLICK_TO_CONFIGURE = exports.MOVE_TO_SECTION_TEXT = exports.MOVE_TO_FRAME_TEXT = exports.DynamicTextDisplayFunction = exports.DYNAMIC_TEXT_DATA_SOURCE = void 0;
+exports.isContainerBinding = isContainerBinding;
 const types_1 = require("@contrail/types");
 const util_1 = require("@contrail/util");
 const document_util_1 = require("@contrail/document-util");
@@ -50,14 +51,14 @@ exports.HARD_CODED_TEXT = {
 };
 const CONTAINER_PROPERTY_SLUGS = ['name', 'count', 'itemFamilyCount', 'itemOptionCount', 'colorCount'];
 const CONTAINER_SOURCES = [DYNAMIC_TEXT_DATA_SOURCE.FRAME, DYNAMIC_TEXT_DATA_SOURCE.SECTION];
-class DynamicTextUtil {
-    static takesValueFromContainer(bindingProperty) {
-        if (!bindingProperty) {
-            return false;
-        }
-        const [entityType, propertySlug] = bindingProperty.split('.');
-        return CONTAINER_SOURCES.includes(entityType) && CONTAINER_PROPERTY_SLUGS.includes(propertySlug);
+function isContainerBinding(bindingProperty) {
+    if (!bindingProperty) {
+        return false;
     }
+    const [entityType, propertySlug] = bindingProperty.split('.');
+    return CONTAINER_SOURCES.includes(entityType) && CONTAINER_PROPERTY_SLUGS.includes(propertySlug);
+}
+class DynamicTextUtil {
     static getDynamicTextValue(dynamicTextElement, property, propertyLevel, container, componentModels, ownerReferenceModel = null) {
         var _a, _b, _c, _d;
         if (!dynamicTextElement.propertyBindings || !dynamicTextElement.propertyBindings.text) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/documents",
-  "version": "2.1.0-alpha.ab97680",
+  "version": "2.1.0-alpha.c922865",
   "description": "Documents library for contrail platform",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",