@fibery/views 18.0.4 → 19.0.0

package/lib/{jest.config.js → jest.config.cjs}

@@ -1,7 +1,11 @@
 "use strict";
-/** @type {import('jest').Config} */
-module.exports = {
+/** @type {import('@jest/schemas').InitialOptions} */
+const config = {
     testEnvironment: "node",
+    testEnvironmentOptions: {
+        customExportConditions: ["@fibery/source"],
+        url: "http://localhost",
+    },
     coveragePathIgnorePatterns: ["/node_modules/"],
     collectCoverageFrom: ["src/**/*.{js,jsx,ts,tsx}", "!src/**/*.d.ts"],
     coverageReporters: ["text", "cobertura"],
@@ -26,7 +30,5 @@ module.exports = {
             },
         ],
     },
-    testEnvironmentOptions: {
-        url: "http://localhost",
-    },
 };
+module.exports = config;

package/lib/jest.config.d.cts

@@ -0,0 +1,3 @@
+export = config;
+/** @type {import('@jest/schemas').InitialOptions} */
+declare const config: any;

package/lib/src/field-utils/reference-collection.d.ts

@@ -1,18 +1,13 @@
 import { FieldObject } from "@fibery/schema";
 import { QueryLimit } from "@fibery/expression-utils/src/types";
 export declare const REFERENCE_COLLECTION_LIMIT = 1000;
-export declare const makeCollectionCountExpression: (field: string) => (string | string[])[];
+export declare const makeCollectionCountExpression: (field: string | string[]) => (string | string[])[];
 export declare const getCountKey: (field: string) => string;
 export declare const getCollectionCountSelect: (field: string) => {
     [x: string]: (string | string[])[];
 };
-export declare const calculateReferenceCollectionQuery: ({ fieldObject, limit, }: {
-    fieldObject: FieldObject;
+export declare const calculateReferenceCollectionQuery: ({ fieldObjects, expression, limit, }: {
+    fieldObjects: FieldObject[];
+    expression: string[];
     limit: QueryLimit;
-}) => {
-    [x: string]: {
-        "q/from": string[];
-        "q/select": any;
-        "q/limit": QueryLimit;
-    };
-};
+}) => Record<string, unknown>;

package/lib/src/field-utils/reference-collection.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateReferenceCollectionQuery = exports.getCollectionCountSelect = exports.getCountKey = exports.makeCollectionCountExpression = exports.REFERENCE_COLLECTION_LIMIT = void 0;
+const last_1 = __importDefault(require("lodash/last"));
 const compact_1 = __importDefault(require("lodash/compact"));
 const select_1 = require("@fibery/query-utils/src/select");
 const dynamic_keys_1 = require("../unit-utils/dynamic-keys");
@@ -13,7 +14,10 @@ const avatar_1 = require("./avatar");
 const icon_1 = require("./icon");
 const file_1 = require("./file");
 exports.REFERENCE_COLLECTION_LIMIT = 1000;
-const makeCollectionCountExpression = (field) => ["q/count", [field, "fibery/id"]];
+const makeCollectionCountExpression = (field) => [
+    "q/count",
+    [...(Array.isArray(field) ? field : [field]), "fibery/id"],
+];
 exports.makeCollectionCountExpression = makeCollectionCountExpression;
 const getCountKey = (field) => (0, dynamic_keys_1.makeDynamicKey)(dynamic_keys_1.collectionCountKeyPrefix, field);
 exports.getCountKey = getCountKey;
@@ -21,25 +25,43 @@ const getCollectionCountSelect = (field) => ({
     [(0, exports.getCountKey)(field)]: (0, exports.makeCollectionCountExpression)(field),
 });
 exports.getCollectionCountSelect = getCollectionCountSelect;
