@fibery/views 18.0.1 → 18.0.3

package/lib/jest.config.d.ts

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

package/lib/jest.config.js

@@ -0,0 +1,32 @@
+"use strict";
+/** @type {import('jest').Config} */
+module.exports = {
+    testEnvironment: "node",
+    coveragePathIgnorePatterns: ["/node_modules/"],
+    collectCoverageFrom: ["src/**/*.{js,jsx,ts,tsx}", "!src/**/*.d.ts"],
+    coverageReporters: ["text", "cobertura"],
+    testPathIgnorePatterns: ["<rootDir>[/\\\\](build|docs|node_modules|scripts)[/\\\\]"],
+    transform: {
+        "^.+\\.(js|jsx|ts|tsx)$": [
+            "@swc/jest",
+            {
+                jsc: {
+                    parser: {
+                        syntax: "typescript",
+                        tsx: true,
+                        decorators: true,
+                        dynamicImport: true,
+                    },
+                    transform: {
+                        react: {
+                            runtime: "automatic",
+                        },
+                    },
+                },
+            },
+        ],
+    },
+    testEnvironmentOptions: {
+        url: "http://localhost",
+    },
+};

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

@@ -1,7 +1,7 @@
 import { FieldObject, TypeObject } from "@fibery/schema";
-import { Expression } from "@fibery/expression-utils";
+import { FieldExpression } from "@fibery/expression-utils";
 import type { Select } from "@fibery/expression-utils/src/types";
 export declare const getReferenceTypeSelectClause: ({ typeObject }: {
     typeObject: TypeObject;
-}, contextPath: Expression) => Select;
-export declare const getReferenceFieldNormalizedSelectClause: (fieldObject: FieldObject, contextPath: Expression) => any;
+}, contextPath: FieldExpression) => Select;
+export declare const getReferenceFieldNormalizedSelectClause: (fieldObject: FieldObject, contextPath: FieldExpression) => any;

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

@@ -42,7 +42,9 @@ const getReferenceFieldNormalizedSelectClause = (fieldObject, contextPath) => {
     const { typeObject } = fieldObject;
     if (typeObject.isEntityRef) {
         const pairs = fieldObject.multiRelatedFieldObjects.map((f) => {
-            const select = (0, exports.getReferenceTypeSelectClause)({ typeObject: f.holderTypeObject }, [contextPath.concat(f.holderType)]);
+            const select = (0, exports.getReferenceTypeSelectClause)({ typeObject: f.holderTypeObject }, [
+                contextPath.concat(f.holderType),
+            ]);
             const normalizedSelect = (0, select_1.normalizeSelect)(select);
             return [f.holderType, { ...normalizedSelect, [select_1.isSelectForMultiFieldKey]: true }];
         });

package/lib/src/field-utils/user-active.d.ts

@@ -1,8 +1,8 @@
 import { TypeObject } from "@fibery/schema";
-import { Expression } from "@fibery/expression-utils";
+import { FieldExpression } from "@fibery/expression-utils";
 export declare const getIsUserActiveSelect: ({ typeObject, contextPath, }: {
     typeObject: TypeObject;
-    contextPath?: Expression;
+    contextPath?: FieldExpression;
 }) => {
     [x: string]: (string | any[])[];
 } | null;

package/lib/src/field-utils/workflow.d.ts

@@ -1,12 +1,12 @@
 import { TypeObject } from "@fibery/schema";
-import { Expression } from "@fibery/expression-utils";
+import { FieldExpression } from "@fibery/expression-utils";
 export declare function isWorkflowType(typeObject: TypeObject): boolean;
 export declare const getWorkflowFieldObject: (typeObject: TypeObject) => import("@fibery/schema").FieldObject | undefined;
 export declare const getIsFinalStateSelect: ({ typeObject, contextPath, }: {
     typeObject: TypeObject;
-    contextPath?: Expression;
+    contextPath?: FieldExpression;
 }) => {
-    [x: string]: (string | (string | (string | (string | (string | (string | (string | (string | (string | (string | (string | (string | (string | /*elided*/ any)[])[])[])[])[])[])[])[])[])[])[])[])[];
+    [x: string]: (string | (string | import("@fibery/expression-utils").MultiFieldAccess)[])[];
 } | null;
 export declare function getWorkflowTypeSelect(typeObject: TypeObject): {
     "workflow/Type": string[];

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

@@ -1,5 +1,6 @@
-export function fixViewUnit(schema: any, fromType: any, unit: any, units: any, { unitDefinitions, getDefaultUnitTypeForField }: {
+export function fixViewUnit(schema: any, fromType: any, unit: any, units: any, { unitDefinitions, getDefaultUnitTypeForField, migrateFileCollectionUnit }: {
     unitDefinitions: any;
     getDefaultUnitTypeForField: any;
+    migrateFileCollectionUnit?: boolean | undefined;
 }): any;
 export function enableHideWhenEmptyForCheckedEditableUnit(unit: any): any;

package/lib/src/private/units.js

@@ -29,7 +29,10 @@ const getUnitKind = (unit) => {
     }
     return "field";
 };
-const migrateUnit = (schema, fromType, unit, units) => {
+const migrateUnitOptsDefault = {
+    migrateFileCollectionUnit: true,
+};
+const migrateUnit = (schema, fromType, unit, units, opts = migrateUnitOptsDefault) => {
     const { type, expression } = unit;
     const kind = unit.kind || getUnitKind(unit);
     if (type === "date-time") {
@@ -73,7 +76,7 @@ const migrateUnit = (schema, fromType, unit, units) => {
             return {
                 ...unit,
                 kind,
-                type: "file-collection-count",
+                type: opts.migrateFileCollectionUnit ? "file-collection-count" : "collection-count",
             };
         }
     }
@@ -88,7 +91,7 @@ const migrateUnit = (schema, fromType, unit, units) => {
             };
         }
     }
-    if (type === "collection-count") {
+    if (opts.migrateFileCollectionUnit && type === "collection-count") {
         const [field] = expression;
         const fieldObject = getField(schema, fromType, field);
         if (fieldObject?.type === "fibery/file" && fieldObject?.isCollection) {
@@ -101,8 +104,8 @@ const migrateUnit = (schema, fromType, unit, units) => {
     }
     return { ...unit, kind };
 };
-const fixViewUnit = (schema, fromType, unit, units, { unitDefinitions, getDefaultUnitTypeForField }) => {
-    const migrated = migrateUnit(schema, fromType, unit, units);
+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);
     if (fieldObject) {

package/lib/src/unit-utils/access.d.ts

@@ -1,9 +1,9 @@
 import { TypeObject } from "@fibery/schema";
-import { Expression } from "@fibery/expression-utils";
+import { FieldExpression } from "@fibery/expression-utils";
 export declare const accessCheckKey: string;
 export declare const generateAccessCheckQueryExpression: ({ typeObject, contextPath, }: {
     typeObject: TypeObject;
-    contextPath?: Expression;
+    contextPath?: FieldExpression;
 }) => {
-    [accessCheckKey]: (string | (string | (string | (string | (string | (string | (string | (string | (string | (string | (string | (string | (string | /*elided*/ any)[])[])[])[])[])[])[])[])[])[])[])[])[];
+    [accessCheckKey]: (string | (string | import("@fibery/expression-utils").MultiFieldAccess)[])[];
 };

package/lib/src/unit-utils/common.d.ts

@@ -1,9 +1,8 @@
 import { TypeObject } from "@fibery/schema";
-import { Expression } from "@fibery/expression-utils/src/types";
-import { FieldUnit, PureUnit, Unit } from "../units/types";
+import { FieldUnit, PureUnit, Unit, UnitExpression } from "../units/types";
 import { $TSFixMe } from "../tsfixme";
 export declare const makeUnitMethod: (type: FieldUnit["type"]) => ({ expression }?: {
-    expression?: Expression;
+    expression?: UnitExpression;
 }) => FieldUnit;
 export declare const calculateUnitExpressionErrors: ({ typeObject, unit }: {
     typeObject: TypeObject;
@@ -12,4 +11,4 @@ export declare const calculateUnitExpressionErrors: ({ typeObject, unit }: {
 export declare const isUnitEnabled: (unit: Unit) => boolean;
 export declare const toPureUnit: (unit: Unit) => PureUnit;
 export declare const asString: (something: $TSFixMe) => string;
-export declare const canEditFieldExpression: (typeObject: TypeObject, expression: Expression) => boolean;
+export declare const canEditFieldExpression: (typeObject: TypeObject, expression: UnitExpression) => boolean;

package/lib/src/unit-utils/enums.d.ts

@@ -1,9 +1,9 @@
 import { TypeObject } from "@fibery/schema";
-import { Expression } from "@fibery/expression-utils";
+import { FieldExpression } from "@fibery/expression-utils";
 import type { Select } from "@fibery/expression-utils/src/types";
 export declare const getEnumIconColorQuery: ({ typeObject, contextPath, }: {
     typeObject: TypeObject;
-    contextPath?: Expression;
+    contextPath?: FieldExpression;
 }) => Select;
 export declare function getEnumIconSelect(typeObject: TypeObject): {
     "enum/icon": string[];
@@ -19,36 +19,6 @@ export declare const getEnumsRequest: (enumTypeObject: TypeObject) => {
             "fibery/id": string;
             "enum/name": string;
             "fibery/rank": string;
-        } | {
-            "workflow/Final"?: string | undefined;
-            "workflow/Type"?: string | undefined;
-            "fibery/id": string;
-            "enum/name": string;
-            "fibery/rank": string;
-        } | {
-            "workflow/Final"?: string | undefined;
-            "workflow/Type"?: string | undefined;
-            "fibery/id": string;
-            "enum/name": string;
-            "fibery/rank": string;
-        } | {
-            "workflow/Final"?: string | undefined;
-            "workflow/Type"?: string | undefined;
-            "fibery/id": string;
-            "enum/name": string;
-            "fibery/rank": string;
-        } | {
-            "workflow/Final"?: string | undefined;
-            "workflow/Type"?: string | undefined;
-            "fibery/id": string;
-            "enum/name": string;
-            "fibery/rank": string;
-        } | {
-            "workflow/Final"?: string | undefined;
-            "workflow/Type"?: string | undefined;
-            "fibery/id": string;
-            "enum/name": string;
-            "fibery/rank": string;
         };
         "q/limit": string;
         "q/order-by": (string | string[])[][];

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

@@ -15,7 +15,7 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     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("@fibery/expression-utils").Expression;
+    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";
     kind: "field";
     settings?: Record<string, unknown> | undefined;
@@ -31,7 +31,7 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("@fibery/expression-utils").Expression | undefined;
+    expression?: import("./types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
     kind: "db";
     hideWhenEmpty?: boolean | undefined;

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

@@ -18,7 +18,7 @@ export declare const getTypeUnits: () => import("../types").PureUnit[], getUnitN
     typeObject: import("@fibery/schema").TypeObject;
     units: import("../types").Unit[];
 }) => any, getHardcodedUnitsForView: (typeObject: import("@fibery/schema").TypeObject) => ({
-    expression: import("@fibery/expression-utils").Expression;
+    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";
     kind: "field";
     settings?: Record<string, unknown> | undefined;
@@ -34,7 +34,7 @@ export declare const getTypeUnits: () => import("../types").PureUnit[], getUnitN
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("@fibery/expression-utils").Expression | undefined;
+    expression?: import("../types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
     kind: "db";
     hideWhenEmpty?: boolean | undefined;

package/lib/src/units/canvas/type-badge-abbr.d.ts

@@ -10,7 +10,7 @@ export declare const TypeBadgeAbbr: {
         unit: import("../types").DbUnit;
     }) => boolean;
     makeUnit: (params?: {
-        expression: string[];
+        expression: import("../types").UnitExpression;
     }) => import("../types").PureUnit;
     getLabel: (params: {
         typeObject: TypeObject;

package/lib/src/units/canvas/type-badge.d.ts

@@ -10,7 +10,7 @@ export declare const TypeBadge: {
         unit: import("../types").DbUnit;
     }) => boolean;
     makeUnit: (params?: {
-        expression: string[];
+        expression: import("../types").UnitExpression;
     }) => import("../types").PureUnit;
     getLabel: (params: {
         typeObject: TypeObject;

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

@@ -19,7 +19,7 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     typeObject: TypeObject;
     units: import("./types").Unit[];
 }) => any, getUnitLabel: (fieldObject: import("@fibery/schema").FieldObject, unit: import("./types").Unit) => string, getHardcodedUnitsForView: (typeObject: TypeObject) => ({
-    expression: import("@fibery/expression-utils").Expression;
+    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";
     kind: "field";
     settings?: Record<string, unknown> | undefined;
@@ -35,7 +35,7 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("@fibery/expression-utils").Expression | undefined;
+    expression?: import("./types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
     kind: "db";
     hideWhenEmpty?: boolean | undefined;

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

@@ -19,7 +19,7 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     typeObject: TypeObject;
     units: import("./types").Unit[];
 }) => any, getUnitLabel: (fieldObject: import("@fibery/schema").FieldObject, unit: import("./types").Unit) => string, getHardcodedUnitsForView: (typeObject: TypeObject) => ({
-    expression: import("@fibery/expression-utils").Expression;
+    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";
     kind: "field";
     settings?: Record<string, unknown> | undefined;
@@ -35,7 +35,7 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("@fibery/expression-utils").Expression | undefined;
+    expression?: import("./types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
     kind: "db";
     hideWhenEmpty?: boolean | undefined;

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

@@ -18,7 +18,7 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     typeObject: import("@fibery/schema").TypeObject;
     units: import("./types").Unit[];
 }) => any, getHardcodedUnitsForView: (typeObject: import("@fibery/schema").TypeObject) => ({
-    expression: import("@fibery/expression-utils").Expression;
+    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";
     kind: "field";
     settings?: Record<string, unknown> | undefined;
@@ -34,7 +34,7 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("@fibery/expression-utils").Expression | undefined;
+    expression?: import("./types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
     kind: "db";
     hideWhenEmpty?: boolean | undefined;

package/lib/src/units/grid.js

@@ -29,6 +29,7 @@ const type_icon_1 = require("../unit-definitions/type-icon");
 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 allUnitDefinitions = {
     AvatarCollection: avatar_collection_1.AvatarCollection,
     Bool: bool_1.Bool,
@@ -56,6 +57,7 @@ const allUnitDefinitions = {
     RichTextSnippet: rich_text_snippet_1.RichTextSnippet,
     IconButton: icon_button_1.IconButton,
     UserRole: user_role_1.UserRole,
+    FileCollectionCount: file_collection_count_1.FileCollectionCount,
 };
 _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

@@ -19,7 +19,7 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     typeObject: TypeObject;
     units: import("./types").Unit[];
 }) => any, getHardcodedUnitsForView: (typeObject: TypeObject) => ({
-    expression: import("@fibery/expression-utils").Expression;
+    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";
     kind: "field";
     settings?: Record<string, unknown> | undefined;
@@ -35,7 +35,7 @@ export declare const getTypeUnits: () => import("./types").PureUnit[], getUnitNa
     label: string;
     icon?: string | undefined;
 } | {
-    expression?: import("@fibery/expression-utils").Expression | undefined;
+    expression?: import("./types").UnitExpression | undefined;
     type: "type-icon" | "type-badge" | "type-badge-abbr";
     kind: "db";
     hideWhenEmpty?: boolean | undefined;

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

@@ -17,7 +17,7 @@ export declare const makeUnitDefinitionsFactory: (allUnitDefinitions: Record<str
     }[];
     getUnitsForField: (fieldObject: FieldObject, options?: UnitFilterOptions) => Unit[];
     getHardcodedUnitsForView: (typeObject: TypeObject) => ({
-        expression: import("@fibery/expression-utils").Expression;
+        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";
         kind: "field";
         settings?: Record<string, unknown> | undefined;
@@ -33,7 +33,7 @@ export declare const makeUnitDefinitionsFactory: (allUnitDefinitions: Record<str
         label: string;
         icon?: string | undefined;
     } | {
-        expression?: import("@fibery/expression-utils").Expression | undefined;
+        expression?: import("./types").UnitExpression | undefined;
         type: "type-icon" | "type-badge" | "type-badge-abbr";
         kind: "db";
         hideWhenEmpty?: boolean | undefined;

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

@@ -1,5 +1,4 @@
 import { Schema, TypeObject } from "@fibery/schema";
-import { Expression } from "@fibery/expression-utils";
 import { NumberDisplaySettings } from "../field-utils/number";
 import { $TSFixMe } from "../tsfixme";
 import { FiberyObject } from "@fibery/expression-utils/src/types";
@@ -15,17 +14,18 @@ export type ButtonUnit = {
     hideWhenEmpty?: boolean;
     icon?: string;
 };
+export type UnitExpression = string[];
 export type DbUnit = {
     kind: "db";
     type: "type-icon" | "type-badge" | "type-badge-abbr";
-    expression?: Expression;
+    expression?: UnitExpression;
     checked?: boolean;
     hideWhenEmpty?: boolean;
 };
 export type FieldUnit = {
     kind: "field";
     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: Expression;
+    expression: UnitExpression;
     checked?: boolean;
     settings?: Record<string, unknown>;
     hideWhenEmpty?: boolean;
@@ -41,7 +41,7 @@ export type UnitDataDefinition<T extends Unit> = {
         unit: T;
     }) => boolean;
     makeUnit: (params?: {
-        expression: string[];
+        expression: UnitExpression;
     }) => PureUnit;
     getLabel: (params: {
         typeObject: TypeObject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fibery/views",
-  "version": "18.0.1",
+  "version": "18.0.3",
   "description": "Operations on view objects",
   "license": "UNLICENSED",
   "author": "Fibery",
@@ -37,10 +37,10 @@
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "@fibery/context-filters": "1.1.3",
-    "@fibery/expression-utils": "9.6.1",
-    "@fibery/query-utils": "1.1.1",
-    "@fibery/helpers": "1.4.0",
-    "@fibery/schema": "10.2.12"
+    "@fibery/expression-utils": "9.6.3",
+    "@fibery/query-utils": "1.1.3",
+    "@fibery/helpers": "1.5.0",
+    "@fibery/schema": "10.2.14"
   },
   "devDependencies": {
     "@babel/core": "7.28.5",
@@ -50,58 +50,18 @@
     "jest": "30.2.0",
     "jest-junit": "16.0.0",
     "typescript": "5.9.3",
-    "@fibery/babel-preset": "7.4.1",
-    "@fibery/eslint-config": "9.0.0"
+    "@fibery/eslint-config": "9.0.0",
+    "@fibery/babel-preset": "7.4.1"
   },
   "peerDependencies": {
-    "@fibery/expression-utils": "^9.6.1",
-    "@fibery/schema": "^10.2.12",
+    "@fibery/expression-utils": "^9.6.3",
+    "@fibery/schema": "^10.2.14",
     "immutability-helper": "^2.4.0",
     "lodash": "4.17.21"
   },
-  "jest": {
-    "testEnvironment": "node",
-    "coveragePathIgnorePatterns": [
-      "/node_modules/"
-    ],
-    "collectCoverageFrom": [
-      "src/**/*.{js,jsx,ts,tsx}",
-      "!src/**/*.d.ts"
-    ],
-    "coverageReporters": [
-      "text",
-      "cobertura"
-    ],
-    "testPathIgnorePatterns": [
-      "<rootDir>[/\\\\](build|docs|node_modules|scripts)[/\\\\]"
-    ],
-    "transform": {
-      "^.+\\.(js|jsx|ts|tsx)$": [
-        "@swc/jest",
-        {
-          "jsc": {
-            "parser": {
-              "syntax": "typescript",
-              "tsx": true,
-              "decorators": true,
-              "dynamicImport": true
-            },
-            "transform": {
-              "react": {
-                "runtime": "automatic"
-              }
-            }
-          }
-        }
-      ]
-    },
-    "testEnvironmentOptions": {
-      "url": "http://localhost"
-    }
-  },
   "scripts": {
     "build": "rm -rf lib && pnpm exec tsc --project tsconfig.build.json",
-    "test": "node scripts/test.js",
+    "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 ."