-const calculateReferenceCollectionQuery = ({ fieldObject, limit, }) => {
-    return {
-        [fieldObject.name]: {
-            "q/from": [fieldObject.name],
-            "q/select": (0, select_1.mergeDenormalizedSelects)((0, compact_1.default)([
-                (0, select_1.toSelectMapClause)((0, compact_1.default)([
-                    fieldObject.typeObject.idField,
-                    fieldObject.typeObject.titleField,
-                    // keep public id - required to build Links
-                    fieldObject.typeObject.publicIdField,
-                ])),
-                (0, access_1.generateAccessCheckQueryExpression)({ typeObject: fieldObject.typeObject }),
-                (0, avatar_1.getAvatarSelectQuery)({ typeObject: fieldObject.typeObject }),
-                (0, icon_1.getEntityIconSelect)({ typeObject: fieldObject.typeObject }),
-                fieldObject.type === "fibery/file" && (0, file_1.getFilesSelect)(fieldObject),
-                (0, enums_1.getEnumIconColorQuery)({ typeObject: fieldObject.typeObject }),
+const calculateReferenceCollectionQuery = ({ fieldObjects, expression, limit, }) => {
+    const fieldObject = (0, last_1.default)(fieldObjects);
+    if (!fieldObject) {
+        return {};
+    }
+    const collectionSubQuery = {
+        "q/from": expression,
+        "q/select": (0, select_1.mergeDenormalizedSelects)((0, compact_1.default)([
+            (0, select_1.toSelectMapClause)((0, compact_1.default)([
+                fieldObject.typeObject.idField,
+                fieldObject.typeObject.titleField,
+                // keep public id - required to build Links
+                fieldObject.typeObject.publicIdField,
             ])),
-            "q/limit": limit,
-        },
+            (0, access_1.generateAccessCheckQueryExpression)({ typeObject: fieldObject.typeObject }),
+            (0, avatar_1.getAvatarSelectQuery)({ typeObject: fieldObject.typeObject }),
+            (0, icon_1.getEntityIconSelect)({ typeObject: fieldObject.typeObject }),
+            fieldObject.type === "fibery/file" && (0, file_1.getFilesSelect)(fieldObject),
+            (0, enums_1.getEnumIconColorQuery)({ typeObject: fieldObject.typeObject }),
+        ])),
+        "q/limit": limit,
     };
+    // Wrap the collection query in intermediate reference fields (innermost to outermost).
+    // For each intermediate field, include its entity's id so normalizr can normalize it.
+    return [...expression].reverse().reduce((inner, field, reversedIndex) => {
+        const originalIndex = expression.length - 1 - reversedIndex;
+        const isTerminal = originalIndex === expression.length - 1;
+        if (!isTerminal) {
+            const pathToField = expression.slice(0, originalIndex + 1);
+            const { idField } = fieldObjects[originalIndex].typeObject;
+            // `inner` already has the next field keyed, so spread it rather than re-keying it.
+            const innerForField = idField
+                ? { [idField]: [...pathToField, idField], ...inner }
+                : { ...inner };
+            return { [field]: innerForField };
+        }
+        return { [field]: inner };
+    }, collectionSubQuery);
 };
 exports.calculateReferenceCollectionQuery = calculateReferenceCollectionQuery;

package/lib/src/field-utils/rich-text.d.ts

@@ -1,9 +1,10 @@
-import { FieldObject, TypeObject } from "@fibery/schema";
+import { TypeObject } from "@fibery/schema";
+import type { FieldExpression } from "@fibery/expression-utils/src/types";
 import { FieldUnit } from "../units/types";
 export declare const hasAccessToSecretKey: string;
-export declare const getHasAccessToSecretExpr: (fieldObject: FieldObject) => (string | string[])[];
-export declare const getHasAccessToSecret: (fieldObject: FieldObject) => {
-    [hasAccessToSecretKey]: (string | string[])[];
+export declare const getHasAccessToSecretExpr: (expression: FieldExpression) => (string | (string | import("@fibery/expression-utils/src/types").MultiFieldAccess)[])[];
+export declare const getHasAccessToSecret: (expression: FieldExpression) => {
+    [hasAccessToSecretKey]: (string | (string | import("@fibery/expression-utils/src/types").MultiFieldAccess)[])[];
 };
 export declare function getRichTextQuerySelect({ typeObject, unit: { expression }, includeSnippet, }: {
     typeObject: TypeObject;

package/lib/src/field-utils/rich-text.js

@@ -6,22 +6,33 @@ const select_1 = require("@fibery/query-utils/src/select");
 const utils_1 = require("@fibery/expression-utils/src/utils");
 const dynamic_keys_1 = require("../unit-utils/dynamic-keys");
 exports.hasAccessToSecretKey = (0, dynamic_keys_1.makeDynamicKey)(dynamic_keys_1.hasAccessToSecretKeyPrefix);
-const getHasAccessToSecretExpr = (fieldObject) => [
+const getHasAccessToSecretExpr = (expression) => [
     "q/access?",
-    [fieldObject.name, "Collaboration~Documents/secret"],
+    [...expression, "Collaboration~Documents/secret"],
 ];
 exports.getHasAccessToSecretExpr = getHasAccessToSecretExpr;
-const getHasAccessToSecret = (fieldObject) => ({
-    [exports.hasAccessToSecretKey]: (0, exports.getHasAccessToSecretExpr)(fieldObject),
+const getHasAccessToSecret = (expression) => ({
+    [exports.hasAccessToSecretKey]: (0, exports.getHasAccessToSecretExpr)(expression),
 });
 exports.getHasAccessToSecret = getHasAccessToSecret;
 function getRichTextQuerySelect({ typeObject, unit: { expression }, includeSnippet, }) {
-    const fieldObject = (0, utils_1.getFieldObjectByFieldExpression)({ typeObject, expression });
-    return (0, select_1.denormalizeSelect)({
-        [fieldObject.name]: (0, select_1.normalizeSelect)({
-            ...(0, exports.getHasAccessToSecret)(fieldObject),
-            ...(0, select_1.toSelectMapClause)([typeObject.idField, "Collaboration~Documents/secret"]),
-            ...(includeSnippet ? (0, select_1.toSelectMapClause)([typeObject.idField, "Collaboration~Documents/Snippet"]) : {}),
-        }),
+    const fieldObjects = (0, utils_1.getFieldObjectsByFieldExpression)({ typeObject, expression });
+    const terminalFieldObject = fieldObjects[fieldObjects.length - 1];
+    const { typeObject: terminalTypeObject } = terminalFieldObject;
+    const innerNormalized = (0, select_1.normalizeSelect)({
+        ...(0, exports.getHasAccessToSecret)(expression),
+        ...(0, select_1.toSelectMapClause)([terminalTypeObject.idField, "Collaboration~Documents/secret"]),
+        ...(includeSnippet ? (0, select_1.toSelectMapClause)([terminalTypeObject.idField, "Collaboration~Documents/Snippet"]) : {}),
     });
+    const nested = [...expression].reverse().reduce((inner, field, reversedIndex) => {
+        const originalIndex = expression.length - 1 - reversedIndex;
+        const isTerminal = originalIndex === expression.length - 1;
+        if (!isTerminal) {
+            const { idField } = fieldObjects[originalIndex].typeObject;
+            const innerWithId = idField ? { [idField]: idField, ...inner } : inner;
+            return { [field]: innerWithId };
+        }
+        return { [field]: inner };
+    }, innerNormalized);
+    return (0, select_1.denormalizeSelect)(nested);
 }

package/lib/src/private/units.js

@@ -8,6 +8,18 @@ const getField = (schema, fromType, field) => Object.hasOwn(schema.typeObjectsBy
     : undefined;
 const getFieldType = (schema, fromType, field) => getField(schema, fromType, field)?.type;
 const getFieldMeta = (schema, fromType, field) => getField(schema, fromType, field)?.rawMeta;
+const getFieldByExpression = (schema, fromType, expression) => {
+    let currentType = fromType;
+    let fieldObject;
+    for (const part of expression) {
+        fieldObject = getField(schema, currentType, part);
+        if (!fieldObject) {
+            return null;
+        }
+        currentType = fieldObject.type;
+    }
+    return fieldObject;
+};
 const getUnitTypeForTextField = (fieldMeta) => {
     switch (fieldMeta["ui/type"]) {
         case "email":
@@ -106,16 +118,17 @@ const migrateUnit = (schema, fromType, unit, units, opts = migrateUnitOptsDefaul
 };
 const fixViewUnit = (schema, fromType, unit, units, { unitDefinitions, getDefaultUnitTypeForField, migrateFileCollectionUnit = true }) => {
     const migrated = migrateUnit(schema, fromType, unit, units, { migrateFileCollectionUnit });
-    const field = unit.expression?.[0];
-    const fieldObject = getField(schema, fromType, field);
+    const fieldObject = getFieldByExpression(schema, fromType, unit.expression ?? []);
     if (fieldObject) {
-        const allowedUnits = unitDefinitions.getUnitsForField(fieldObject);
+        const allowedUnits = unitDefinitions.getUnitsForField(fieldObject, {
+            depth: unit.expression?.length,
+        });
         if (allowedUnits.some((u) => u.type === migrated.type)) {
             return migrated;
         }
         else {
             if (unit.checked) {
-                const otherUnitsForField = units.filter((u) => u !== unit && u.expression && u.expression[0] === field);
+                const otherUnitsForField = units.filter((u) => u !== unit && u.expression && unit.expression && u.expression.join("/") === unit.expression.join("/"));
                 const hasEnabledUnitForField = otherUnitsForField.some((u) => u.checked);
                 if (hasEnabledUnitForField) {
                     return utils_1.REMOVE;

package/lib/src/unit-definitions/avatar-collection.js

@@ -24,23 +24,29 @@ exports.AvatarCollection = {
     },
     makeUnit: (0, common_1.makeUnitMethod)(type),
     getQuerySelect({ typeObject, unit: { expression } }) {
-        const [userCollectionField] = expression;
-        const userCollectionFieldObject = typeObject.fieldObjectsByName[userCollectionField];
-        return {
-            [userCollectionField]: {
-                "q/from": [userCollectionField],
-                "q/select": (0, select_1.mergeDenormalizedSelects)((0, compact_1.default)([
-                    (0, select_1.toSelectMapClause)([
-                        userCollectionFieldObject.typeObject.idField,
-                        userCollectionFieldObject.typeObject.titleField,
-                    ]),
-                    (0, avatar_1.getAvatarSelectQuery)({
-                        typeObject: userCollectionFieldObject.typeObject,
-                    }),
-                ])),
-                "q/limit": "q/no-limit",
-            },
+        const fieldObjects = (0, utils_1.getFieldObjectsByFieldExpression)({ typeObject, expression });
+        const terminalFieldObject = fieldObjects[fieldObjects.length - 1];
+        const collectionSubQuery = {
+            "q/from": expression,
+            "q/select": (0, select_1.mergeDenormalizedSelects)((0, compact_1.default)([
+                (0, select_1.toSelectMapClause)([terminalFieldObject.typeObject.idField, terminalFieldObject.typeObject.titleField]),
+                (0, avatar_1.getAvatarSelectQuery)({ typeObject: terminalFieldObject.typeObject }),
+            ])),
+            "q/limit": "q/no-limit",
         };
+        return [...expression].reverse().reduce((inner, field, reversedIndex) => {
+            const originalIndex = expression.length - 1 - reversedIndex;
+            const isTerminal = originalIndex === expression.length - 1;
+            if (!isTerminal) {
+                const pathToField = expression.slice(0, originalIndex + 1);
+                const { idField } = fieldObjects[originalIndex].typeObject;
+                const innerForField = idField
+                    ? { [idField]: [...pathToField, idField], ...inner }
+                    : { ...inner };
+                return { [field]: innerForField };
+            }
+            return { [field]: inner };
+        }, collectionSubQuery);
     },
     calculateErrors: common_1.calculateUnitExpressionErrors,
     getExportValue: get_export_value_1.getReferenceCollectionExportValue,

package/lib/src/unit-definitions/avatar.js

@@ -7,7 +7,6 @@ exports.Avatar = void 0;
 const compact_1 = __importDefault(require("lodash/compact"));
 const select_1 = require("@fibery/query-utils/src/select");
 const utils_1 = require("@fibery/expression-utils/src/utils");
-const array_1 = require("@fibery/helpers/utils/array");
 const avatar_1 = require("../field-utils/avatar");
 const common_1 = require("../unit-utils/common");
 const get_export_value_1 = require("../unit-utils/get-export-value");
@@ -47,17 +46,28 @@ exports.Avatar = {
         if (!expression) {
             return getSelfAvatarSelectQuery(typeObject);
         }
-        const field = (0, array_1.single)(expression);
-        const fieldObject = typeObject.fieldObjectsByName[field];
-        if ((0, avatar_1.isAvatarExtensionField)(fieldObject)) {
+        const fieldObjects = (0, utils_1.getFieldObjectsByFieldExpression)({ typeObject, expression });
+        const terminalFieldObject = fieldObjects[fieldObjects.length - 1];
+        if ((0, avatar_1.isAvatarExtensionField)(terminalFieldObject)) {
             return getSelfAvatarSelectQuery(typeObject);
         }
-        return (0, select_1.denormalizeSelect)({
-            [field]: (0, select_1.normalizeSelect)((0, select_1.mergeDenormalizedSelects)((0, compact_1.default)([
-                (0, select_1.toSelectMapClause)([fieldObject.typeObject.idField, fieldObject.typeObject.titleField]),
-                (0, avatar_1.getAvatarSelectQuery)({ typeObject: fieldObject.typeObject }),
-            ]))),
-        });
+        const innerSelect = (0, select_1.normalizeSelect)((0, select_1.mergeDenormalizedSelects)((0, compact_1.default)([
+            (0, select_1.toSelectMapClause)([terminalFieldObject.typeObject.idField, terminalFieldObject.typeObject.titleField]),
+            (0, avatar_1.getAvatarSelectQuery)({ typeObject: terminalFieldObject.typeObject }),
+        ])));
+        // Wrap in the full expression path (innermost to outermost).
+        // For intermediate reference fields, also include their entity's id so normalizr can normalize them.
+        const nested = [...expression].reverse().reduce((inner, field, reversedIndex) => {
+            const originalIndex = expression.length - 1 - reversedIndex;
+            const isTerminal = originalIndex === expression.length - 1;
+            if (!isTerminal) {
+                const { idField } = fieldObjects[originalIndex].typeObject;
+                const innerWithId = idField ? { [idField]: idField, ...inner } : inner;
+                return { [field]: innerWithId };
+            }
+            return { [field]: inner };
+        }, innerSelect);
+        return (0, select_1.denormalizeSelect)(nested);
     },
     calculateErrors: common_1.calculateUnitExpressionErrors,
     getExportValue: ({ typeObject, unit, object }) => {

package/lib/src/unit-definitions/collection-count.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CollectionCount = void 0;
-const array_1 = require("@fibery/helpers/utils/array");
 const utils_1 = require("@fibery/expression-utils/src/utils");
 const reference_collection_1 = require("../field-utils/reference-collection");
 const common_1 = require("../unit-utils/common");
@@ -20,13 +19,12 @@ exports.CollectionCount = {
         return `${fieldObject.title} Count`;
     },
     getQuerySelect({ unit: { expression } }) {
-        const field = (0, array_1.single)(expression);
-        return (0, reference_collection_1.getCollectionCountSelect)(field);
+        const countKey = (0, reference_collection_1.getCountKey)(expression.join("/"));
+        return { [countKey]: (0, reference_collection_1.makeCollectionCountExpression)(expression) };
     },
     calculateErrors: common_1.calculateUnitExpressionErrors,
     getExportValue: ({ object, unit }) => {
-        const field = (0, array_1.single)(unit.expression);
-        return object[(0, reference_collection_1.getCountKey)(field)];
+        return object[(0, reference_collection_1.getCountKey)(unit.expression.join("/"))];
     },
     canExport: () => true,
 };

package/lib/src/unit-definitions/file-compact-reference.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileCompactReference = void 0;
-const array_1 = require("@fibery/helpers/utils/array");
 const select_1 = require("@fibery/query-utils/src/select");
 const utils_1 = require("@fibery/expression-utils/src/utils");
 const reference_1 = require("../field-utils/reference");
@@ -21,9 +20,20 @@ exports.FileCompactReference = {
         return { type, kind: "field", expression: args.expression };
     },
     getQuerySelect({ typeObject, unit: { expression } }) {
-        const field = (0, array_1.single)(expression);
-        const fieldObject = typeObject.fieldObjectsByName[field];
-        return (0, select_1.denormalizeSelect)({ [field]: (0, reference_1.getReferenceFieldNormalizedSelectClause)(fieldObject, [field]) });
+        const fieldObjects = (0, utils_1.getFieldObjectsByFieldExpression)({ typeObject, expression });
+        const terminalFieldObject = fieldObjects[fieldObjects.length - 1];
+        const innerNormalized = (0, reference_1.getReferenceFieldNormalizedSelectClause)(terminalFieldObject, expression);
+        const nested = [...expression].reverse().reduce((inner, field, reversedIndex) => {
+            const originalIndex = expression.length - 1 - reversedIndex;
+            const isTerminal = originalIndex === expression.length - 1;
+            if (!isTerminal) {
+                const { idField } = fieldObjects[originalIndex].typeObject;
+                const innerWithId = idField ? { [idField]: idField, ...inner } : inner;
+                return { [field]: innerWithId };
+            }
+            return { [field]: inner };
+        }, innerNormalized);
+        return (0, select_1.denormalizeSelect)(nested);
     },
     calculateErrors({ typeObject, unit }) {
         return (0, common_1.calculateUnitExpressionErrors)({ typeObject, unit });

package/lib/src/unit-definitions/reference-collection.js

@@ -6,6 +6,7 @@ const reference_collection_1 = require("../field-utils/reference-collection");
 const get_export_value_1 = require("../unit-utils/get-export-value");
 const get_field_label_1 = require("../unit-utils/get-field-label");
 const can_edit_field_1 = require("../unit-utils/can-edit-field");
+const utils_1 = require("@fibery/expression-utils/src/utils");
 const type = "reference-collection";
 exports.ReferenceCollection = {
     type,
@@ -13,10 +14,10 @@ exports.ReferenceCollection = {
     getLabel: get_field_label_1.getFieldLabel,
     makeUnit: (0, common_1.makeUnitMethod)(type),
     getQuerySelect({ typeObject, unit: { expression } }) {
-        const [field] = expression;
-        const fieldObject = typeObject.fieldObjectsByName[field];
+        const fieldObjects = (0, utils_1.getFieldObjectsByFieldExpression)({ typeObject, expression });
         return (0, reference_collection_1.calculateReferenceCollectionQuery)({
-            fieldObject,
+            fieldObjects,
+            expression,
             limit: reference_collection_1.REFERENCE_COLLECTION_LIMIT,
         });
     },

package/lib/src/unit-definitions/reference.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Reference = void 0;
-const array_1 = require("@fibery/helpers/utils/array");
 const utils_1 = require("@fibery/expression-utils/src/utils");
 const get_field_label_1 = require("../unit-utils/get-field-label");
 const select_1 = require("@fibery/query-utils/src/select");
@@ -11,7 +10,7 @@ const get_export_value_1 = require("../unit-utils/get-export-value");
 const type = "reference";
 exports.Reference = {
     type,
-    name: "Icon + Text",
+    name: "Name",
     getLabel: get_field_label_1.getFieldLabel,
     makeUnit: (args) => {
         if (!args) {
@@ -21,9 +20,22 @@ exports.Reference = {
         return { type, kind: "field", expression: args.expression };
     },
     getQuerySelect({ typeObject, unit: { expression } }) {
-        const field = (0, array_1.single)(expression);
-        const fieldObject = typeObject.fieldObjectsByName[field];
-        return (0, select_1.denormalizeSelect)({ [field]: (0, reference_1.getReferenceFieldNormalizedSelectClause)(fieldObject, [field]) });
+        const fieldObjects = (0, utils_1.getFieldObjectsByFieldExpression)({ typeObject, expression });
+        const terminalFieldObject = fieldObjects[fieldObjects.length - 1];
+        const innerNormalized = (0, reference_1.getReferenceFieldNormalizedSelectClause)(terminalFieldObject, expression);
+        // Wrap in the full expression path (innermost to outermost).
+        // For intermediate reference fields, also include their entity's id so normalizr can normalize them.
+        const nested = [...expression].reverse().reduce((inner, field, reversedIndex) => {
+            const originalIndex = expression.length - 1 - reversedIndex;
+            const isTerminal = originalIndex === expression.length - 1;
+            if (!isTerminal) {
+                const { idField } = fieldObjects[originalIndex].typeObject;
+                const innerWithId = idField ? { [idField]: idField, ...inner } : inner;
+                return { [field]: innerWithId };
+            }
+            return { [field]: inner };
+        }, innerNormalized);
+        return (0, select_1.denormalizeSelect)(nested);
     },
     calculateErrors({ typeObject, unit }) {
         const errors = (0, common_1.calculateUnitExpressionErrors)({ typeObject, unit });

package/lib/src/unit-utils/decimal.js

@@ -145,7 +145,7 @@ function finalise(x, sd, rm) {
             j = sd;
             w = xd[(xdi = 0)];
             // Get the rounding digit at index j of w.
-            rd = (w / mathpow(10, digits - j - 1)) % 10 | 0;
+            rd = ((w / mathpow(10, digits - j - 1)) % 10) | 0;
         }
         else {
             xdi = Math.ceil((i + 1) / LOG_BASE);
@@ -165,7 +165,7 @@ function finalise(x, sd, rm) {
                 // The number of leading zeros of w is given by LOG_BASE - digits.
                 j = i - LOG_BASE + digits;
                 // Get the rounding digit at index j of w.
-                rd = j < 0 ? 0 : (w / mathpow(10, digits - j - 1)) % 10 | 0;
+                rd = j < 0 ? 0 : ((w / mathpow(10, digits - j - 1)) % 10) | 0;
             }
         }
         // Are there any non-zero digits after the rounding digit?
@@ -182,7 +182,7 @@ function finalise(x, sd, rm) {
                             isTruncated ||
                             (rm == 6 &&
                                 // Check whether the digit to the left of the rounding digit is odd.
-                                (i > 0 ? (j > 0 ? w / mathpow(10, digits - j) : 0) : xd[xdi - 1]) % 10 & 1) ||
+                                ((i > 0 ? (j > 0 ? w / mathpow(10, digits - j) : 0) : xd[xdi - 1]) % 10) & 1) ||
                             rm == (x.s < 0 ? 8 : 7)));
         if (sd < 1 || !xd[0]) {
             xd.length = 0;
@@ -210,7 +210,7 @@ function finalise(x, sd, rm) {
             k = mathpow(10, LOG_BASE - i);
             // E.g. 56700 becomes 56000 if 7 is the rounding digit.
             // j > 0 means i > number of leading zeros of w.
-            xd[xdi] = j > 0 ? ((w / mathpow(10, digits - j)) % mathpow(10, j) | 0) * k : 0;
+            xd[xdi] = j > 0 ? (((w / mathpow(10, digits - j)) % mathpow(10, j)) | 0) * k : 0;
         }
         if (roundUp) {
             for (;;) {
@@ -277,10 +277,14 @@ function parseDecimal(x, str) {
     }
     let i;
     // Determine leading zeros.
-    for (i = 0; str.charCodeAt(i) === 48; i++) { }
+    for (i = 0; str.charCodeAt(i) === 48; i++) {
+        /* empty */
+    }
     let len;
     // Determine trailing zeros.
-    for (len = str.length; str.charCodeAt(len - 1) === 48; --len) { }
+    for (len = str.length; str.charCodeAt(len - 1) === 48; --len) {
+        /* empty */
+    }
     str = str.slice(i, len);
     if (str) {
         len -= i;

package/lib/src/unit-utils/get-export-value.d.ts

@@ -10,7 +10,7 @@ export declare const getReferenceCollectionExportValue: ({ unit, typeObject, obj
     object: FiberyObject;
     unit: FieldUnit;
     typeObject: TypeObject;
-}) => FiberyObject[] | (string | undefined)[] | null;
+}) => (string | undefined)[] | FiberyObject[] | null;
 export declare const getReferenceExportValue: ({ unit, typeObject, object, }: {
     object: FiberyObject;
     unit: FieldUnit;

package/lib/src/unit-utils/get-field-label.js

@@ -4,7 +4,7 @@ exports.getFieldLabel = void 0;
 const utils_1 = require("@fibery/expression-utils/src/utils");
 const getFieldLabel = ({ typeObject, unit }) => {
     const { expression } = unit;
-    const fieldObject = (0, utils_1.getFieldObjectByFieldExpression)({ typeObject, expression });
-    return fieldObject.title;
+    const fieldObjects = (0, utils_1.getFieldObjectsByFieldExpression)({ typeObject, expression });
+    return fieldObjects.map((fieldObject) => fieldObject.title).join(" -> ");
 };
 exports.getFieldLabel = getFieldLabel;

package/lib/src/units/board.d.ts

@@ -1,22 +1,25 @@
 import { TypeObject } from "@fibery/schema";
 export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitName: (unit: import("./types").Unit) => string | null, getUnitsForType: (typeObject: TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
     unit: import("./types").Unit;
     fieldObject: import("@fibery/schema").FieldObject;
 }[], getUnitsForField: (fieldObject: import("@fibery/schema").FieldObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => import("./types").Unit[], getUnitsForTypePerField: (typeObject: TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
     fieldObject: import("@fibery/schema").FieldObject;
     units: import("./types").Unit[];
-}[], getUnitLabel: (fieldObject: import("@fibery/schema").FieldObject, unit: import("./types").Unit) => string, getHardcodedUnitsForView: (typeObject: TypeObject) => ({
-    expression: import("./types").UnitExpression;
+}[], getUnitLabel: (typeObject: TypeObject, unit: import("./types").Unit) => string, getHardcodedUnitsForView: (typeObject: TypeObject) => ({
     type: "avatar" | "avatar-collection" | "avatar-input" | "back-references-list" | "bool" | "bool-checkbox" | "collection-count" | "color-input" | "comments-list" | "date" | "date-time" | "date-time-combobox" | "date-range" | "date-range-combobox" | "email" | "email-input" | "emoji" | "field" | "files-gallery" | "files-list" | "files-list-item" | "files-l-list" | "files-l-list-item" | "file-reference" | "file-compact-collection" | "file-compact-reference" | "file-collection-count" | "geometry-preview" | "icon-button" | "icon-input" | "id" | "json-input" | "location" | "location-input" | "number" | "number-input" | "phone" | "phone-input" | "progress-bar" | "reference" | "reference-icon" | "reference-combobox" | "reference-collection" | "reference-collection-list" | "reference-collection-view" | "reference-collection-combobox" | "rich-text-snippet" | "rich-text-document" | "single-location-preview" | "text" | "text-input" | "title" | "title-input" | "url" | "url-input" | "user-role" | "user-role-input";
+    expression: import("./types").UnitExpression;
     kind: "field";
     settings?: Record<string, unknown> | undefined;
     hideWhenEmpty?: boolean | undefined;
@@ -31,8 +34,8 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("./types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
+    expression?: import("./types").UnitExpression | undefined;
     kind: "db";
     hideWhenEmpty?: boolean | undefined;
 })[], getCardUnitsSelect: ({ schema, typeObject, units }: {

package/lib/src/units/canvas/index.d.ts

@@ -1,25 +1,28 @@
 export declare const getTypeUnits: () => import("../types").PureUnit[], getUnitName: (unit: import("../types").Unit) => string | null, getUnitsForField: (fieldObject: import("@fibery/schema").FieldObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => import("../types").Unit[], getUnitsForType: (typeObject: import("@fibery/schema").TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
     unit: import("../types").Unit;
     fieldObject: import("@fibery/schema").FieldObject;
 }[], getUnitsForTypePerField: (typeObject: import("@fibery/schema").TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
     fieldObject: import("@fibery/schema").FieldObject;
     units: import("../types").Unit[];
-}[], getUnitLabel: (fieldObject: import("@fibery/schema").FieldObject, unit: import("../types").Unit) => string, getCardUnitsSelect: ({ schema, typeObject, units }: {
+}[], getUnitLabel: (typeObject: import("@fibery/schema").TypeObject, unit: import("../types").Unit) => string, getCardUnitsSelect: ({ schema, typeObject, units }: {
     schema: import("@fibery/schema").Schema;
     typeObject: import("@fibery/schema").TypeObject;
     units: import("../types").Unit[];
 }) => any, getHardcodedUnitsForView: (typeObject: import("@fibery/schema").TypeObject) => ({
-    expression: import("../types").UnitExpression;
     type: "avatar" | "avatar-collection" | "avatar-input" | "back-references-list" | "bool" | "bool-checkbox" | "collection-count" | "color-input" | "comments-list" | "date" | "date-time" | "date-time-combobox" | "date-range" | "date-range-combobox" | "email" | "email-input" | "emoji" | "field" | "files-gallery" | "files-list" | "files-list-item" | "files-l-list" | "files-l-list-item" | "file-reference" | "file-compact-collection" | "file-compact-reference" | "file-collection-count" | "geometry-preview" | "icon-button" | "icon-input" | "id" | "json-input" | "location" | "location-input" | "number" | "number-input" | "phone" | "phone-input" | "progress-bar" | "reference" | "reference-icon" | "reference-combobox" | "reference-collection" | "reference-collection-list" | "reference-collection-view" | "reference-collection-combobox" | "rich-text-snippet" | "rich-text-document" | "single-location-preview" | "text" | "text-input" | "title" | "title-input" | "url" | "url-input" | "user-role" | "user-role-input";
+    expression: import("../types").UnitExpression;
     kind: "field";
     settings?: Record<string, unknown> | undefined;
     hideWhenEmpty?: boolean | undefined;
@@ -34,8 +37,8 @@ export declare const getTypeUnits: () => import("../types").PureUnit[], getUnitN
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("../types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
+    expression?: import("../types").UnitExpression | undefined;
     kind: "db";
     hideWhenEmpty?: boolean | undefined;
 })[];

package/lib/src/units/default.d.ts

@@ -1,14 +1,17 @@
 import { TypeObject } from "@fibery/schema";
 export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitName: (unit: import("./types").Unit) => string | null, getUnitsForType: (typeObject: TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
     unit: import("./types").Unit;
     fieldObject: import("@fibery/schema").FieldObject;
 }[], getUnitsForField: (fieldObject: import("@fibery/schema").FieldObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => import("./types").Unit[], getUnitsForTypePerField: (typeObject: TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
@@ -18,9 +21,9 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     schema: import("@fibery/schema").Schema;
     typeObject: TypeObject;
     units: import("./types").Unit[];
-}) => any, getUnitLabel: (fieldObject: import("@fibery/schema").FieldObject, unit: import("./types").Unit) => string, getHardcodedUnitsForView: (typeObject: TypeObject) => ({
-    expression: import("./types").UnitExpression;
+}) => any, getUnitLabel: (typeObject: TypeObject, unit: import("./types").Unit) => string, getHardcodedUnitsForView: (typeObject: TypeObject) => ({
     type: "avatar" | "avatar-collection" | "avatar-input" | "back-references-list" | "bool" | "bool-checkbox" | "collection-count" | "color-input" | "comments-list" | "date" | "date-time" | "date-time-combobox" | "date-range" | "date-range-combobox" | "email" | "email-input" | "emoji" | "field" | "files-gallery" | "files-list" | "files-list-item" | "files-l-list" | "files-l-list-item" | "file-reference" | "file-compact-collection" | "file-compact-reference" | "file-collection-count" | "geometry-preview" | "icon-button" | "icon-input" | "id" | "json-input" | "location" | "location-input" | "number" | "number-input" | "phone" | "phone-input" | "progress-bar" | "reference" | "reference-icon" | "reference-combobox" | "reference-collection" | "reference-collection-list" | "reference-collection-view" | "reference-collection-combobox" | "rich-text-snippet" | "rich-text-document" | "single-location-preview" | "text" | "text-input" | "title" | "title-input" | "url" | "url-input" | "user-role" | "user-role-input";
+    expression: import("./types").UnitExpression;
     kind: "field";
     settings?: Record<string, unknown> | undefined;
     hideWhenEmpty?: boolean | undefined;
@@ -35,8 +38,8 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("./types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
+    expression?: import("./types").UnitExpression | undefined;
     kind: "db";
     hideWhenEmpty?: boolean | undefined;
 })[];

package/lib/src/units/gantt.d.ts

@@ -1,14 +1,17 @@
 import { TypeObject } from "@fibery/schema";
 export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitName: (unit: import("./types").Unit) => string | null, getUnitsForType: (typeObject: TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
     unit: import("./types").Unit;
     fieldObject: import("@fibery/schema").FieldObject;
 }[], getUnitsForField: (fieldObject: import("@fibery/schema").FieldObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => import("./types").Unit[], getUnitsForTypePerField: (typeObject: TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
@@ -18,9 +21,9 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     schema: import("@fibery/schema").Schema;
     typeObject: TypeObject;
     units: import("./types").Unit[];
-}) => any, getUnitLabel: (fieldObject: import("@fibery/schema").FieldObject, unit: import("./types").Unit) => string, getHardcodedUnitsForView: (typeObject: TypeObject) => ({
-    expression: import("./types").UnitExpression;
+}) => any, getUnitLabel: (typeObject: TypeObject, unit: import("./types").Unit) => string, getHardcodedUnitsForView: (typeObject: TypeObject) => ({
     type: "avatar" | "avatar-collection" | "avatar-input" | "back-references-list" | "bool" | "bool-checkbox" | "collection-count" | "color-input" | "comments-list" | "date" | "date-time" | "date-time-combobox" | "date-range" | "date-range-combobox" | "email" | "email-input" | "emoji" | "field" | "files-gallery" | "files-list" | "files-list-item" | "files-l-list" | "files-l-list-item" | "file-reference" | "file-compact-collection" | "file-compact-reference" | "file-collection-count" | "geometry-preview" | "icon-button" | "icon-input" | "id" | "json-input" | "location" | "location-input" | "number" | "number-input" | "phone" | "phone-input" | "progress-bar" | "reference" | "reference-icon" | "reference-combobox" | "reference-collection" | "reference-collection-list" | "reference-collection-view" | "reference-collection-combobox" | "rich-text-snippet" | "rich-text-document" | "single-location-preview" | "text" | "text-input" | "title" | "title-input" | "url" | "url-input" | "user-role" | "user-role-input";
+    expression: import("./types").UnitExpression;
     kind: "field";
     settings?: Record<string, unknown> | undefined;
     hideWhenEmpty?: boolean | undefined;
@@ -35,8 +38,8 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("./types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
+    expression?: import("./types").UnitExpression | undefined;
     kind: "db";
     hideWhenEmpty?: boolean | undefined;
 })[];

package/lib/src/units/grid.d.ts

@@ -1,25 +1,28 @@
 export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitName: (unit: import("./types").Unit) => string | null, getUnitsForType: (typeObject: import("@fibery/schema").TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
     unit: import("./types").Unit;
     fieldObject: import("@fibery/schema").FieldObject;
 }[], getUnitsForField: (fieldObject: import("@fibery/schema").FieldObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => import("./types").Unit[], getUnitsForTypePerField: (typeObject: import("@fibery/schema").TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
     fieldObject: import("@fibery/schema").FieldObject;
     units: import("./types").Unit[];
-}[], getUnitLabel: (fieldObject: import("@fibery/schema").FieldObject, unit: import("./types").Unit) => string, getCardUnitsSelect: ({ schema, typeObject, units }: {
+}[], getUnitLabel: (typeObject: import("@fibery/schema").TypeObject, unit: import("./types").Unit) => string, getCardUnitsSelect: ({ schema, typeObject, units }: {
     schema: import("@fibery/schema").Schema;
     typeObject: import("@fibery/schema").TypeObject;
     units: import("./types").Unit[];
 }) => any, getHardcodedUnitsForView: (typeObject: import("@fibery/schema").TypeObject) => ({
-    expression: import("./types").UnitExpression;
     type: "avatar" | "avatar-collection" | "avatar-input" | "back-references-list" | "bool" | "bool-checkbox" | "collection-count" | "color-input" | "comments-list" | "date" | "date-time" | "date-time-combobox" | "date-range" | "date-range-combobox" | "email" | "email-input" | "emoji" | "field" | "files-gallery" | "files-list" | "files-list-item" | "files-l-list" | "files-l-list-item" | "file-reference" | "file-compact-collection" | "file-compact-reference" | "file-collection-count" | "geometry-preview" | "icon-button" | "icon-input" | "id" | "json-input" | "location" | "location-input" | "number" | "number-input" | "phone" | "phone-input" | "progress-bar" | "reference" | "reference-icon" | "reference-combobox" | "reference-collection" | "reference-collection-list" | "reference-collection-view" | "reference-collection-combobox" | "rich-text-snippet" | "rich-text-document" | "single-location-preview" | "text" | "text-input" | "title" | "title-input" | "url" | "url-input" | "user-role" | "user-role-input";
+    expression: import("./types").UnitExpression;
     kind: "field";
     settings?: Record<string, unknown> | undefined;
     hideWhenEmpty?: boolean | undefined;
@@ -34,8 +37,8 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("./types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
+    expression?: import("./types").UnitExpression | undefined;
     kind: "db";
     hideWhenEmpty?: boolean | undefined;
 })[];

package/lib/src/units/grid.js

@@ -30,6 +30,8 @@ const url_1 = require("../unit-definitions/url");
 const user_button_1 = require("../unit-definitions/user-button");
 const user_role_1 = require("../unit-definitions/user-role");
 const file_collection_count_1 = require("../unit-definitions/file-collection-count");
+const files_gallery_1 = require("../unit-definitions/files-gallery");
+const file_reference_1 = require("@fibery/views/src/unit-definitions/file-reference");
 const allUnitDefinitions = {
     AvatarCollection: avatar_collection_1.AvatarCollection,
     Bool: bool_1.Bool,
@@ -58,6 +60,8 @@ const allUnitDefinitions = {
     IconButton: icon_button_1.IconButton,
     UserRole: user_role_1.UserRole,
     FileCollectionCount: file_collection_count_1.FileCollectionCount,
+    FilesGallery: files_gallery_1.FilesGallery,
+    FileReference: file_reference_1.FileReference,
 };
 _a = (0, make_factory_1.makeUnitDefinitionsFactory)(allUnitDefinitions), exports.getTypeUnits = _a.getTypeUnits, exports.getUnitName = _a.getUnitName, exports.getUnitsForType = _a.getUnitsForType, exports.getUnitsForField = _a.getUnitsForField, exports.getUnitsForTypePerField = _a.getUnitsForTypePerField, exports.getUnitLabel = _a.getUnitLabel, exports.getCardUnitsSelect = _a.getCardUnitsSelect, exports.getHardcodedUnitsForView = _a.getHardcodedUnitsForView;
 const getDefaultUnits = () => {

package/lib/src/units/list.d.ts

@@ -1,26 +1,29 @@
 import { TypeObject } from "@fibery/schema";
 export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitName: (unit: import("./types").Unit) => string | null, getUnitsForType: (typeObject: TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
     unit: import("./types").Unit;
     fieldObject: import("@fibery/schema").FieldObject;
 }[], getUnitsForField: (fieldObject: import("@fibery/schema").FieldObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => import("./types").Unit[], getUnitsForTypePerField: (typeObject: TypeObject, options?: {
+    parentExpression?: import("@fibery/expression-utils").FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 }) => {
     fieldObject: import("@fibery/schema").FieldObject;
     units: import("./types").Unit[];
-}[], getUnitLabel: (fieldObject: import("@fibery/schema").FieldObject, unit: import("./types").Unit) => string, getCardUnitsSelect: ({ schema, typeObject, units }: {
+}[], getUnitLabel: (typeObject: TypeObject, unit: import("./types").Unit) => string, getCardUnitsSelect: ({ schema, typeObject, units }: {
     schema: import("@fibery/schema").Schema;
     typeObject: TypeObject;
     units: import("./types").Unit[];
 }) => any, getHardcodedUnitsForView: (typeObject: TypeObject) => ({
-    expression: import("./types").UnitExpression;
     type: "avatar" | "avatar-collection" | "avatar-input" | "back-references-list" | "bool" | "bool-checkbox" | "collection-count" | "color-input" | "comments-list" | "date" | "date-time" | "date-time-combobox" | "date-range" | "date-range-combobox" | "email" | "email-input" | "emoji" | "field" | "files-gallery" | "files-list" | "files-list-item" | "files-l-list" | "files-l-list-item" | "file-reference" | "file-compact-collection" | "file-compact-reference" | "file-collection-count" | "geometry-preview" | "icon-button" | "icon-input" | "id" | "json-input" | "location" | "location-input" | "number" | "number-input" | "phone" | "phone-input" | "progress-bar" | "reference" | "reference-icon" | "reference-combobox" | "reference-collection" | "reference-collection-list" | "reference-collection-view" | "reference-collection-combobox" | "rich-text-snippet" | "rich-text-document" | "single-location-preview" | "text" | "text-input" | "title" | "title-input" | "url" | "url-input" | "user-role" | "user-role-input";
+    expression: import("./types").UnitExpression;
     kind: "field";
     settings?: Record<string, unknown> | undefined;
     hideWhenEmpty?: boolean | undefined;
@@ -35,8 +38,8 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("./types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
+    expression?: import("./types").UnitExpression | undefined;
     kind: "db";
     hideWhenEmpty?: boolean | undefined;
 })[];

package/lib/src/units/make-factory.d.ts

@@ -1,24 +1,26 @@
+import { FieldExpression } from "@fibery/expression-utils";
 import { FieldObject, Schema, TypeObject } from "@fibery/schema";
-import { ButtonUnit, DbUnit, FieldUnit, Unit, UnitDataDefinition } from "./types";
+import { ButtonUnit, DbUnit, FieldUnit, Unit, UnitDataDefinition, UnitExpression } from "./types";
 type AnyUnitDataDefinition = UnitDataDefinition<FieldUnit> | UnitDataDefinition<DbUnit> | UnitDataDefinition<ButtonUnit>;
-type UnitFilterOptions = {
+type UnitCreationOptions = {
+    parentExpression?: FieldExpression;
     showHiddenFields?: boolean;
     isSharingMode?: boolean;
 };
 export declare const makeUnitDefinitionsFactory: (allUnitDefinitions: Record<string, AnyUnitDataDefinition>) => {
     getTypeUnits: () => import("./types").PureUnit[];
-    getUnitsForType: (typeObject: TypeObject, options?: UnitFilterOptions) => {
+    getUnitsForType: (typeObject: TypeObject, options?: UnitCreationOptions) => {
         unit: Unit;
         fieldObject: FieldObject;
     }[];
-    getUnitsForTypePerField: (typeObject: TypeObject, options?: UnitFilterOptions) => {
+    getUnitsForTypePerField: (typeObject: TypeObject, options?: UnitCreationOptions) => {
         fieldObject: FieldObject;
         units: Unit[];
     }[];
-    getUnitsForField: (fieldObject: FieldObject, options?: UnitFilterOptions) => Unit[];
+    getUnitsForField: (fieldObject: FieldObject, options?: UnitCreationOptions) => Unit[];
     getHardcodedUnitsForView: (typeObject: TypeObject) => ({
-        expression: import("./types").UnitExpression;
         type: "avatar" | "avatar-collection" | "avatar-input" | "back-references-list" | "bool" | "bool-checkbox" | "collection-count" | "color-input" | "comments-list" | "date" | "date-time" | "date-time-combobox" | "date-range" | "date-range-combobox" | "email" | "email-input" | "emoji" | "field" | "files-gallery" | "files-list" | "files-list-item" | "files-l-list" | "files-l-list-item" | "file-reference" | "file-compact-collection" | "file-compact-reference" | "file-collection-count" | "geometry-preview" | "icon-button" | "icon-input" | "id" | "json-input" | "location" | "location-input" | "number" | "number-input" | "phone" | "phone-input" | "progress-bar" | "reference" | "reference-icon" | "reference-combobox" | "reference-collection" | "reference-collection-list" | "reference-collection-view" | "reference-collection-combobox" | "rich-text-snippet" | "rich-text-document" | "single-location-preview" | "text" | "text-input" | "title" | "title-input" | "url" | "url-input" | "user-role" | "user-role-input";
+        expression: UnitExpression;
         kind: "field";
         settings?: Record<string, unknown> | undefined;
         hideWhenEmpty?: boolean | undefined;
@@ -33,12 +35,12 @@ export declare const makeUnitDefinitionsFactory: (allUnitDefinitions: Record<str
         label: string;
         icon?: string | undefined;
     } | {
-        expression?: import("./types").UnitExpression | undefined;
         type: "type-icon" | "type-badge" | "type-badge-abbr";
+        expression?: UnitExpression | undefined;
         kind: "db";
         hideWhenEmpty?: boolean | undefined;
     })[];
-    getUnitLabel: (fieldObject: FieldObject, unit: Unit) => string;
+    getUnitLabel: (typeObject: TypeObject, unit: Unit) => string;
     getUnitName: (unit: Unit) => string | null;
     getCardUnitsSelect: ({ schema, typeObject, units }: {
         schema: Schema;

package/lib/src/units/make-factory.js

@@ -70,6 +70,9 @@ const makeUnitDefinitionsFactory = (allUnitDefinitions) => {
             if (FileReference && FileCompactReference && fieldObject.typeObject.name === "fibery/file") {
                 return [FileLListItem, FileCompactReference, FileListItem, FileReference].filter(Boolean);
             }
+            if (FileReference && fieldObject.typeObject.name === "fibery/file") {
+                return [Reference, FileReference].filter(Boolean);
+            }
             return [
                 (0, avatar_1.isAvatarExtensionEnabledType)(fieldObject.typeObject) && Avatar,
                 fieldObject.name === "workflow/state" && ReferenceIcon,
@@ -78,8 +81,9 @@ const makeUnitDefinitionsFactory = (allUnitDefinitions) => {
             ];
         },
         ":field/reference-collection": (fieldObject, options) => {
+            const isTopLevel = (options.parentExpression?.length ?? 0) === 0;
             const common = [CollectionCount, (0, avatar_1.isAvatarExtensionEnabledType)(fieldObject.typeObject) && AvatarCollection];
-            if ((0, relation_view_1.isRelationViewField)(fieldObject) && !options.isSharingMode) {
+            if ((0, relation_view_1.isRelationViewField)(fieldObject) && !options.isSharingMode && isTopLevel) {
                 return [...common, ReferenceCollection, ReferenceCollectionCombobox, ReferenceCollectionView];
             }
             if ((0, back_references_1.isReferenceExtensionField)(fieldObject)) {
@@ -110,15 +114,16 @@ const makeUnitDefinitionsFactory = (allUnitDefinitions) => {
         },
     };
     const getUnitsForField = (fieldObject, options = {}) => {
-        const makeUnit = (Unit) => Unit.makeUnit({ expression: [fieldObject.name] });
-        const { showHiddenFields } = options;
-        if (fieldObject.isPublicId) {
+        const { showHiddenFields, parentExpression = [] } = options;
+        const makeUnit = (Unit) => Unit.makeUnit({ expression: [...parentExpression, fieldObject.name] });
+        const isTopLevel = (options.parentExpression?.length ?? 0) === 0;
+        if (fieldObject.isPublicId && isTopLevel) {
             return [Id].filter(Boolean).map(makeUnit);
         }
-        if (fieldObject.isTitle) {
+        if (fieldObject.isTitle && isTopLevel) {
             return [Title, TitleInput].filter(Boolean).map(makeUnit);
         }
-        if ((0, avatar_1.isAvatarExtensionField)(fieldObject)) {
+        if ((0, avatar_1.isAvatarExtensionField)(fieldObject) && isTopLevel) {
             return [Avatar, AvatarInput].filter(Boolean).map(makeUnit);
         }
         if (fieldObject.type === "Collaboration~Documents/Document") {
@@ -188,12 +193,12 @@ const makeUnitDefinitionsFactory = (allUnitDefinitions) => {
         ].filter(Boolean);
     };
     const unitDefinitionsByTypeLookup = (0, mapValues_1.default)((0, groupBy_1.default)(allUnitDefinitions, (x) => x.type), (value) => (0, array_1.single)(value));
-    const getUnitLabel = (fieldObject, unit) => {
+    const getUnitLabel = (typeObject, unit) => {
         const unitDefinition = unitDefinitionsByTypeLookup[unit.type];
         if (!unitDefinition) {
             return "";
         }
-        return unitDefinition.getLabel({ typeObject: fieldObject.holderTypeObject, unit: unit });
+        return unitDefinition.getLabel({ typeObject, unit: unit });
     };
     const getUnitName = (unit) => {
         const unitDefinition = unitDefinitionsByTypeLookup[unit.type];
@@ -224,7 +229,7 @@ const makeUnitDefinitionsFactory = (allUnitDefinitions) => {
                 return {};
             }
             const UnitDefinition = getUnitDataDefinition(unit);
-            const select = UnitDefinition.getQuerySelect({ schema, typeObject, unit: unit });
+            const select = UnitDefinition.getQuerySelect({ schema, typeObject, unit });
             (0, trace_1.assert)((0, isPlainObject_1.default)(select), "getQuerySelect must return object-shaped select");
             return select;
         });

package/package.json

@@ -1,46 +1,45 @@
 {
   "name": "@fibery/views",
-  "version": "18.0.4",
+  "version": "19.0.0",
+  "private": false,
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
-  "main": "./lib/index.js",
-  "types": "./lib/index.d.ts",
   "files": [
     "/lib"
   ],
-  "private": false,
+  "main": "./lib/index.js",
   "exports": {
     ".": {
       "types": "./lib/index.d.ts",
+      "@fibery/source": "./index.ts",
       "default": "./lib/index.js"
     },
     "./src/*": {
       "types": "./lib/src/*.d.ts",
+      "@fibery/source": "./src/*",
       "default": "./lib/src/*.js"
     },
     "./src/unit-definitions": {
       "types": "./lib/src/unit-definitions/index.d.ts",
+      "@fibery/source": "./src/unit-definitions/index.ts",
       "default": "./lib/src/unit-definitions/index.js"
     },
     "./src/units/canvas": {
       "types": "./lib/src/units/canvas/index.d.ts",
+      "@fibery/source": "./src/units/canvas/index.ts",
       "default": "./lib/src/units/canvas/index.js"
     }
   },
-  "fiberyDevExports": {
-    ".": "./index.ts",
-    "./src/*": "./src/*"
-  },
   "dependencies": {
     "date-fns": "2.29.2",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "@fibery/context-filters": "1.1.4",
-    "@fibery/query-utils": "1.1.4",
-    "@fibery/expression-utils": "9.6.4",
-    "@fibery/schema": "10.2.15",
-    "@fibery/helpers": "2.0.0"
+    "@fibery/expression-utils": "9.7.0",
+    "@fibery/helpers": "2.0.0",
+    "@fibery/query-utils": "1.1.5",
+    "@fibery/schema": "10.2.15"
   },
   "devDependencies": {
     "@babel/core": "7.28.5",
@@ -49,21 +48,22 @@
     "immutability-helper": "2.4.0",
     "jest": "30.2.0",
     "jest-junit": "16.0.0",
-    "typescript": "5.9.3",
-    "@fibery/babel-preset": "7.4.2",
-    "@fibery/eslint-config": "9.0.1"
+    "typescript": "6.0.0-beta",
+    "@fibery/babel-preset": "7.4.2"
   },
   "peerDependencies": {
-    "@fibery/expression-utils": "^9.6.4",
+    "@fibery/expression-utils": "^9.7.0",
     "@fibery/schema": "^10.2.15",
     "immutability-helper": "^2.4.0",
     "lodash": "4.17.21"
   },
   "scripts": {
-    "build": "rm -rf lib && pnpm exec tsc --project tsconfig.build.json",
+    "build": "rm -rf lib && tsc --project tsconfig.build.json",
     "test": "jest",
     "test:ci": "pnpm run test --reporters=default --reporters=jest-junit",
     "test:coverage": "pnpm run test --coverage --coverageDirectory=${JEST_COVERAGE_RESULT_DIR:-$(pwd)}/coverage/view  --reporters=default --reporters=jest-junit",
-    "lint": "eslint ."
-  }
+    "check": "../../scripts/check.sh",
+    "lint": "../../scripts/lint.sh"
+  },
+  "types": "./lib/index.d.ts"
 }

package/lib/jest.config.d.ts

@@ -1,2 +0,0 @@
-declare const _exports: import("jest").Config;
-export = _exports;